added feature #56

Author: adejoux

hmc/hmc.go

@@ -156,6 +156,13 @@ func (hmc *HMC) AddPoint(name string, metric string, values []float64) {
 				}
 			}
 		}
+		if _, ok := hmc.TagParsers["_ALL"][key]; ok {
+			for _, tagParser := range hmc.TagParsers["_ALL"][key] {
+				if tagParser.Regexp.MatchString(value) {
+					tags[tagParser.Name] = tagParser.Value
+				}
+			}
+		}
 	}
 	hmc.InfluxDB.AddPoint(point.Name, hmc.GlobalPoint.Timestamp, field, tags)
 }

main.go

@@ -73,7 +73,7 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "nmon2influxdb"
 	app.Usage = "upload NMON stats to InfluxDB database"
-	app.Version = "2.1.4"
+	app.Version = "2.1.5"
 	app.Commands = []cli.Command{
 		{
 			Name:  "import",

nmon/import.go

@@ -194,6 +194,15 @@ func Import(c *cli.Context) {
 								}
 							}
 						}
+
+						if _, ok := nmon.TagParsers["_ALL"][key]; ok {
+							for _, tagParser := range nmon.TagParsers["_ALL"][key] {
+								if tagParser.Regexp.MatchString(value) {
+									tags[tagParser.Name] = tagParser.Value
+								}
+							}
+						}
+
 					}
 					influxdb.AddPoint(measurement, timestamp, field, tags)
 

nmon2influxdblib/parser.go

@@ -6,6 +6,7 @@ package nmon2influxdblib
 import (
 	"fmt"
 	"regexp"
+	"strings"
 )
 
 //Tags array
@@ -31,20 +32,30 @@ func ParseInputs(inputs Inputs) TagParsers {
 			fmt.Printf("could not compile Config Input match parameter %s\n", input.Match)
 		}
 
-		// Intialize if empty struct
-		if _, ok := tagParsers[input.Measurement]; !ok {
-			tagParsers[input.Measurement] = make(map[string]Tags)
+		var measurements []string
+
+		if len(input.Measurement) == 0 {
+			measurements = []string{"_ALL"}
+		} else {
+			measurements = strings.Split(input.Measurement, ",")
 		}
 
-		tagger := tagParsers[input.Measurement][input.Name]
+		for _, measurement := range measurements {
+			// Intialize if empty struct
+			if _, ok := tagParsers[measurement]; !ok {
+				tagParsers[measurement] = make(map[string]Tags)
+			}
 
-		for _, tag := range input.Tags {
-			tag.Regexp = tagRegexp
-			tagger = append(tagger, tag)
-		}
+			tagger := tagParsers[measurement][input.Name]
 
-		tagParsers[input.Measurement][input.Name] = tagger
+			for _, tag := range input.Tags {
+				tag.Regexp = tagRegexp
+				tagger = append(tagger, tag)
+			}
 
+			tagParsers[measurement][input.Name] = tagger
+		}
 	}
+
 	return tagParsers
 }