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

Include all tag values in graphite output

Browse Source 
closes #595
This commit is contained in:
Cameron Sparr
2016-01-27 14:15:31 -07:00
parent c549ab907a
commit 9d4b55be19
2 changed files with 77 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/outputs/graphite/graphite_test.go
View File

@@ -21,7 +21,7 @@ func TestGraphiteError(t *testing.T) {
Prefix: "my.prefix",
}
// Init metrics
pt1, _ := telegraf.NewMetric(
m1, _ := telegraf.NewMetric(
"mymeasurement",
map[string]string{"host": "192.168.0.1"},
map[string]interface{}{"mymeasurement": float64(3.14)},
@@ -29,7 +29,7 @@ func TestGraphiteError(t *testing.T) {
)
// Prepare point list
var metrics []telegraf.Metric
metrics = append(metrics, pt1)
metrics = append(metrics, m1)
// Error
err1 := g.Connect()
require.NoError(t, err1)
@@ -45,19 +45,19 @@ func TestGraphiteOK(t *testing.T) {
Prefix: "my.prefix",
}
// Init metrics
pt1, _ := telegraf.NewMetric(
m1, _ := telegraf.NewMetric(
"mymeasurement",
map[string]string{"host": "192.168.0.1"},
map[string]interface{}{"mymeasurement": float64(3.14)},
time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
)
pt2, _ := telegraf.NewMetric(
m2, _ := telegraf.NewMetric(
"mymeasurement",
map[string]string{"host": "192.168.0.1"},
map[string]interface{}{"value": float64(3.14)},
time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
)
pt3, _ := telegraf.NewMetric(
m3, _ := telegraf.NewMetric(
"my_measurement",
map[string]string{"host": "192.168.0.1"},
map[string]interface{}{"value": float64(3.14)},
@@ -65,9 +65,9 @@ func TestGraphiteOK(t *testing.T) {
)
// Prepare point list
var metrics []telegraf.Metric
metrics = append(metrics, pt1)
metrics = append(metrics, pt2)
metrics = append(metrics, pt3)
metrics = append(metrics, m1)
metrics = append(metrics, m2)
metrics = append(metrics, m3)
// Start TCP server
wg.Add(1)
go TCPServer(t, &wg)
@@ -102,3 +102,32 @@ func TCPServer(t *testing.T, wg *sync.WaitGroup) {
conn.Close()
wg.Done()
}
func TestGraphiteTags(t *testing.T) {
m1, _ := telegraf.NewMetric(
"mymeasurement",
map[string]string{"host": "192.168.0.1"},
map[string]interface{}{"value": float64(3.14)},
time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
)
m2, _ := telegraf.NewMetric(
"mymeasurement",
map[string]string{"host": "192.168.0.1", "afoo": "first", "bfoo": "second"},
map[string]interface{}{"value": float64(3.14)},
time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
)
m3, _ := telegraf.NewMetric(
"mymeasurement",
map[string]string{"afoo": "first", "bfoo": "second"},
map[string]interface{}{"value": float64(3.14)},
time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
)
tags1 := buildTags(m1)
tags2 := buildTags(m2)
tags3 := buildTags(m3)
assert.Equal(t, "192_168_0_1", tags1)
assert.Equal(t, "192_168_0_1.first.second", tags2)
assert.Equal(t, "first.second", tags3)
}