Commit graph

399 commits

Author SHA1 Message Date
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
Ben Kochie
c15ffa2aa2 Merge pull request #69 from prometheus/v0.4.0
Release v0.4.0
2017-05-12 14:52:50 +02:00
Ben Kochie
4b0d773a6e Release v0.4.0
* [IMPROVEMENT] Add increment/decrement support to Gauges #65
* [BUGFIX] Tolerate more forms of broken lines from StatsD #48
* [BUGFIX] Skip metrics with invalid utf8 #50
* [BUGFIX] ListenAndServe now fails on exit #58
2017-05-12 14:36:27 +02:00
Tobias Schmidt
3039d12e3a Create sha256 checksums file during release 2017-04-15 12:51:43 -03:00
Brian Akins
641dc37b5d getMapping now returns 3 values 2017-03-13 08:15:43 -04:00
Brian Akins
1488f0f902 Allow overriding default timing type 2017-03-13 06:32:58 -04:00
Brian Akins
3048412df6 Add YAML config file and ability to set histograms 2017-03-12 21:11:05 -04:00
Brian Akins
df926ae85a Add yaml dependency 2017-03-12 19:46:36 -04:00
Julius Volz
03335d91cf Merge pull request #65 from GentlemanJ/master
Added increment/decrement support to Gauges
2017-03-10 12:27:02 +01:00
Justin Reid
9cd4b974e4 consensed if/else statement 2017-03-09 17:39:20 -07:00
Justin Reid
3efcef6229 Simplified inc/dec logic based on PR feedback.
There is no need to add the string to all event types as only Gauge
is compatible with inc/dec functionality.  Removed valueStr from all
events and added a simple boolean to the Gauge event instead
2017-03-09 17:35:29 -07:00
Justin Reid
7fc8727306 Added increment/decrement support to Gauges
Now passing the value as a string (with operation prefix) through to build event so that Listen() can modify the gauge metric appropriately
2017-03-09 15:50:06 -07:00
Ville Törhönen
446b7e6d44 Handle invalid mapping config files (#61)
* When a terminating newline is missing from the metric mapping configuration file, the last definition is not parsed at all. After this change the last 'METRIC_DEFINITION' in the file is equivalent to a newline (either between definitions or as the terminating newline).

* Update mapping, if we are reading the last line of the file. Otherwise we will append the mapping and lose the last label. Since we are updating the mapping in two different places a 'updateMapping' function was introduced.

* Added mapper test for config files without a terminating newline.

* Added another test case where multiple definitions are given without a final terminating newline.

* As suggested by @grobie, we should give an error when a terminating newline is missing. Updated tests accordingly.
2017-02-24 11:48:05 -04:00
Julius Volz
0285d7b4a7 Merge pull request #60 from prometheus/beorn7/meta
Replace AUTHORS.md by an updated MAINTAINERS.md
2017-02-16 21:12:29 +01:00
beorn7
109b5ad053 Replace AUTHORS.md by an updated MAINTAINERS.md 2017-02-16 20:19:09 +01:00
Tobias Schmidt
b1f3e6d7be Merge pull request #58 from nordicdyno/master
ListenAndServe now fails on exit
2017-02-11 17:23:29 -05:00
nordicdyno
6ac8203d40 http listener: log and fail on ListenAndServe error 2017-02-10 15:35:38 +03:00