Commit graph

11 commits

Author SHA1 Message Date
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
Jason Mooberry 5018c7415a Allow comments in mapping files 2017-05-23 18:12:17 -04:00
Brian Akins 3048412df6 Add YAML config file and ability to set histograms 2017-03-12 21:11:05 -04: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
Mac Browning 411b071f1f allow metrics with dashes when mapping 2015-10-09 19:38:21 -04:00
Julius Volz b299c8a72d Fix license headers to match LICENSE file. 2015-02-19 01:04:25 +01:00
Bjoern Rabenstein 65e9c49ca8 Migrate to new client_golang.
This should only be merged once the new client_golang is merged to its
master branch.
2014-06-26 15:56:21 +02:00
Julius Volz 728bdc52ae Ensure valid metric names and change statsd metric escaping. 2013-07-12 14:27:51 +02:00
Julius Volz eff54bdcf9 Implement config watching and reloading. 2013-07-08 21:00:57 +02:00
Julius Volz 80d504ae46 Implement statsd-to-prometheus metric label mappings. 2013-07-05 23:03:57 +02:00