Commit graph

842 commits

Author SHA1 Message Date
John Howard
c5113b732c Update dependencies and drop large go-kit update
Pulling in the same changes as done in
https://github.com/prometheus/common/issues/255

Signed-off-by: John Howard <howardjohn@google.com>
2021-06-03 08:00:27 -07:00
Matthias Rampke
1a86938882
Merge pull request #374 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-05-06 11:52:31 +02:00
Matthias Rampke
cd27e25711
Merge pull request #376 from royeo/master
Fix comment
2021-05-06 11:51:57 +02:00
royeo
393b4ca495 Fix comment
Signed-off-by: royeo <ljn6176@gmail.com>
2021-05-06 16:08:29 +08:00
Matthias Rampke
ea25c7a114
Release 0.20.2
with changelog for #375

Signed-off-by: Matthias Rampke <matthias@prometheus.io>
2021-05-03 15:25:02 +00:00
Matthias Rampke
2a6bbd7827
Merge pull request #375 from bakins/lru-cache
Use groupcache for LRU cache
2021-05-03 17:19:39 +02:00
Brian Akins
a8f8067315 Use groupcache for LRU cache
Signed-off-by: Brian Akins <205350+bakins@users.noreply.github.com>
2021-04-28 12:15:19 -04:00
prombot
c552b8b84b Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-04-14 00:01:41 +00:00
Matthias Rampke
ce538cbae2
Merge pull request #373 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-04-01 08:31:59 +02:00
prombot
b8d1fde4e4 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-31 00:01:37 +00:00
Matthias Rampke
2b5239a67f
Changelog for #365, cut bugfix release
Signed-off-by: Matthias Rampke <matthias@prometheus.io>
2021-03-26 17:23:09 +00:00
Matthias Rampke
a8c09aaa97
Merge pull request #365 from glightfoot/segment-numbers
Support metric name segments starting with numbers
2021-03-26 18:20:30 +01:00
Matthias Rampke
5793e05795
Add additional tests for #365
testing more edge cases.

Signed-off-by: Matthias Rampke <matthias@prometheus.io>
2021-03-26 16:54:29 +00:00
Matthias Rampke
5f7d52f795 Changelog for #363 & version bump 2021-03-26 09:12:50 +00:00
Matthias Rampke
84e68332f3
Merge pull request #366 from prometheus/matthiasr/gitpod-setup
Add configuration for Gitpod
2021-03-26 10:02:24 +01:00
Matthias Rampke
12281a972e
Merge pull request #363 from glightfoot/cache-interface
Better mapper cache interface
2021-03-26 10:00:30 +01:00
Matthias Rampke
8b496dfab5
Merge pull request #372 from matthiasr/mr/fix-yaml-backslash-quoting
Escape backslashes in regex examples
2021-03-23 18:30:24 +01:00
Matthias Rampke
da69d725d0 Escape backslashes in regex examples
In double-quoted strings, the backslash is [special to YAML](http://blogs.perl.org/users/tinita/2018/03/strings-in-yaml---to-quote-or-not-to-quote.html).
Make sure that the examples do this correctly.
Fixes the wonky rendering on github.com.

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2021-03-23 17:05:56 +00:00
Matthias Rampke
e462a256b1
Merge pull request #370 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-03-23 07:12:54 +01:00
prombot
ad8d919409 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-22 00:02:18 +00:00
Matthias Rampke
0151d93b46
Merge pull request #369 from prometheus/superq/vendor
Update build
2021-03-18 15:08:04 +01:00
Ben Kochie
8e28d7acca
Update build
* Drop /vendor.
* Bump Go modules.
* Bump build orb.

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-18 11:18:02 +01:00
Ben Kochie
ad0c3a62e1
Merge pull request #368 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-03-18 11:12:46 +01:00
Ben Kochie
094f3cd9e5
Bump Go to 1.16.
Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-18 10:47:05 +01:00
prombot
4962fd01ae Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-18 00:02:33 +00:00
Matthias Rampke
b3aafad8f0
Merge pull request #367 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-03-17 23:09:41 +01:00
prombot
b1045e33ac Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-03-17 00:02:33 +00:00
Matthias Rampke
f1ca904c98 Fully automate dev setup with Gitpod
This commit implements a fully-automated development setup using Gitpod.io, an
online IDE for GitLab, GitHub, and Bitbucket that enables Dev-Environments-As-Code.
This makes it easy for anyone to get a ready-to-code workspace for any branch,
issue or pull request almost instantly with a single click.

Similar to prometheus/prometheus#7749.

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2021-03-09 21:38:17 +00:00
glightfoot
a197834f64 Add comments about thread-safety
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-02-19 14:13:03 -05:00
glightfoot
8b306c8c76 remove noop cache, add helper function for tests
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-02-19 14:08:53 -05:00
glightfoot
0c4a66e6a1 rework metricLineRE to support matching segments that start with a number
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-02-07 11:21:48 -05:00
glightfoot
aa529c8884 rename mapper_cache to mappercache
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-02-06 23:27:11 -05:00
glightfoot
940e653ea6 cleanup
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-02-06 23:21:49 -05:00
glightfoot
32c612d5e8 add license
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-02-06 23:03:46 -05:00
glightfoot
de9a51c863 fix TestMultipleMatches mapping indent
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-02-06 23:00:06 -05:00
glightfoot
0099df7f71 move lru and rr mapper caches to their own package and make mapper_cache a better an interface for implementing externally`
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-02-06 22:50:17 -05:00
Matthias Rampke
fbcadbf71b
Changelog for #361 & release 0.20.0
add extra note about the deprecated attributes, eventually I want to
get rid of them.

Signed-off-by: Matthias Rampke <matthias@prometheus.io>
2021-02-05 16:53:35 +00:00
Matthias Rampke
eeeedce405
Merge pull request #361 from glightfoot/defaults2
Allow setting defaults for histogram and summary options
2021-02-05 16:32:22 +00:00
Matthias Rampke
8115b37bd9
Changelog for #360 & patch release
Signed-off-by: Matthias Rampke <matthias@prometheus.io>
2021-01-29 10:25:04 +00:00
Matthias Rampke
799943cb47
Merge pull request #360 from glightfoot/quit
Don't return empty responses to lifecycle api requests
2021-01-29 10:08:05 +00:00
glightfoot
ee3b81b864 use a quit channel and log exit messages
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-01-28 15:23:46 -05:00
glightfoot
f8bba00868 format and clarify alias type comment
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-01-28 14:24:41 -05:00
glightfoot
66a63a8c1f use summary options defaults in registry
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-01-28 14:16:40 -05:00
glightfoot
58aed41ff2 remove deprecated fields from mapper defaults config
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-01-28 13:59:42 -05:00
glightfoot
06411336c7 add support for setting histogram_options and summary_options in defaults
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-01-28 13:58:52 -05:00
glightfoot
6a9749cd42 don't return empty responses to lifecycle api requests
Signed-off-by: glightfoot <glightfoot@rsglab.com>
2021-01-26 13:33:35 -05:00
Matthias Rampke
64dd103e3f
Merge pull request #354 from prometheus/mr/glob-regex-documentation
Reorder and rework glob vs. regex documentation
2021-01-22 12:58:01 +00:00
Matthias Rampke
bade06f775
Clarify ordering more
Instead of saying what users should not do, provide a positive
recommendation.

Signed-off-by: Matthias Rampke <matthias@prometheus.io>
2021-01-22 12:55:37 +00:00
Matthias Rampke
4171ba0c9b
Add changelog entry for #357
bring entries into the correct order and prepare to release today

Signed-off-by: Matthias Rampke <matthias@prometheus.io>
2021-01-22 12:40:09 +00:00
Matthias Rampke
eef7922de8
Merge pull request #357 from alexanderritola/reorder-checkconfig
Refactor startup order to not grab ports when checkConfig is true
2021-01-22 12:37:16 +00:00