Commit graph

165 commits

Author SHA1 Message Date
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
Brian Akins
2643f1550f cleanup debug statements 2017-07-26 18:40:56 -04:00
Brian Akins
b467a537d5 Validate timer type while reading config 2017-07-26 14:50:29 -04:00
Brian Akins
e8997f7cd9 Style: Yaml -> YAML 2017-07-26 14:04:27 -04:00
Brian Akins
74975b8411 merge with upstream master 2017-07-26 14:03:08 -04:00
Tobias Schmidt
8b40f781ef Merge pull request #72 from jacksontj/master
Fixes for crashes with conflicting metric values
2017-07-18 20:19:59 +02:00
Thomas Jackson
bbd5227a1c Add metric for total number of conflicting events 2017-07-18 08:58:40 -07:00
Thomas Jackson
c1791d7ecb Ensure we log errors every time there is a problem
Move addition of metric to "Elements" until after a successful registry
with prometheus, otherwise we'll continue to increment a metric which
isn't registered
2017-07-18 08:58:40 -07:00
Thomas Jackson
d9aa6e2867 Don't crash on conflicting metric names
This patch simply moves the error message from a log.Fatalf() to a
log.Errorf() to continue on.

Fixes #63
2017-07-18 08:58:40 -07:00
Thomas Jackson
22520f4c7b Move value check before metric get
If someone is emitting negative counters we shouldn't even register the
metric for them
2017-07-18 08:58:40 -07:00
Tobias Schmidt
663b6a1e69 Merge pull request #28 from Kiliaro/master
Added support for sampling factor on timing events
2017-05-25 06:48:01 +02:00
Julius Volz
20becbc27b Merge pull request #70 from jasonmoo/master
Allow comments in mapping files
2017-05-24 09:49:45 +02:00
Jason Mooberry
5018c7415a Allow comments in mapping files 2017-05-23 18:12:17 -04:00
Andreas Andersen
b5dfc9c9ce Added support for sampling factor on timing events 2017-05-15 15:57:31 +02:00
Ben Kochie
89e5e36b51 Fix v0.4.0 release entry. 2017-05-12 15:02:44 +02:00