mirrors/statsd_exporter
1
0
Fork 1
mirror of https://github.com/prometheus/statsd_exporter.git synced 2024-11-29 18:50:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
213 commits 6 branches 63 tags 14 MiB
Commit graph

213 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Matthias Rampke
0ceac67bc6
Merge pull request #107 from prometheus/mr/fix-and-test-readme 
Fix and test examples in the README
 2017-11-11 00:17:54 +01:00
Matthias Rampke
0ac908603a Update documentation of metric name escaping. 
The escaping changed in 728bdc52ae, before
0.1.0. Add a test for the escape function, and test various cases,
including those mentioned in the README.

This reveals that the README is inaccurate, adjust it to what has been
the reality for many years. Fixes #97.
 2017-11-10 20:34:10 +00:00
Matthias Rampke
6c04ec1d89 Fix mapping example in the README 
Strings with leading asterisks need to be escaped in YAML.

Add the same examples into the test suite to make sure they do what we
claim they do.

Fixes #102.
 2017-11-10 20:19:41 +00:00
Matthias Rampke
45d22f2add Add examples for quoting matches that start with *. 
The YAML parser chokes on strings starting with asterisks. Add a
scenario to the spec that shows this, and that shows that quoting fixes
the issue.
 2017-11-10 20:01:57 +00:00
Matthias Rampke
e24888356f Add example for configuration without trailing newline. 
Inspired by #102, illustrate and ensure that trailing newlines are not
necessary.
 2017-11-10 20:01:15 +00:00
Matthias Rampke
cdf79ba2f9 Break out the telemetry during sample processing 
The "packets" metric had heavily overloaded meaning for different
"outcomes", and would often be incremented multiple times, sometimes
even with a single (per-line) increment in one outcome corresponding to
multiple increments in another.

This removes the broken metric, and replaces it with separate total and
error counters for each level of processing. This allows monitoring the
network traffic handled separately from the samples incurred by it.
 2017-11-10 19:23:54 +00:00
Matthias Rampke
d4d0b4a6a7
Merge pull request #105 from prometheus/mr/pr-96 
Fix matching empty statsd metric components
 2017-11-10 17:50:32 +01:00
Jens Bissinger
78de4b11db Fix matching empty statsd metric components 2017-11-10 15:29:24 +00:00
Matthias Rampke
ff308119cf
Merge pull request #104 from prometheus/mr/fix-tests 
Fix TravisCI tests: Force IPv4 for the mock TCP listener
 2017-11-10 16:01:39 +01:00
Matthias Rampke
ea77554dc4 Force IPv4 for the mock TCP listener. 
Travis CI [does not have IPv6][0] in any environment. It could be
[enabled][1] if we ran the build in a VM, but that is much slower to
start. Instead, we just force the test connection to use IPv4.

[0]: https://blog.travis-ci.com/2015-11-27-moving-to-a-more-elastic-future#ipv6-no-longer-present
[1]: https://github.com/travis-ci/travis-ci/issues/5200#issuecomment-162539556
 2017-11-10 14:21:38 +00:00
Julius Volz
92702b80fd
Merge pull request #103 from prometheus/grobie/new-maintainer 
Change maintainership to Matthias
 2017-11-09 17:45:00 +01:00
Tobias Schmidt
4f847ac004 Change maintainership to Matthias 2017-11-09 11:34:34 +01:00
Dave Rawks
ab2a88c06f Allow help text to be customized (#87) 
* Updated mappings to accept custom help text in YAML config
* Updated exporter to display configured help messages
* Update README to reflect aditional configurability
* Removed inaccurate comment

* Removed some cruft from a rebase
 2017-10-04 18:11:58 +02:00
Ben Kochie
9accf494a9 Merge pull request #98 from drawks/remove_legacy_mapper 
Removes support for legacy mapper config
 2017-09-29 10:08:08 +02:00