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
Dave Rawks
ec3cc120e2
Resolves #84 adds support for regex mappers ( #85 )
...
* Added `regex` match_type as valid config callout in both individual mappers
and mapper defaults
* Added test coverage for changes
* Updated documentation to reflect usage of `match_type` parameter and
provide example of a raw regex match rule
2017-09-29 09:57:17 +02:00
Tobias Schmidt
bd0f2139af
Merge pull request #99 from drawks/remove_add_suffix_flag
...
Removes `-statsd.add-suffix` option flag
2017-09-29 00:18:19 +02:00
Dave Rawks
0478c40ab0
Removes -statsd.add-suffix
option flag
...
* Remove option flag
* Update NewExporter call signature to not take suffix boolean
* Update tests to reflect new behavior and signature
* Update documentation to reflect option flag removal
2017-09-28 11:30:17 -07:00
Dave Rawks
892b725faf
Removes support for legacy mapper config
...
* Removed legacy mapper config parser
* Removed logic to switch to YAML parsing based on mapping filename
* Removed tests for legacy mapper config
* Remove references to legacy mapper config format from `README.md`
2017-09-28 11:11:26 -07:00
Ben Kochie
2dfca9be7c
Merge pull request #94 from prometheus/bjk/update_vendoring
...
Update vendoring
2017-08-31 17:36:54 +02:00
Ben Kochie
f717018146
Update Go version in circle CI.
2017-08-30 18:00:52 +02:00
Ben Kochie
4b83af49b7
Update travis config.
2017-08-30 17:59:10 +02:00
Ben Kochie
19d90f1c21
Cleanup vendor github.com/Sirupsen/logrus
...
Use github.com/sirupsen/logrus@v1.0.3
2017-08-30 17:53:27 +02:00
Ben Kochie
b14d0d6611
Update vendor gopkg.in/yaml.v2
2017-08-30 17:52:17 +02:00
Ben Kochie
072bc00f64
Update vendor golang.org/x/sys/unix
2017-08-30 17:50:06 +02:00
Ben Kochie
3f4f12eb1f
Update vendor github.com/prometheus/procfs
2017-08-30 17:49:43 +02:00
Ben Kochie
115cb0e157
Update vendor github.com/prometheus/common/...
2017-08-30 17:48:19 +02:00
Ben Kochie
fe0b1f55de
Update vendor github.com/prometheus/client_model/go
2017-08-30 17:46:30 +02:00
Ben Kochie
c7a2ae9b14
Update vendor github.com/beorn7/perks/quantile
2017-08-30 17:45:30 +02:00
Ben Kochie
22270c168d
Update vendor github.com/golang/protobuf/proto
2017-08-30 17:44:51 +02:00
Ben Kochie
533a6fcb18
Update vendor github.com/matttproud/golang_protobuf_extensions/pbutil
2017-08-30 17:42:46 +02:00
Ben Kochie
65d2513fde
Update vendor github.com/prometheus/client_golang
2017-08-30 17:39:31 +02:00
Tobias Schmidt
7e11f326ae
Merge pull request #92 from drawks/log_levels
...
Resolves #81 - Reduce log levels
2017-08-26 12:25:26 +02:00
Tobias Schmidt
d2ca0a8c0b
Merge pull request #91 from drawks/issue-88
...
Resolves #88 - histograms use wrong units
2017-08-26 12:24:02 +02:00
Dave Rawks
e493a9c766
Fixup per PR review:
...
* Added internal metric to track `illegal_negative_counter` events
2017-08-15 09:03:13 -07:00
Dave Rawks
06444ed5c0
Minor fix-ups per PR discussion
...
* Removed extraneous newline
* Reformatted/ordered imports
* Used hash function to derive index of `Elements` instead of
hardcoding hash result
2017-08-15 08:51:13 -07:00
Dave Rawks
42e41f1a7e
Resolves #81 - Reduce log levels
...
* Reduced all `log.Error*` events to `log.Debug*` in `exporter.go` where
an existing internal metric tracks the event.
2017-08-14 16:04:57 -07:00
Dave Rawks
b2082eda2b
Added test for histogram unit conversion
2017-08-14 15:20:45 -07:00
Dave Rawks
e37bee9bf2
Resolves #88 - histograms use wrong units
2017-08-14 11:23:14 -07:00
Julius Volz
aeab2905ad
Merge pull request #66 from bakins/extended-config
...
Allow histograms for timer metrics
2017-08-03 17:25:30 +02:00
Tobias Schmidt
a31feb5365
Merge pull request #82 from jwfang/tcp-doc3
...
update README for tcp listener, fix #75
2017-08-02 15:09:12 +02:00
jwfang
1194e00dec
Dockerfile export 9125/tcp
2017-08-02 13:31:33 +08:00
jwfang
bbdbb9a050
update README for tcp listener, fix #75
2017-08-02 13:22:28 +08:00
Brian Akins
9bca336876
Simple YAML configuration docs
2017-08-01 07:26:44 -04:00
Brian Akins
9c1cde63be
simplify metric label key validation
2017-08-01 07:07:44 -04:00
Brian Akins
c339cc66ac
Style fixes
2017-08-01 07:01:06 -04:00
jwfang
07543ac557
Add TCP StatsD listener support ( #71 )
...
* add TCP StatsD listener support
* add listen-tcp flag to control UDP/TCP mode on same port
* statsdListenUDP/statsdListenTCP as string, and alias listen-address to listen-udp
* add stats for tcp error/line_too_long
* add test for TCP listener
2017-08-01 12:21:00 +02:00
Brian Akins
93243f61a1
add test case for timer types
2017-07-27 17:01:12 -04:00
Brian Akins
c9510f7f23
add simple YAML config tests
2017-07-27 16:58:10 -04:00