Commit graph

58 commits

Author SHA1 Message Date
Julius Volz
e9eb193ff9 Merge pull request #31 from mmethner/master
fix documentation for docker udp port publishing
2016-02-01 17:48:33 +01:00
Mathias Methner
dc0ab29c33 fix documentation for docker udp port publishing 2016-02-01 16:54:59 +01:00
Julius Volz
e8f1e9c9c3 Update Julius's email address in AUTHORS.md 2015-10-26 02:25:54 +01:00
Julius Volz
3727277927 Merge pull request #26 from macb/exporter_rename
rename bridge to exporter
2015-10-17 15:50:01 +02:00
Julius Volz
3bf0889452 Merge pull request #25 from macb/root_endpoint
add root endpoint with redirect
2015-10-15 06:21:24 +02:00
Julius Volz
28d4020341 Merge pull request #24 from macb/allow_hyphen_hostname
allow metrics with dashes when mapping
2015-10-12 02:52:22 +02:00
Mac Browning
ea7341a6c4 rename bridge -> exporter 2015-10-09 20:34:28 -04:00
Mac Browning
c4ab11d05c add root endpoint with redirect 2015-10-09 20:26:05 -04:00
Mac Browning
411b071f1f allow metrics with dashes when mapping 2015-10-09 19:38:21 -04:00
Björn Rabenstein
4270a5ed7e Merge pull request #23 from prometheus/move-to-common
Move from client_golang/model to common/model
2015-09-17 14:38:16 +02:00
beorn7
6a1c44989b Move from client_golang/model to common/model 2015-09-17 13:14:18 +02:00
Julius Volz
6b318a471e Merge pull request #22 from Jimdo/config_udp_buffer
Allow configuration of UDP read buffer
2015-09-09 17:55:53 +02:00
Fabian Stehle
3d7b731cfd Allow configuration of UDP read buffer 2015-09-09 17:50:32 +02:00
Julius Volz
b6210fc395 Merge pull request #17 from sdurrheimer/master
New Dockerfile using alpine-golang-make-onbuild base image
2015-07-13 12:17:32 +02:00
Steve Durrheimer
395c1422e5 Add Docker instructions to the README 2015-07-11 13:22:06 +02:00
Steve Durrheimer
c2d70fe7dc New Dockerfile using alpine-golang-make-onbuild base image 2015-06-18 20:50:31 +02:00
Steve Durrheimer
c8430495ae Update Makefile.COMMON from prometheus/utils 2015-06-18 20:50:31 +02:00
Julius Volz
e0bf2be66a Merge pull request #16 from prometheus/document-no-statsd-case
Document use-case without any StatsD server.
2015-06-18 20:15:14 +02:00
Julius Volz
143288bf07 Document use-case without any StatsD server.
Fixes https://github.com/prometheus/statsd_bridge/issues/15
2015-06-18 14:24:46 +02:00
Julius Volz
ce864c0131 Merge pull request #14 from prometheus/migrate-logging
Migrate logging to prometheus/log.
2015-05-29 14:22:36 +02:00
Julius Volz
1ee380cc39 Migrate logging to prometheus/log. 2015-05-29 13:45:11 +02:00
Julius Volz
ccbaa9d754 Merge pull request #12 from brian-brazil/fix-readme
Correct example, need to specify variables like in bash.
2015-04-17 00:41:32 +02:00
Brian Brazil
a054446e2f Correct example, need to specify variables like in bash.
See http://golang.org/pkg/regexp/#Regexp.Expand
2015-04-16 23:35:46 +01:00
Julius Volz
ec25a3dbfe Update Makefile.COMMON 2015-03-28 01:14:55 +01:00
Julius Volz
729bdfeef7 Update usage flags in README.md. 2015-03-23 13:45:29 +01:00
Julius Volz
9715b18315 Merge pull request #9 from prometheus/common-make-infra
Use Makefile.COMMON for building statsd_bridge.
2015-02-23 17:38:42 +01:00
Julius Volz
2ec8131d3b Use Makefile.COMMON for building statsd_bridge. 2015-02-23 16:46:25 +01:00
Julius Volz
9971e3cd30 Merge pull request #8 from prometheus/fix-license
Fix license headers to match LICENSE file.
2015-02-19 13:09:21 +01:00
Julius Volz
b299c8a72d Fix license headers to match LICENSE file. 2015-02-19 01:04:25 +01:00
juliusv
a373aee28e Merge pull request #7 from bracki/cosmetics
Cosmetics
2015-02-11 22:43:17 +01:00
Jan Brauer
c8a749f7c5 Use log.fatalf 2015-02-11 22:31:49 +01:00
Jan Brauer
f7dfad9bd4 Use argument instead of global 2015-02-11 22:30:57 +01:00
juliusv
5488430fad Merge pull request #6 from prometheus/flag-cleanup
Make flag names consistent across projects.
2015-02-09 12:24:51 +01:00
Julius Volz
61cba974b0 Make flag names consistent across projects. 2015-02-09 00:26:08 +01:00
juliusv
34cdec461a Merge pull request #5 from prometheus/beorn7/license-cleanup
License cleanup
2015-01-22 17:58:43 +01:00
Bjoern Rabenstein
be63255684 License cleanup 2015-01-22 17:56:04 +01:00
juliusv
1b22e2fae8 Merge pull request #4 from prometheus/beorn7/new-register-call
Adjust call syntax of Register to the new client_golang.
2015-01-22 17:02:24 +01:00
Bjoern Rabenstein
1c567153ab Adjust call syntax of Register to the new client_golang. 2015-01-12 19:14:29 +01:00
Björn Rabenstein
609bc94bc7 Merge pull request #2 from prometheus/migration/new-client-golang
Migrate to new client_golang.
2014-06-30 17:24:28 +02:00
Bjoern Rabenstein
87a3310e83 counter -> total. 2014-06-27 18:51:29 +02: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
juliusv
fe0359ec09 Update README.md 2013-07-06 00:32:52 +02:00
Julius Volz
42ad6cb8d6 Separate bridge into new file. 2013-07-06 00:13:39 +02:00
Julius Volz
fc22870425 Merge branch 'master' of github.com:prometheus/statsd_bridge 2013-07-05 23:53:32 +02:00
Julius Volz
5b453a916e Change default statsd-receive port to 9125. 2013-07-05 23:53:15 +02:00
juliusv
9cee127f0d Wrap README.md lines 2013-07-05 23:51:30 +02:00
juliusv
a3dfea3958 Update README.md 2013-07-05 23:49:05 +02:00
juliusv
fc78bc553d Update README.md 2013-07-05 23:45:20 +02:00