Merge pull request #5419 from m4ce/master

Adding support for matching tags multiple times in Graphite parser

services/graphite/README.md

@@ -31,14 +31,14 @@ The special value _measurement_ is used to define the measurement name.  It can
 * Template: `.host.resource.measurement*`
 * Output:  _measurement_ =`loadavg.10` _tags_ =`host=localhost resource=cpu`
 
-### Multiple Measurement Matching
+### Multiple Measurement & Tags Matching
 
-The _measurement_ can be specified multiple times in a template to provide more control over the measurement name.  Multiple values
-will be joined together using the _Separator_ config variable.  By default, this value is `.`.
+The _measurement_ can be specified multiple times in a template to provide more control over the measurement name. Tags can also be
+matched multiple times. Multiple values will be joined together using the _Separator_ config variable.  By default, this value is `.`.
 
-`servers.localhost.cpu.cpu0.user`
-* Template: `.host.measurement.cpu.measurement`
-* Output: _measurement_ = `cpu.user` _tags_ = `host=localhost cpu=cpu0`
+`servers.localhost.localdomain.cpu.cpu0.user`
+* Template: `.host.host.measurement.cpu.measurement`
+* Output: _measurement_ = `cpu.user` _tags_ = `host=localhost.localdomain cpu=cpu0`
 
 Since '.' requires queries on measurements to be double-quoted, you may want to set this to `_` to simplify querying parsed metrics.
 

services/graphite/parser.go

@@ -216,13 +216,13 @@ func (t *template) Apply(line string) (string, map[string]string, string, error)
 	fields := strings.Split(line, ".")
 	var (
 		measurement []string
-		tags        = make(map[string]string)
+		tags        = make(map[string][]string)
 		field       string
 	)
 
 	// Set any default tags
 	for k, v := range t.defaultTags {
-		tags[k] = v
+		tags[k] = append(tags[k], v)
 	}
 
 	for i, tag := range t.tags {
@@ -241,11 +241,17 @@ func (t *template) Apply(line string) (string, map[string]string, string, error)
 			measurement = append(measurement, fields[i:]...)
 			break
 		} else if tag != "" {
-			tags[tag] = fields[i]
+			tags[tag] = append(tags[tag], fields[i])
 		}
 	}
 
-	return strings.Join(measurement, t.separator), tags, field, nil
+	// Convert to map of strings.
+	out_tags := make(map[string]string)
+	for k, values := range tags {
+		out_tags[k] = strings.Join(values, t.separator)
+	}
+
+	return strings.Join(measurement, t.separator), out_tags, field, nil
 }
 
 // matcher determines which template should be applied to a given metric

services/graphite/parser_test.go

@@ -60,6 +60,13 @@ func TestTemplateApply(t *testing.T) {
 			measurement: "cpu",
 			tags:        map[string]string{"hostname": "server01", "region": "us-west"},
 		},
+		{
+			test:        "metric with multiple tags",
+			input:       "server01.example.org.cpu.us-west",
+			template:    "hostname.hostname.hostname.measurement.region",
+			measurement: "cpu",
+			tags:        map[string]string{"hostname": "server01.example.org", "region": "us-west"},
+		},
 		{
 			test: "no metric",
 			tags: make(map[string]string),