Commit graph

927 commits

Author SHA1 Message Date
Nic Cope
fcc398a032 Switch to kingpin for flag handling
This commit also removs the deprecated -statsd.listen-address flag. Switching
to kingpin is a breaking change in that flags now start with two hyphens (e.g.
--statsd.listen-udp), and thus a good time to remove deprecated flags.

Signed-off-by: Nic Cope <negz@planet.com>
2018-08-20 13:18:59 -07:00
Matthias Rampke
84f1ef33d4
Merge pull request #140 from prometheus/mr/mapper-package
Move mapper to a package
2018-08-15 08:13:32 +02:00
Matthias Rampke
d9f305b6f2
Inject the mappings count metric into the library package
so that it can be initialized with an exporter-specific name.

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2018-08-14 09:31:38 +00:00
Matthias Rampke
40a13e604f
Move mapper -> pkg/mapper
to make clear that this is meant to be used elsewhere

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2018-08-14 09:20:00 +00:00
Matthias Rampke
124c5b88d0
Move mapper to a package
This allows the mapping logic and configuration format to be re-used by
the graphite exporter.

Enables prometheus/graphite_exporter#37, cf. https://github.com/prometheus/graphite_exporter/pull/52#issuecomment-412324849

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2018-08-12 11:14:18 +00:00
Matthias Rampke
419e27d284
Merge pull request #139 from prometheus/mr/changelog-links
Make all the PR references in CHANGELOG links
2018-08-09 14:33:26 +02:00
Matthias Rampke
8dbd5e7770
Make all the PR references in CHANGELOG links
for clickability.

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2018-08-09 10:11:23 +00:00
Matthias Rampke
e32ce67fd9
Add #135 to the changelog
Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2018-08-09 10:09:01 +00:00
Matthias Rampke
b7657e8399
Merge pull request #135 from hbagdi/feat/summary-quantiles
feat: configurable quantiles for Summaries
2018-08-09 11:40:26 +02:00
Matthias Rampke
8d1a9e0330
Break the quantile documentation into a summary-specific paragraph
to untangle the summary and histogram configuration, give an explicit
example of a summary match.

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2018-08-09 08:18:39 +00:00
Harry Bagdi
a144b1f9f7 feat: configurable quantiles for Summaries
* Quantile values for a Summary are now configurable.

* The default quantiles (DefObjectives) in the prometheus Go client library is
deprecated. This commit removes the reliance on it.

Signed-off-by: Harry Bagdi <harrybagdi@gmail.com>
2018-08-08 19:41:41 -07:00
Matthias Rampke
0ffa3f9865
Add notable unreleased changes to log
so it's easier to put together the next release.

Signed-off-by: Matthias Rampke <mr@soundcloud.com>
2018-07-04 10:28:11 +00:00
Ben Kochie
c4fb3768ac
Merge pull request #137 from prometheus/bjk/circle
Update CircleCI to 2.0
2018-07-03 09:46:52 +02:00
Ben Kochie
778ca7f991 Update CircleCI to 2.0
Signed-off-by: Ben Kochie <superq@gmail.com>
2018-07-03 09:19:40 +02:00
Matthias Rampke
09e16e7aa9
Merge pull request #136 from westphahl/match-metric-type
Allow mapping match on metric type
2018-07-02 15:22:54 +00:00
Ben Kochie
8971b30a76
Merge pull request #134 from simonpasquier/use-makefile-common
Use Makefile.common from Prometheus
2018-06-18 14:35:33 +02:00
Simon Pasquier
79fa36fe39 Sync Makefile.common from prometheus
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-06-18 14:05:04 +02:00
Simon Westphahl
d7357a2173 Adapt mapper test to changed signature
Co-authored-by: Simon Westphahl <westphahl@gmail.com>
Signed-off-by: Simon Westphahl <simon.westphahl@bmw.de>
2018-06-15 19:41:13 +02:00
Simon Westphahl
b2423c56a5 Update readme regarding metric type matching
Co-authored-by: Simon Westphahl <westphahl@gmail.com>
Signed-off-by: Simon Westphahl <simon.westphahl@bmw.de>
2018-06-15 14:26:47 +02:00
Simon Westphahl
568f744f2e Tests for metric type mapping config
Co-authored-by: Simon Westphahl <westphahl@gmail.com>
Signed-off-by: Simon Westphahl <simon.westphahl@bmw.de>
2018-06-15 11:36:23 +02:00
Simon Westphahl
b6c7e863d3 Allow mappings to match on metric types
Co-authored-by: Simon Westphahl <westphahl@gmail.com>
Signed-off-by: Simon Westphahl <simon.westphahl@bmw.de>
2018-06-15 11:36:12 +02:00
Simon Pasquier
4a9cde8cef travis: switch to Go 1.10.x and 1.x
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-05-23 14:04:34 +02:00
Simon Pasquier
27f07a6516 Use Makefile.common from Prometheus
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2018-05-23 12:49:57 +02:00
Matthias Rampke
16865d75b7
Merge pull request #126 from yuiofthesun/avoid-regex-panic
Avoid regex panic
2018-02-23 09:31:02 +01:00
Katharina Dankert
7e86bcaa92 Avoid panic from compiling user supplied regex
If an invalid regex is supplied mustCompile would panic during
configuration reload. Return an error instead that can be handled.
2018-02-22 23:50:25 +01:00
Katharina Dankert
d1f7ca4239 Fix the test for bad regexes
This test did not fail because the regex was bad, it failed because yaml
parsing failed.

This fixes the yaml which uncovers a panic in initFromYAMLString.
2018-02-22 23:46:19 +01:00
Matthias Rampke
745e53700f
Merge pull request #121 from prometheus/brian-brazil-patch-1
Update a few Bridges we missed to Exporter
2018-01-30 21:19:25 +01:00
Brian Brazil
fbbd6452c6
Update a few Bridges we missed to Exporter 2018-01-30 20:01:29 +00:00
Matthias Rampke
76f5f422b4
Merge pull request #118 from prometheus/grobie/readme-metrics-naming
Use _total suffix for counters
2018-01-18 09:12:20 +01:00
Tobias Schmidt
c11d1e9cf2 Use _total suffix for counters
According to the project's naming best practices[0], the suffix to
indicate a counter type is called `_total`.

[0]: https://prometheus.io/docs/practices/naming/
2018-01-18 00:48:42 +01:00
Matthias Rampke
3fd85c92fc
Actually update the version
of course I forgot a step.
2018-01-17 17:43:26 +00:00
Matthias Rampke
17524907f7
Release v0.6.0
There have been no reports of issues with the drop action, and
@erickpintor has been running the metric name change already. Let's go!
2018-01-17 17:25:55 +00:00
Matthias Rampke
9f409ad982
Add changelog entry for #117 2018-01-17 17:09:51 +00:00
Matthias Rampke
8608d9db40
Fix double-plural 2018-01-17 17:09:16 +00:00
Matthias Rampke
9180cd3afd
Merge pull request #117 from erickpintor/dynamic-metric-name
Allow for dynamic metric name
2018-01-17 18:09:07 +01:00
Erick Pintor
f058f3aa33 document metric name and labels names unique set 2018-01-17 14:34:33 -02:00
Erick Pintor
515ae0ee89 document metric name templating for regex matches 2018-01-17 14:30:40 -02:00
Erick Pintor
27ee4050c4 allow for dynamic metric name 2018-01-16 18:45:55 -02:00
Matthias Rampke
d96145e47f
Start changelog for next version
and add #115, which is the only change that affects the released binary
so far.
2018-01-08 18:36:31 +00:00
Matthias Rampke
25c9946cf3
Merge pull request #115 from bakins/bakins/match-actions
Add drop action for matches
2018-01-08 18:32:44 +00:00
Brian Akins
6738c909a5 Add drop action for matches 2018-01-02 17:21:50 -05:00
Matthias Rampke
a794d58413
Fix incorrect --help output in README
This removes the not actually available log flags from the README. We
should really have those (#111), but at least it's less confusing this
way.

Fixes #110.
2017-11-29 14:20:24 +00:00
Matthias Rampke
3523ac00b8
Update Changelog title 2017-11-16 15:25:42 +00:00
Matthias Rampke
1fa2dff843
Preparation for v0.5.0 release (#108)
Update version, and add changelog entry including upgrade instructions.
2017-11-16 16:22:02 +01:00
Brian Akins
50a5c3e5f7 Formatting and typo fixes 2017-11-16 08:18:16 -05:00
Brian Akins
a4c9927b89 Add example for config file. Rearrange list of changes 2017-11-15 07:03:40 -05:00
Matthias Rampke
d9db83b9be
Merge pull request #106 from prometheus/mr/rework-sample-counters
Break out the telemetry during sample processing
2017-11-15 09:42:46 +01:00
Brian Akins
143a588871 Preperation for v0.5.0 release 2017-11-14 11:04:52 -05:00
Matthias Rampke
520e51e6ff
Merge pull request #101 from bakins/bakins/metric-name
Allow using name in mapping rather than 'name' label
2017-11-13 14:24:54 +01:00
Brian Akins
e58bf8e1ca Set name in mapping, rather than from special label with key 'name' 2017-11-13 07:23:14 -05:00