dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

special case 'value' 

it usually connotes a single value type metric, appending just clutters

closes #793
This commit is contained in:
david birdsong 2016-03-08 18:33:57 +00:00 committed by Cameron Sparr
parent 31c323c097
commit d09bb13cb6
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/outputs/prometheus_client/prometheus_client.go
View File

@ -79,7 +79,12 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
} }
for n, val := range point.Fields() { for n, val := range point.Fields() {
mname := fmt.Sprintf("%s_%s", key, n) var mname string
if n == "value" {
mname = key
} else {
mname = fmt.Sprintf("%s_%s", key, n)
}
if _, ok := p.metrics[mname]; !ok { if _, ok := p.metrics[mname]; !ok {
p.metrics[mname] = prometheus.NewUntypedVec( p.metrics[mname] = prometheus.NewUntypedVec(
prometheus.UntypedOpts{ prometheus.UntypedOpts{

8
plugins/outputs/prometheus_client/prometheus_client_test.go
View File

@ -46,8 +46,8 @@ func TestPrometheusWritePointEmptyTag(t *testing.T) {
value float64 value float64
tags map[string]string tags map[string]string
}{ }{
{"test_point_1_value", 0.0, tags}, {"test_point_1", 0.0, tags},
{"test_point_2_value", 1.0, tags}, {"test_point_2", 1.0, tags},
} }
var acc testutil.Accumulator var acc testutil.Accumulator
@ -78,8 +78,8 @@ func TestPrometheusWritePointEmptyTag(t *testing.T) {
name string name string
value float64 value float64
}{ }{
{"test_point_3_value", 0.0}, {"test_point_3", 0.0},
{"test_point_4_value", 1.0}, {"test_point_4", 1.0},
} }
require.NoError(t, p.Gather(&acc)) require.NoError(t, p.Gather(&acc))