Commit graph

667 commits

Author SHA1 Message Date
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
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
alexanderritola
175e9a6728 Refactor startup order to not grab ports when checkConfig is true
Signed-off-by: alexanderritola <alexanderritola@users.noreply.github.com>
2021-01-20 11:37:58 -08:00
Matthias Rampke
cafe6c75b8
Merge pull request #356 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2021-01-18 08:30:29 +00:00
prombot
7e8ab9bad7 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2021-01-18 00:05:00 +00:00
Matthias Rampke
64c79eea8b
Reorder and rework glob vs. regex documentation
Note that regular expression matches are only evaluated after glob
matches. Add headings and introductory sentences to each glob type.

Remove the technical reasoning for choosing glob vs. regex; instead
explain the performance implications and gotchas of each type in turn.

Closes #349.

Signed-off-by: Matthias Rampke <matthias@prometheus.io>
2020-12-18 09:24:47 +00:00
Matthias Rampke
5a7d7fe3d0
Merge pull request #352 from bakins/parser-interface
Use a Parser interface to allow alternate implementations
2020-12-18 09:50:43 +01:00
bakins
709c0da81b Use a Parser interface to allow alternate implementations
Signed-off-by: bakins <brian@akins.org>
2020-12-10 13:17:46 -05:00
Matthias Rampke
8b2b4c1a2b
Changelog for #347 2020-11-24 08:20:27 +00:00
Matthias Rampke
8772c03c0f
Merge pull request #347 from grafana/custom-registry
Pass around custom registry for registering exporter metrics
2020-11-24 09:18:10 +01:00
Robert Fratto
b5deeda251 Pass around custom registry for registering exporter metrics
Importers of pkg/exporter may not want for series to be imported into
the default registry. This commit makes it possible to provide a custom
registry for metrics registration.

Signed-off-by: Robert Fratto <robertfratto@gmail.com>
2020-11-20 14:14:14 -05:00
Matthias Rampke
dcd95d01df
Merge pull request #345 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2020-11-04 17:57:22 +00:00
prombot
dc1f856da1 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-11-04 00:10:00 +00:00
Matthias Rampke
7c792fba66
Merge pull request #344 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2020-10-23 09:46:37 +02:00
Matthias Rampke
45b616fe8c
Merge pull request #343 from bakins/registry-interface
Use an interface for Registry so we may have alternate implementations
2020-10-23 09:37:19 +02:00
prombot
ede356f65e Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-10-23 00:10:05 +00:00
bakins
4acb05aa89 Use an interface for Registry so we may have multiple implementations
Signed-off-by: bakins <brian@akins.org>
2020-10-22 10:08:57 -04:00
Matthias Rampke
420dc651d8
Version bump + changelog for #339
Signed-off-by: Matthias Rampke <matthias@prometheus.io>
2020-10-15 07:03:16 +00:00
Matthias Rampke
cba4a0783a
Merge pull request #339 from yaron-idan/add-health-endpoint
add healthcheck endpoint
2020-10-15 07:01:42 +00:00
Yaron Idan
f5e400962a remove flag and add ready endpoint
Signed-off-by: Yaron Idan <yaronidan@gmail.com>
2020-10-13 14:15:04 +03:00
Matthias Rampke
3ed211ec7a
Merge pull request #341 from dsabsay/cleanup-docs
Minor documentation improvements
2020-10-05 09:41:04 +00:00
Matthias Rampke
e7b26d48bc
Merge pull request #340 from roidelapluie/115go
Bump go to 1.15
2020-10-05 09:39:58 +00:00
Daniel Sabsay
07c754c759 Minor documentation fixes
* Fix CLI help for --statsd.event-flush-interval
* Move verbiage regarding default histogram bucket values to proper
  section

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>
2020-09-28 10:42:44 -07:00
Julien Pivotto
a94056e060 Bump go to 1.15
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-09-14 18:46:06 +02:00
Yaron Idan
f0c7abebb1 add healthcheck endpoint
Signed-off-by: Yaron Idan <yaronidan@gmail.com>
2020-09-12 17:24:50 +03:00
Matthias Rampke
da85f9d207
Merge pull request #335 from shmsr/dup-init-vars
Avoid double initialization of variables
2020-09-07 09:38:12 +02:00
Matthias Rampke
477d566101
Merge pull request #334 from shmsr/error-small-case
Error strings shouldn't be capitalized
2020-09-07 09:34:11 +02:00