Merge pull request #84 from NETWAYS/fix/alert-panic

Fix conditional for subcheck perfdata

Author: martialblog

cmd/alert.go

@@ -87,12 +87,20 @@ inactive = 0`,
 
 		// If there are no rules we can exit early
 		if len(rules) == 0 {
+			// Just an empty PerfdataList to have consistent perfdata output
+			pdlist := perfdata.PerfdataList{
+				{Label: "total", Value: 0},
+				{Label: "firing", Value: 0},
+				{Label: "pending", Value: 0},
+				{Label: "inactive", Value: 0},
+			}
+
 			// Since the user is expecting the state of a certain alert and
 			// it that is not present it might be noteworthy.
 			if cliAlertConfig.AlertName != nil {
-				check.ExitRaw(check.Unknown, "No such alert defined")
+				check.ExitRaw(check.Unknown, "No such alert defined", "|", pdlist.String())
 			}
-			check.ExitRaw(noAlertsState, "No alerts defined")
+			check.ExitRaw(noAlertsState, "No alerts defined", "|", pdlist.String())
 		}
 
 		// Set initial capacity to reduce memory allocations
@@ -173,26 +181,23 @@ inactive = 0`,
 		}
 
 		counterAlert := counterFiring + counterPending + counterInactive
-		if len(cliAlertConfig.AlertName) > 1 || counterAlert > 1 {
-			perfList := perfdata.PerfdataList{
-				{Label: "total", Value: counterAlert},
-				{Label: "firing", Value: counterFiring},
-				{Label: "pending", Value: counterPending},
-				{Label: "inactive", Value: counterInactive},
-			}
 
-			overall.PartialResults[0].Perfdata = append(overall.PartialResults[0].Perfdata, perfList...)
+		perfList := perfdata.PerfdataList{
+			{Label: "total", Value: counterAlert},
+			{Label: "firing", Value: counterFiring},
+			{Label: "pending", Value: counterPending},
+			{Label: "inactive", Value: counterInactive},
 		}
 
-		if len(cliAlertConfig.AlertName) == 1 && counterAlert == 1 {
-			perfList := perfdata.PerfdataList{
-				{Label: "firing", Value: counterFiring},
-				{Label: "pending", Value: counterPending},
-				{Label: "inactive", Value: counterInactive},
-			}
-			overall.PartialResults[0].Perfdata = append(overall.PartialResults[0].Perfdata, perfList...)
+		// When there are no alerts we add an empty PartialResult just to have consistent output
+		if len(overall.PartialResults) == 0 {
+			sc := result.NewPartialResult()
+			sc.Output = "No alerts retrieved"
+			overall.AddSubcheck(sc)
 		}
 
+		overall.PartialResults[0].Perfdata = append(overall.PartialResults[0].Perfdata, perfList...)
+
 		overall.Summary = fmt.Sprintf("%d Alerts: %d Firing - %d Pending - %d Inactive",
 			counterAlert,
 			counterFiring,

cmd/alert_test.go

@@ -47,7 +47,7 @@ func TestAlertCmd(t *testing.T) {
 				w.Write([]byte(`{"status":"success","data":{"groups":[]}}`))
 			})),
 			args:     []string{"run", "../main.go", "alert"},
-			expected: "[OK] - No alerts defined\n",
+			expected: "[OK] - No alerts defined | total=0 firing=0 pending=0 inactive=0\n",
 		},
 		{
 			name: "alert-none-with-problems",
@@ -56,7 +56,7 @@ func TestAlertCmd(t *testing.T) {
 				w.Write([]byte(`{"status":"success","data":{"groups":[]}}`))
 			})),
 			args:     []string{"run", "../main.go", "alert", "--problems"},
-			expected: "[OK] - No alerts defined\n",
+			expected: "[OK] - No alerts defined | total=0 firing=0 pending=0 inactive=0\n",
 		},
 		{
 			name: "alert-none-with-no-state",
@@ -65,7 +65,7 @@ func TestAlertCmd(t *testing.T) {
 				w.Write([]byte(`{"status":"success","data":{"groups":[]}}`))
 			})),
 			args:     []string{"run", "../main.go", "alert", "--no-alerts-state", "3"},
-			expected: "[UNKNOWN] - No alerts defined\nexit status 3\n",
+			expected: "[UNKNOWN] - No alerts defined | total=0 firing=0 pending=0 inactive=0\nexit status 3\n",
 		},
 		{
 			name: "alert-none-with-name",
@@ -74,7 +74,7 @@ func TestAlertCmd(t *testing.T) {
 				w.Write([]byte(`{"status":"success","data":{"groups":[]}}`))
 			})),
 			args:     []string{"run", "../main.go", "alert", "--name", "MyPreciousAlert"},
-			expected: "[UNKNOWN] - No such alert defined\nexit status 3\n",
+			expected: "[UNKNOWN] - No such alert defined | total=0 firing=0 pending=0 inactive=0\nexit status 3\n",
 		},
 		{
 			name: "alert-default",
@@ -116,6 +116,7 @@ exit status 2
 			args: []string{"run", "../main.go", "alert", "--problems", "-g", "TLS"},
 			expected: `[CRITICAL] - 1 Alerts: 1 Firing - 0 Pending - 0 Inactive
 \_ [CRITICAL] [BlackboxTLS] - Job: [blackbox] on Instance: [https://localhost:443] is firing - value: -6065338.00
+|total=1 firing=1 pending=0 inactive=0
 
 exit status 2
 `,
@@ -144,6 +145,7 @@ exit status 2
 			args: []string{"run", "../main.go", "alert", "--problems", "--exclude-alert", "Sql.*DeniedRate"},
 			expected: `[CRITICAL] - 1 Alerts: 1 Firing - 0 Pending - 0 Inactive
 \_ [CRITICAL] [BlackboxTLS] - Job: [blackbox] on Instance: [https://localhost:443] is firing - value: -6065338.00
+|total=1 firing=1 pending=0 inactive=0
 
 exit status 2
 `,
@@ -163,17 +165,27 @@ exit status 2
 				w.WriteHeader(http.StatusOK)
 				w.Write(loadTestdata(alertTestDataSet2))
 			})),
-			args:     []string{"run", "../main.go", "alert", "--name", "NoSuchAlert"},
-			expected: "[UNKNOWN] - 0 Alerts: 0 Firing - 0 Pending - 0 Inactive\n\nexit status 3\n",
+			args: []string{"run", "../main.go", "alert", "--name", "NoSuchAlert"},
+			expected: `[UNKNOWN] - 0 Alerts: 0 Firing - 0 Pending - 0 Inactive
+\_ [UNKNOWN] No alerts retrieved
+|total=0 firing=0 pending=0 inactive=0
+
+exit status 3
+`,
 		},
 		{
 			name: "alert-inactive-with-problems",
 			server: httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusOK)
 				w.Write(loadTestdata(alertTestDataSet2))
 			})),
-			args:     []string{"run", "../main.go", "alert", "--name", "InactiveAlert", "--problems"},
-			expected: "[UNKNOWN] - 0 Alerts: 0 Firing - 0 Pending - 0 Inactive\n\nexit status 3\n",
+			args: []string{"run", "../main.go", "alert", "--name", "InactiveAlert", "--problems"},
+			expected: `[UNKNOWN] - 0 Alerts: 0 Firing - 0 Pending - 0 Inactive
+\_ [UNKNOWN] No alerts retrieved
+|total=0 firing=0 pending=0 inactive=0
+
+exit status 3
+`,
 		},
 		{
 			name: "alert-multiple-alerts",
@@ -211,7 +223,7 @@ exit status 2
 				w.Write(loadTestdata(alertTestDataSet2))
 			})),
 			args:     []string{"run", "../main.go", "alert", "--name", "InactiveAlert"},
-			expected: "[OK] - 1 Alerts: 0 Firing - 0 Pending - 1 Inactive\n\\_ [OK] [InactiveAlert] is inactive\n|firing=0 pending=0 inactive=1\n\n",
+			expected: "[OK] - 1 Alerts: 0 Firing - 0 Pending - 1 Inactive\n\\_ [OK] [InactiveAlert] is inactive\n|total=1 firing=0 pending=0 inactive=1\n\n",
 		},
 		{
 			name: "alert-recording-rule",
@@ -220,7 +232,7 @@ exit status 2
 				w.Write(loadTestdata(alertTestDataSet4))
 			})),
 			args:     []string{"run", "../main.go", "alert", "--name", "InactiveAlert"},
-			expected: "[OK] - 1 Alerts: 0 Firing - 0 Pending - 1 Inactive\n\\_ [OK] [InactiveAlert] is inactive\n|firing=0 pending=0 inactive=1\n\n",
+			expected: "[OK] - 1 Alerts: 0 Firing - 0 Pending - 1 Inactive\n\\_ [OK] [InactiveAlert] is inactive\n|total=1 firing=0 pending=0 inactive=1\n\n",
 		},
 	}