Commit graph

128 commits

Author SHA1 Message Date
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
Steve Durrheimer
5a9d2f996a Merge pull request #52 from prometheus/sdurrheimer-circle-use-base-image-for-tests
Use golang-builder base image for tests in CircleCI
2016-09-09 11:21:35 +02:00
Steve Durrheimer
c1f2d12554
circle: add tag v-prefix 2016-09-09 08:40:28 +02:00
Steve Durrheimer
24eab4e35a
Use golang-builder base image for tests in CircleCI 2016-09-09 08:34:16 +02:00
Tobias Schmidt
022c10fe0c Merge pull request #51 from prometheus/sdurrheimer-use-promu-default-go-version
Use promu default go version + use 1.6 tag for cicleci tests
2016-08-31 12:02:09 +02:00
Steve Durrheimer
8bf751d4e3
Use promu default go version + use 1.6 tag for cicleci tests 2016-08-31 08:05:49 +02:00
Tobias Schmidt
35828e29e9 Merge pull request #50 from Jimdo/drop_invalid_utf8
Skip metrics with invalid utf8
2016-07-27 16:53:34 -04:00
Ilya Margolin
237499eced Add a benchmark for handlePacket 2016-07-22 17:19:00 +02:00
Ilya Margolin
1fbc392800 Remove unintended changes 2016-07-21 17:55:47 +02:00
Ilya Margolin
bb4e42068f Skip metrics with invalid utf8 2016-07-20 20:27:23 +02:00
Tobias Schmidt
0c8b644ee1 Merge pull request #48 from haguenau/tolerate-broken-metrics
Tolerate more forms of broken lines from StatsD
2016-05-19 12:51:36 -04:00
David Haguenauer
56f65c4870 Don't panic on empty metric names or components
* Don't panic on empty metric names
* Don't panic on empty metric components
* Test tolerance the above kinds of broken StatsD lines
2016-05-19 12:43:35 -04:00
Steve Durrheimer
00f56b3809
Remove unused Makefile.COMMON file 2016-05-14 21:15:13 +02:00
Johannes 'fish' Ziemke
e00d9e84aa Merge pull request #45 from prometheus/fish/release-0.3.0
Release 0.3.0
2016-05-05 10:23:59 -07:00
Johannes 'fish' Ziemke
cc3025a1f9 Release 0.3.0 2016-05-05 19:23:31 +02:00
Ben Kochie
dcb67944be Merge pull request #46 from prometheus/sdurrheimer/fix-circleci-flanky-go-get
Fix CircleCI flanky go get
2016-05-05 06:52:44 -07:00
Steve Durrheimer
7a76b03aa7
Change the test docker image tag to match promu golang version 2016-05-05 13:11:05 +02:00
Steve Durrheimer
246008307f
Fix CircleCI problems during go get promu 2016-05-05 13:10:57 +02:00
Johannes 'fish' Ziemke
1710048a70 Merge pull request #44 from prometheus/fish/use-version-package
Use common/version and common/log packages
2016-05-04 14:36:27 -07:00
Johannes 'fish' Ziemke
03fde8f3ba Use common/version and common/log packages 2016-05-04 23:12:18 +02:00
Johannes 'fish' Ziemke
4d22a721eb Fix parameter to NewExporter in test 2016-05-03 23:45:48 +02:00
Johannes 'fish' Ziemke
61f4c6e926 Merge pull request #42 from prometheus/fish/new-build
New build process
2016-05-03 14:24:03 -07:00