9 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	23de094a81	feat(alerting/annotations): fixed broken test	2016-09-08 13:22:30 +02:00
Torkel Ödegaard	f9b628ad0e	Merge branch 'v3.1.x' ... Conflicts: conf/defaults.ini conf/sample.ini pkg/metrics/graphite.go pkg/metrics/graphite_test.go	2016-08-17 09:53:46 +02:00
bergquist	f7a9102523	feat(metrics): improve graphite settings ... Fixes the broken support for overriding settings with ENV variables. closes #5769	2016-08-15 09:59:55 +02:00
bergquist	cf6736d480	fix(metrics): add ending dot for graphite prefix	2016-08-15 09:58:32 +02:00
bergquist	ebecc5e5a0	fix(metrics): make metrics cfg backwards compatible	2016-08-15 09:57:49 +02:00
bergquist	0524d0c625	fix(metrics): replaces . with _ in instance name ... closes #5739	2016-08-15 09:57:00 +02:00
bergquist	2fa97427eb	fix(metrics): add ending dot for graphite prefix	2016-08-12 08:06:54 +02:00
bergquist	03f0bc46a1	fix(metrics): make metrics cfg backwards compatible	2016-08-10 11:15:49 +02:00
bergquist	5b57210aeb	fix(metrics): replaces . with _ in instance name ... closes #5739	2016-08-09 14:06:03 +02:00