diff --git a/CHANGELOG.md b/CHANGELOG.md index adf07b6a59462..d39c7925163b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ### Release Notes - Breaking change in the dovecot input plugin. See Features section below. +- Graphite output templates are now supported. See +https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite +- Possible breaking change for the librato and graphite outputs. Telegraf will +no longer insert field names when the field is simply named `value`. This is +because the `value` field is redundant in the graphite/librato context. ### Features - [#976](https://github.com/influxdata/telegraf/pull/976): Reduce allocations in the UDP and statsd inputs. @@ -11,6 +16,7 @@ - [#943](https://github.com/influxdata/telegraf/pull/943): http_response input plugin. Thanks @Lswith! - [#939](https://github.com/influxdata/telegraf/pull/939): sysstat input plugin. Thanks @zbindenren! - [#998](https://github.com/influxdata/telegraf/pull/998): **breaking change** enabled global, user and ip queries in dovecot plugin. Thanks @mikif70! +- [#1001](https://github.com/influxdata/telegraf/pull/1001): Graphite serializer templates. ### Bugfixes - [#968](https://github.com/influxdata/telegraf/issues/968): Processes plugin gets unknown state when spaces are in (command name) diff --git a/docs/DATA_FORMATS_OUTPUT.md b/docs/DATA_FORMATS_OUTPUT.md index 28f8cd6c31397..177734d16eda1 100644 --- a/docs/DATA_FORMATS_OUTPUT.md +++ b/docs/DATA_FORMATS_OUTPUT.md @@ -1,5 +1,11 @@ # Telegraf Output Data Formats +Telegraf is able to serialize metrics into the following output data formats: + +1. [InfluxDB Line Protocol](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#influx) +1. [JSON](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#json) +1. [Graphite](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite) + Telegraf metrics, like InfluxDB [points](https://docs.influxdata.com/influxdb/v0.10/write_protocols/line/), are a combination of four basic parts: @@ -29,8 +35,7 @@ config option, for example, in the `file` output plugin: ## Files to write to, "stdout" is a specially handled file. files = ["stdout"] - ## Data format to output. - + ## Data format to output. ## Each data format has it's own unique set of configuration options, read ## more about them here: ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md @@ -42,35 +47,46 @@ config option, for example, in the `file` output plugin: Each data_format has an additional set of configuration options available, which I'll go over below. -## Influx: +# Influx: There are no additional configuration options for InfluxDB line-protocol. The metrics are serialized directly into InfluxDB line-protocol. -#### Influx Configuration: +### Influx Configuration: ```toml [[outputs.file]] ## Files to write to, "stdout" is a specially handled file. files = ["stdout", "/tmp/metrics.out"] - ## Data format to output. - + ## Data format to output. ## Each data format has it's own unique set of configuration options, read ## more about them here: ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md data_format = "influx" ``` -## Graphite: +# Graphite: -The Graphite data format translates Telegraf metrics into _dot_ buckets. -The format is: +The Graphite data format translates Telegraf metrics into _dot_ buckets. A +template can be specified for the output of Telegraf metrics into Graphite +buckets. The default template is: ``` -[prefix].[host tag].[all tags (alphabetical)].[measurement name].[field name] value timestamp +template = "host.tags.measurement.field" ``` +In the above template, we have four parts: + +1. _host_ is a tag key. This can be any tag key that is in the Telegraf +metric(s). If the key doesn't exist, it will be ignored. If it does exist, the +tag value will be filled in. +1. _tags_ is a special keyword that outputs all remaining tag values, separated +by dots and in alphabetical order (by tag key). These will be filled after all +tag keys are filled. +1. _measurement_ is a special keyword that outputs the measurement name. +1. _field_ is a special keyword that outputs the field name. + Which means the following influx metric -> graphite conversion would happen: ``` @@ -80,28 +96,28 @@ tars.cpu-total.us-east-1.cpu.usage_user 0.89 1455320690 tars.cpu-total.us-east-1.cpu.usage_idle 98.09 1455320690 ``` -`prefix` is a configuration option when using the graphite output data format. - -#### Graphite Configuration: +### Graphite Configuration: ```toml [[outputs.file]] ## Files to write to, "stdout" is a specially handled file. files = ["stdout", "/tmp/metrics.out"] - ## Data format to output. - + ## Data format to output. ## Each data format has it's own unique set of configuration options, read ## more about them here: ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md - data_format = "influx" + data_format = "graphite" + # prefix each graphite bucket prefix = "telegraf" + # graphite template + template = "host.tags.measurement.field" ``` -## Json: +# JSON: -The Json data format serialized Telegraf metrics in json format. The format is: +The JSON data format serialized Telegraf metrics in json format. The format is: ```json { @@ -119,15 +135,14 @@ The Json data format serialized Telegraf metrics in json format. The format is: } ``` -#### Json Configuration: +### JSON Configuration: ```toml [[outputs.file]] ## Files to write to, "stdout" is a specially handled file. files = ["stdout", "/tmp/metrics.out"] - ## Data format to output. - + ## Data format to output. ## Each data format has it's own unique set of configuration options, read ## more about them here: ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md diff --git a/etc/telegraf.conf b/etc/telegraf.conf index 92deb2139012a..651db380e0d16 100644 --- a/etc/telegraf.conf +++ b/etc/telegraf.conf @@ -178,6 +178,9 @@ # servers = ["localhost:2003"] # ## Prefix metrics name # prefix = "" +# ## Graphite output template +# ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# template = "host.tags.measurement.field" # ## timeout in seconds for the write connection to graphite # timeout = 2 @@ -251,22 +254,20 @@ # [[outputs.librato]] # ## Librator API Docs # ## http://dev.librato.com/v1/metrics-authentication -# # ## Librato API user # api_user = "telegraf@influxdb.com" # required. -# # ## Librato API token # api_token = "my-secret-token" # required. -# -# ### Debug +# ## Debug # # debug = false -# -# ### Tag Field to populate source attribute (optional) -# ### This is typically the _hostname_ from which the metric was obtained. +# ## Tag Field to populate source attribute (optional) +# ## This is typically the _hostname_ from which the metric was obtained. # source_tag = "host" -# # ## Connection timeout. # # timeout = "5s" +# ## Output Name Template (same as graphite buckets) +# ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite +# template = "host.tags.measurement.field" # # Configuration for MQTT server to send metrics to diff --git a/internal/config/config.go b/internal/config/config.go index 1e07234e83121..cfd6c959349f4 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -850,8 +850,17 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error } } + if node, ok := tbl.Fields["template"]; ok { + if kv, ok := node.(*ast.KeyValue); ok { + if str, ok := kv.Value.(*ast.String); ok { + c.Template = str.Value + } + } + } + delete(tbl.Fields, "data_format") delete(tbl.Fields, "prefix") + delete(tbl.Fields, "template") return serializers.NewSerializer(c) } diff --git a/plugins/outputs/graphite/README.md b/plugins/outputs/graphite/README.md index 48313a886c323..2de699dea2948 100644 --- a/plugins/outputs/graphite/README.md +++ b/plugins/outputs/graphite/README.md @@ -1,13 +1,34 @@ # Graphite Output Plugin -This plugin writes to [Graphite](http://graphite.readthedocs.org/en/latest/index.html) via raw TCP. +This plugin writes to [Graphite](http://graphite.readthedocs.org/en/latest/index.html) +via raw TCP. + +## Configuration: + +```toml +# Configuration for Graphite server to send metrics to +[[outputs.graphite]] + ## TCP endpoint for your graphite instance. + servers = ["localhost:2003"] + ## Prefix metrics name + prefix = "" + ## Graphite output template + ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md + template = "host.tags.measurement.field" + ## timeout in seconds for the write connection to graphite + timeout = 2 +``` Parameters: - Servers []string - Prefix string - Timeout int + Servers []string + Prefix string + Timeout int + Template string * `servers`: List of strings, ["mygraphiteserver:2003"]. * `prefix`: String use to prefix all sent metrics. -* `timeout`: Connection timeout in second. +* `timeout`: Connection timeout in seconds. +* `template`: Template for graphite output format, see +https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +for more details. diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go index 717ce06c80b52..2a573e3450d36 100644 --- a/plugins/outputs/graphite/graphite.go +++ b/plugins/outputs/graphite/graphite.go @@ -16,10 +16,11 @@ import ( type Graphite struct { // URL is only for backwards compatability - Servers []string - Prefix string - Timeout int - conns []net.Conn + Servers []string + Prefix string + Template string + Timeout int + conns []net.Conn } var sampleConfig = ` @@ -27,6 +28,9 @@ var sampleConfig = ` servers = ["localhost:2003"] ## Prefix metrics name prefix = "" + ## Graphite output template + ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md + template = "host.tags.measurement.field" ## timeout in seconds for the write connection to graphite timeout = 2 ` @@ -72,7 +76,7 @@ func (g *Graphite) Description() string { func (g *Graphite) Write(metrics []telegraf.Metric) error { // Prepare data var bp []string - s, err := serializers.NewGraphiteSerializer(g.Prefix) + s, err := serializers.NewGraphiteSerializer(g.Prefix, g.Template) if err != nil { return err } diff --git a/plugins/outputs/graphite/graphite_test.go b/plugins/outputs/graphite/graphite_test.go index 9d94762418b63..8ef3521cf9b3c 100644 --- a/plugins/outputs/graphite/graphite_test.go +++ b/plugins/outputs/graphite/graphite_test.go @@ -54,7 +54,7 @@ func TestGraphiteOK(t *testing.T) { m1, _ := telegraf.NewMetric( "mymeasurement", map[string]string{"host": "192.168.0.1"}, - map[string]interface{}{"mymeasurement": float64(3.14)}, + map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) m2, _ := telegraf.NewMetric( @@ -90,10 +90,10 @@ func TCPServer(t *testing.T, wg *sync.WaitGroup) { reader := bufio.NewReader(conn) tp := textproto.NewReader(reader) data1, _ := tp.ReadLine() - assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement 3.14 1289430000", data1) + assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement.myfield 3.14 1289430000", data1) data2, _ := tp.ReadLine() - assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement.value 3.14 1289430000", data2) + assert.Equal(t, "my.prefix.192_168_0_1.mymeasurement 3.14 1289430000", data2) data3, _ := tp.ReadLine() - assert.Equal(t, "my.prefix.192_168_0_1.my_measurement.value 3.14 1289430000", data3) + assert.Equal(t, "my.prefix.192_168_0_1.my_measurement 3.14 1289430000", data3) conn.Close() } diff --git a/plugins/outputs/librato/librato.go b/plugins/outputs/librato/librato.go index f0f03400e587f..15d6adbb2e85c 100644 --- a/plugins/outputs/librato/librato.go +++ b/plugins/outputs/librato/librato.go @@ -21,6 +21,7 @@ type Librato struct { NameFromTags bool SourceTag string Timeout internal.Duration + Template string apiUrl string client *http.Client @@ -29,22 +30,20 @@ type Librato struct { var sampleConfig = ` ## Librator API Docs ## http://dev.librato.com/v1/metrics-authentication - ## Librato API user api_user = "telegraf@influxdb.com" # required. - ## Librato API token api_token = "my-secret-token" # required. - - ### Debug + ## Debug # debug = false - - ### Tag Field to populate source attribute (optional) - ### This is typically the _hostname_ from which the metric was obtained. + ## Tag Field to populate source attribute (optional) + ## This is typically the _hostname_ from which the metric was obtained. source_tag = "host" - ## Connection timeout. # timeout = "5s" + ## Output Name Template (same as graphite buckets) + ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite + template = "host.tags.measurement.field" ` type LMetrics struct { @@ -152,17 +151,13 @@ func (l *Librato) Description() string { return "Configuration for Librato API to send metrics to." } -func (l *Librato) buildGaugeName(m telegraf.Metric, fieldName string) string { - // Use the GraphiteSerializer - graphiteSerializer := graphite.GraphiteSerializer{} - return graphiteSerializer.SerializeBucketName(m, fieldName) -} - func (l *Librato) buildGauges(m telegraf.Metric) ([]*Gauge, error) { gauges := []*Gauge{} + serializer := graphite.GraphiteSerializer{Template: l.Template} + bucket := serializer.SerializeBucketName(m.Name(), m.Tags()) for fieldName, value := range m.Fields() { gauge := &Gauge{ - Name: l.buildGaugeName(m, fieldName), + Name: graphite.InsertField(bucket, fieldName), MeasureTime: m.Time().Unix(), } if !gauge.verifyValue(value) { diff --git a/plugins/outputs/librato/librato_test.go b/plugins/outputs/librato/librato_test.go index 3aa5b87485ebd..e903399282925 100644 --- a/plugins/outputs/librato/librato_test.go +++ b/plugins/outputs/librato/librato_test.go @@ -86,7 +86,7 @@ func TestBuildGauge(t *testing.T) { { testutil.TestMetric(0.0, "test1"), &Gauge{ - Name: "value1.test1.value", + Name: "value1.test1", MeasureTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix(), Value: 0.0, }, @@ -95,7 +95,7 @@ func TestBuildGauge(t *testing.T) { { testutil.TestMetric(1.0, "test2"), &Gauge{ - Name: "value1.test2.value", + Name: "value1.test2", MeasureTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix(), Value: 1.0, }, @@ -104,7 +104,7 @@ func TestBuildGauge(t *testing.T) { { testutil.TestMetric(10, "test3"), &Gauge{ - Name: "value1.test3.value", + Name: "value1.test3", MeasureTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix(), Value: 10.0, }, @@ -113,7 +113,7 @@ func TestBuildGauge(t *testing.T) { { testutil.TestMetric(int32(112345), "test4"), &Gauge{ - Name: "value1.test4.value", + Name: "value1.test4", MeasureTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix(), Value: 112345.0, }, @@ -122,7 +122,7 @@ func TestBuildGauge(t *testing.T) { { testutil.TestMetric(int64(112345), "test5"), &Gauge{ - Name: "value1.test5.value", + Name: "value1.test5", MeasureTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix(), Value: 112345.0, }, @@ -131,7 +131,7 @@ func TestBuildGauge(t *testing.T) { { testutil.TestMetric(float32(11234.5), "test6"), &Gauge{ - Name: "value1.test6.value", + Name: "value1.test6", MeasureTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix(), Value: 11234.5, }, @@ -189,7 +189,7 @@ func TestBuildGaugeWithSource(t *testing.T) { { pt1, &Gauge{ - Name: "192_168_0_1.value1.test1.value", + Name: "192_168_0_1.value1.test1", MeasureTime: time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC).Unix(), Value: 0.0, Source: "192.168.0.1", @@ -199,7 +199,7 @@ func TestBuildGaugeWithSource(t *testing.T) { { pt2, &Gauge{ - Name: "192_168_0_1.value1.test1.value", + Name: "192_168_0_1.value1.test1", MeasureTime: time.Date(2010, time.December, 10, 23, 0, 0, 0, time.UTC).Unix(), Value: 1.0, }, diff --git a/plugins/serializers/graphite/graphite.go b/plugins/serializers/graphite/graphite.go index 7a7fec2f1d374..6484d3fee57b8 100644 --- a/plugins/serializers/graphite/graphite.go +++ b/plugins/serializers/graphite/graphite.go @@ -8,11 +8,16 @@ import ( "github.com/influxdata/telegraf" ) +const DEFAULT_TEMPLATE = "host.tags.measurement.field" + +var fieldDeleter = strings.NewReplacer(".FIELDNAME", "", "FIELDNAME.", "") + type GraphiteSerializer struct { - Prefix string + Prefix string + Template string } -var sanitizedChars = strings.NewReplacer("/", "-", "@", "-", " ", "_") +var sanitizedChars = strings.NewReplacer("/", "-", "@", "-", " ", "_", "..", ".") func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]string, error) { out := []string{} @@ -20,65 +25,95 @@ func (s *GraphiteSerializer) Serialize(metric telegraf.Metric) ([]string, error) // Convert UnixNano to Unix timestamps timestamp := metric.UnixNano() / 1000000000 - for field_name, value := range metric.Fields() { - // Convert value - value_str := fmt.Sprintf("%#v", value) - // Write graphite metric - var graphitePoint string - graphitePoint = fmt.Sprintf("%s %s %d", - s.SerializeBucketName(metric, field_name), - value_str, + bucket := s.SerializeBucketName(metric.Name(), metric.Tags()) + + for fieldName, value := range metric.Fields() { + // Convert value to string + valueS := fmt.Sprintf("%#v", value) + point := fmt.Sprintf("%s %s %d", + // insert "field" section of template + InsertField(bucket, fieldName), + valueS, timestamp) - out = append(out, graphitePoint) + out = append(out, point) } return out, nil } -func (s *GraphiteSerializer) SerializeBucketName(metric telegraf.Metric, field_name string) string { - // Get the metric name - name := metric.Name() +// SerializeBucketName will take the given measurement name and tags and +// produce a graphite bucket. It will use the GraphiteSerializer.Template +// to generate this, or DEFAULT_TEMPLATE. +// +// NOTE: SerializeBucketName replaces the "field" portion of the template with +// FIELDNAME. It is up to the user to replace this. This is so that +// SerializeBucketName can be called just once per measurement, rather than +// once per field. See GraphiteSerializer.InsertField() function. +func (s *GraphiteSerializer) SerializeBucketName( + measurement string, + tags map[string]string, +) string { + if s.Template == "" { + s.Template = DEFAULT_TEMPLATE + } + tagsCopy := make(map[string]string) + for k, v := range tags { + tagsCopy[k] = v + } - // Convert UnixNano to Unix timestamps - tag_str := buildTags(metric) - - // Write graphite metric - var serializedBucketName string - if name == field_name { - serializedBucketName = fmt.Sprintf("%s.%s", - tag_str, - strings.Replace(name, ".", "_", -1)) - } else { - serializedBucketName = fmt.Sprintf("%s.%s.%s", - tag_str, - strings.Replace(name, ".", "_", -1), - strings.Replace(field_name, ".", "_", -1)) + var out []string + templateParts := strings.Split(s.Template, ".") + for _, templatePart := range templateParts { + switch templatePart { + case "measurement": + out = append(out, measurement) + case "tags": + // we will replace this later + out = append(out, "TAGS") + case "field": + // user of SerializeBucketName needs to replace this + out = append(out, "FIELDNAME") + default: + // This is a tag being applied + if tagvalue, ok := tagsCopy[templatePart]; ok { + out = append(out, strings.Replace(tagvalue, ".", "_", -1)) + delete(tagsCopy, templatePart) + } + } } - if s.Prefix != "" { - serializedBucketName = fmt.Sprintf("%s.%s", s.Prefix, serializedBucketName) + + // insert remaining tags into output name + for i, templatePart := range out { + if templatePart == "TAGS" { + out[i] = buildTags(tagsCopy) + break + } } - return serializedBucketName + + if s.Prefix == "" { + return sanitizedChars.Replace(strings.Join(out, ".")) + } + return sanitizedChars.Replace(s.Prefix + "." + strings.Join(out, ".")) } -func buildTags(metric telegraf.Metric) string { +// InsertField takes the bucket string from SerializeBucketName and replaces the +// FIELDNAME portion. If fieldName == "value", it will simply delete the +// FIELDNAME portion. +func InsertField(bucket, fieldName string) string { + // if the field name is "value", then dont use it + if fieldName == "value" { + return fieldDeleter.Replace(bucket) + } + return strings.Replace(bucket, "FIELDNAME", fieldName, 1) +} + +func buildTags(tags map[string]string) string { var keys []string - tags := metric.Tags() for k := range tags { - if k == "host" { - continue - } keys = append(keys, k) } sort.Strings(keys) var tag_str string - if host, ok := tags["host"]; ok { - if len(keys) > 0 { - tag_str = strings.Replace(host, ".", "_", -1) + "." - } else { - tag_str = strings.Replace(host, ".", "_", -1) - } - } - for i, k := range keys { tag_value := strings.Replace(tags[k], ".", "_", -1) if i == 0 { @@ -87,5 +122,5 @@ func buildTags(metric telegraf.Metric) string { tag_str += "." + tag_value } } - return sanitizedChars.Replace(tag_str) + return tag_str } diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go index 8d25bf937709a..64c65d16b38b8 100644 --- a/plugins/serializers/graphite/graphite_test.go +++ b/plugins/serializers/graphite/graphite_test.go @@ -11,6 +11,23 @@ import ( "github.com/influxdata/telegraf" ) +var defaultTags = map[string]string{ + "host": "localhost", + "cpu": "cpu0", + "datacenter": "us-west-2", +} + +const ( + template1 = "tags.measurement.field" + template2 = "host.measurement.field" + template3 = "host.tags.field" + template4 = "host.tags.measurement" + // this template explicitly uses all tag keys, so "tags" should be empty + template5 = "host.datacenter.cpu.tags.measurement.field" + // this template has non-existent tag keys + template6 = "foo.host.cpu.bar.tags.measurement.field" +) + func TestGraphiteTags(t *testing.T) { m1, _ := telegraf.NewMetric( "mymeasurement", @@ -31,12 +48,12 @@ func TestGraphiteTags(t *testing.T) { time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - tags1 := buildTags(m1) - tags2 := buildTags(m2) - tags3 := buildTags(m3) + tags1 := buildTags(m1.Tags()) + tags2 := buildTags(m2.Tags()) + tags3 := buildTags(m3.Tags()) assert.Equal(t, "192_168_0_1", tags1) - assert.Equal(t, "192_168_0_1.first.second", tags2) + assert.Equal(t, "first.second.192_168_0_1", tags2) assert.Equal(t, "first.second", tags3) } @@ -93,6 +110,82 @@ func TestSerializeMetricHost(t *testing.T) { assert.Equal(t, expS, mS) } +// test that a field named "value" gets ignored. +func TestSerializeValueField(t *testing.T) { + now := time.Now() + tags := map[string]string{ + "host": "localhost", + "cpu": "cpu0", + "datacenter": "us-west-2", + } + fields := map[string]interface{}{ + "value": float64(91.5), + } + m, err := telegraf.NewMetric("cpu", tags, fields, now) + assert.NoError(t, err) + + s := GraphiteSerializer{} + mS, err := s.Serialize(m) + assert.NoError(t, err) + + expS := []string{ + fmt.Sprintf("localhost.cpu0.us-west-2.cpu 91.5 %d", now.Unix()), + } + assert.Equal(t, expS, mS) +} + +// test that a field named "value" gets ignored in middle of template. +func TestSerializeValueField2(t *testing.T) { + now := time.Now() + tags := map[string]string{ + "host": "localhost", + "cpu": "cpu0", + "datacenter": "us-west-2", + } + fields := map[string]interface{}{ + "value": float64(91.5), + } + m, err := telegraf.NewMetric("cpu", tags, fields, now) + assert.NoError(t, err) + + s := GraphiteSerializer{ + Template: "host.field.tags.measurement", + } + mS, err := s.Serialize(m) + assert.NoError(t, err) + + expS := []string{ + fmt.Sprintf("localhost.cpu0.us-west-2.cpu 91.5 %d", now.Unix()), + } + assert.Equal(t, expS, mS) +} + +// test that a field named "value" gets ignored at beginning of template. +func TestSerializeValueField3(t *testing.T) { + now := time.Now() + tags := map[string]string{ + "host": "localhost", + "cpu": "cpu0", + "datacenter": "us-west-2", + } + fields := map[string]interface{}{ + "value": float64(91.5), + } + m, err := telegraf.NewMetric("cpu", tags, fields, now) + assert.NoError(t, err) + + s := GraphiteSerializer{ + Template: "field.host.tags.measurement", + } + mS, err := s.Serialize(m) + assert.NoError(t, err) + + expS := []string{ + fmt.Sprintf("localhost.cpu0.us-west-2.cpu 91.5 %d", now.Unix()), + } + assert.Equal(t, expS, mS) +} + func TestSerializeMetricPrefix(t *testing.T) { now := time.Now() tags := map[string]string{ @@ -133,48 +226,128 @@ func TestSerializeBucketNameNoHost(t *testing.T) { assert.NoError(t, err) s := GraphiteSerializer{} - mS := s.SerializeBucketName(m, "usage_idle") + mS := s.SerializeBucketName(m.Name(), m.Tags()) - expS := fmt.Sprintf("cpu0.us-west-2.cpu.usage_idle") + expS := "cpu0.us-west-2.cpu.FIELDNAME" assert.Equal(t, expS, mS) } func TestSerializeBucketNameHost(t *testing.T) { now := time.Now() - tags := map[string]string{ - "host": "localhost", - "cpu": "cpu0", - "datacenter": "us-west-2", - } fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := telegraf.NewMetric("cpu", tags, fields, now) + m, err := telegraf.NewMetric("cpu", defaultTags, fields, now) assert.NoError(t, err) s := GraphiteSerializer{} - mS := s.SerializeBucketName(m, "usage_idle") + mS := s.SerializeBucketName(m.Name(), m.Tags()) - expS := fmt.Sprintf("localhost.cpu0.us-west-2.cpu.usage_idle") + expS := "localhost.cpu0.us-west-2.cpu.FIELDNAME" assert.Equal(t, expS, mS) } func TestSerializeBucketNamePrefix(t *testing.T) { now := time.Now() - tags := map[string]string{ - "host": "localhost", - "cpu": "cpu0", - "datacenter": "us-west-2", - } fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := telegraf.NewMetric("cpu", tags, fields, now) + m, err := telegraf.NewMetric("cpu", defaultTags, fields, now) assert.NoError(t, err) s := GraphiteSerializer{Prefix: "prefix"} - mS := s.SerializeBucketName(m, "usage_idle") + mS := s.SerializeBucketName(m.Name(), m.Tags()) + + expS := "prefix.localhost.cpu0.us-west-2.cpu.FIELDNAME" + assert.Equal(t, expS, mS) +} + +func TestTemplate1(t *testing.T) { + now := time.Now() + fields := map[string]interface{}{ + "usage_idle": float64(91.5), + } + m, err := telegraf.NewMetric("cpu", defaultTags, fields, now) + assert.NoError(t, err) + + s := GraphiteSerializer{Template: template1} + mS := s.SerializeBucketName(m.Name(), m.Tags()) + + expS := "cpu0.us-west-2.localhost.cpu.FIELDNAME" + assert.Equal(t, expS, mS) +} + +func TestTemplate2(t *testing.T) { + now := time.Now() + fields := map[string]interface{}{ + "usage_idle": float64(91.5), + } + m, err := telegraf.NewMetric("cpu", defaultTags, fields, now) + assert.NoError(t, err) + + s := GraphiteSerializer{Template: template2} + mS := s.SerializeBucketName(m.Name(), m.Tags()) + + expS := "localhost.cpu.FIELDNAME" + assert.Equal(t, expS, mS) +} + +func TestTemplate3(t *testing.T) { + now := time.Now() + fields := map[string]interface{}{ + "usage_idle": float64(91.5), + } + m, err := telegraf.NewMetric("cpu", defaultTags, fields, now) + assert.NoError(t, err) + + s := GraphiteSerializer{Template: template3} + mS := s.SerializeBucketName(m.Name(), m.Tags()) + + expS := "localhost.cpu0.us-west-2.FIELDNAME" + assert.Equal(t, expS, mS) +} + +func TestTemplate4(t *testing.T) { + now := time.Now() + fields := map[string]interface{}{ + "usage_idle": float64(91.5), + } + m, err := telegraf.NewMetric("cpu", defaultTags, fields, now) + assert.NoError(t, err) + + s := GraphiteSerializer{Template: template4} + mS := s.SerializeBucketName(m.Name(), m.Tags()) + + expS := "localhost.cpu0.us-west-2.cpu" + assert.Equal(t, expS, mS) +} + +func TestTemplate5(t *testing.T) { + now := time.Now() + fields := map[string]interface{}{ + "usage_idle": float64(91.5), + } + m, err := telegraf.NewMetric("cpu", defaultTags, fields, now) + assert.NoError(t, err) + + s := GraphiteSerializer{Template: template5} + mS := s.SerializeBucketName(m.Name(), m.Tags()) + + expS := "localhost.us-west-2.cpu0.cpu.FIELDNAME" + assert.Equal(t, expS, mS) +} + +func TestTemplate6(t *testing.T) { + now := time.Now() + fields := map[string]interface{}{ + "usage_idle": float64(91.5), + } + m, err := telegraf.NewMetric("cpu", defaultTags, fields, now) + assert.NoError(t, err) + + s := GraphiteSerializer{Template: template6} + mS := s.SerializeBucketName(m.Name(), m.Tags()) - expS := fmt.Sprintf("prefix.localhost.cpu0.us-west-2.cpu.usage_idle") + expS := "localhost.cpu0.us-west-2.cpu.FIELDNAME" assert.Equal(t, expS, mS) } diff --git a/plugins/serializers/registry.go b/plugins/serializers/registry.go index ebf79bc59bbb1..0cf8149e38ed2 100644 --- a/plugins/serializers/registry.go +++ b/plugins/serializers/registry.go @@ -30,6 +30,10 @@ type Config struct { // Prefix to add to all measurements, only supports Graphite Prefix string + + // Template for converting telegraf metrics into Graphite + // only supports Graphite + Template string } // NewSerializer a Serializer interface based on the given config. @@ -40,7 +44,7 @@ func NewSerializer(config *Config) (Serializer, error) { case "influx": serializer, err = NewInfluxSerializer() case "graphite": - serializer, err = NewGraphiteSerializer(config.Prefix) + serializer, err = NewGraphiteSerializer(config.Prefix, config.Template) case "json": serializer, err = NewJsonSerializer() } @@ -55,8 +59,9 @@ func NewInfluxSerializer() (Serializer, error) { return &influx.InfluxSerializer{}, nil } -func NewGraphiteSerializer(prefix string) (Serializer, error) { +func NewGraphiteSerializer(prefix, template string) (Serializer, error) { return &graphite.GraphiteSerializer{ - Prefix: prefix, + Prefix: prefix, + Template: template, }, nil }