Merge pull request #32 from NETWAYS/fix/perfdata

No longer returns multiple perfdata data points

Author: martialblog

.golangci.yml

@@ -11,6 +11,7 @@ linters:
     - forbidigo
     - gochecknoglobals
     - gochecknoinits
+    - funlen
     - godot
     - godox
     - lll
@@ -21,9 +22,6 @@ linters:
     - nonamedreturns
     - varnamelen
     - wrapcheck
-  settings:
-    funlen:
-      lines: 90
   exclusions:
     generated: lax
     presets:

Makefile

@@ -1,7 +1,7 @@
 .PHONY: test coverage lint vet
 
 build:
-	export CGO_ENABLED=0; go build
+	CGO_ENABLED=0 go build
 lint:
 	go fmt $(go list ./... | grep -v /vendor/)
 vet:

cmd/query.go

@@ -96,12 +96,12 @@ func queryFluxV2(fluxQuery, url, org, token string, c *http.Client) {
 			continue
 		}
 
-		//nolint: gocritic
-		if crit.DoesViolate(recordValue) {
+		switch {
+		case crit.DoesViolate(recordValue):
 			recordStatus = 2
-		} else if warn.DoesViolate(recordValue) {
+		case warn.DoesViolate(recordValue):
 			recordStatus = 1
-		} else {
+		default:
 			recordStatus = 0
 		}
 
@@ -146,7 +146,12 @@ func queryFluxV2(fluxQuery, url, org, token string, c *http.Client) {
 		rc = check.Unknown
 	}
 
-	check.ExitRaw(rc, "InfluxDB Query Status", "|", perfData.String())
+	// If we got perfdata we print the only the last value
+	if len(perfData) > 1 {
+		check.ExitRaw(rc, "InfluxDB Query Status", "|", perfData[len(perfData)-1].String())
+	}
+
+	check.ExitRaw(rc, "InfluxDB Query Status")
 }
 
 var queryCmd = &cobra.Command{

cmd/query_test.go

@@ -93,7 +93,7 @@ func TestQueryCmd(t *testing.T) {
 				))
 			},
 			args:     []string{"run", "../main.go", "query", "-o", "org", "-b", "bucket", "-T", "token", "--flux-file", "../testdata/mem.flux", "-w", "200", "-c", "500"},
-			expected: "[CRITICAL] - InfluxDB Query Status | mem.active=501;200;500 mem.active=502;200;500 mem.active=125;200;500",
+			expected: "[CRITICAL] - InfluxDB Query Status | mem.active=125;200;500",
 		},
 		{
 			name: "query-string-output",
@@ -110,7 +110,7 @@ func TestQueryCmd(t *testing.T) {
 				))
 			},
 			args:     []string{"run", "../main.go", "query", "-o", "org", "-b", "bucket", "-T", "token", "--flux-string", "from(bucket:\"monitor\")|>range(start:-1h)", "-w", "1", "-c", "2"},
-			expected: "[OK] - InfluxDB Query Status | cpu.usage_user=0.078;1;2 cpu.usage_user=0.044;1;2 cpu.usage_user=0.078;1;2 cpu.usage_user=0.044;1;2",
+			expected: "[OK] - InfluxDB Query Status | cpu.usage_user=0.044;1;2",
 		},
 		{
 			name: "query-perfdata",
@@ -125,7 +125,7 @@ func TestQueryCmd(t *testing.T) {
 				))
 			},
 			args:     []string{"run", "../main.go", "query", "-o", "org", "-b", "bucket", "-T", "token", "--flux-string", "from(bucket:\"monitor\")|>range(start:-1h)", "-w", "1", "-c", "2", "--perfdata-label", "foobar"},
-			expected: "InfluxDB Query Status | foobar=0.078;1;2 foobar=0.044;1;2",
+			expected: "InfluxDB Query Status | foobar=0.044;1;2",
 		},
 		{
 			name: "query-perfdata-by-key",
@@ -140,7 +140,7 @@ func TestQueryCmd(t *testing.T) {
 				))
 			},
 			args:     []string{"run", "../main.go", "query", "-o", "org", "-b", "bucket", "-T", "token", "--flux-string", "from(bucket:\"monitor\")|>range(start:-1h)", "-w", "1", "-c", "2", "--perfdata-label-by-key", "host"},
-			expected: "InfluxDB Query Status | influx=0.078;1;2 influx=0.044;1;2",
+			expected: "InfluxDB Query Status | influx=0.044;1;2",
 		},
 		{
 			name: "query-perfdata-by-key-is-nil",
@@ -155,7 +155,7 @@ func TestQueryCmd(t *testing.T) {
 				))
 			},
 			args:     []string{"run", "../main.go", "query", "-o", "org", "-b", "bucket", "-T", "token", "--flux-string", "from(bucket:\"monitor\")|>range(start:-1h)", "-w", "1", "-c", "2", "--perfdata-label-by-key", "foobar"},
-			expected: "InfluxDB Query Status |",
+			expected: "InfluxDB Query Status",
 		},
 	}