[squash] simplify

Author: martialblog

README.md

@@ -153,6 +153,8 @@ Examples:
    | total=2 firing=1 pending=0 inactive=1
 
 Flags:
+  -S, --state-label-key string      Use the given AlertRule label to override the exit state for firing alerts.
+                                    If this flag is set the plugin looks for warning/critical/ok in the provided label key
       --exclude-alert stringArray   Alerts to ignore. Can be used multiple times and supports regex.
       --exclude-label stringArray   The label of one or more specific alerts to exclude.
                                     This parameter can be repeated e.g.: '--exclude-label prio=high --exclude-label another=example'
@@ -168,14 +170,11 @@ Flags:
                                     If no name is given, all alerts will be evaluated
   -T, --no-alerts-state string      State to assign when no alerts are found (0, 1, 2, 3, OK, WARNING, CRITICAL, UNKNOWN). If not set this defaults to OK (default "OK")
   -P, --problems                    Display only alerts which status is not inactive/OK. Note that in combination with the --name flag this might result in no alerts being displayed
-  -K, --state-labels-key string     Label key for the --use-state-labels. Can be used to override the default label key 'icingaState' (default "icingaState")
-  -S, --use-state-labels            Use the AlertRule label 'icingaState' to override the exit state for firing alerts.
-                                    If this flag is set the plugin looks for warning/critical/ok in the label 'icingaState'
 ```
 
-The `--use-state-labels` can be used to override the exit code for firing alerts.
-If the flag is active, the plugin looks for the label key (icingaState) on the AlertRule and uses
-the specified as label values (warning/critical/ok).
+The `--state-label-key` can be used to override the exit code for firing alerts.
+When the flag is set, the plugin looks for the given label key on the AlertRule and uses
+the specified as label values (`warning/critical/ok`) as exit code..
 
 #### Checking all defined alerts
 

cmd/alert.go

@@ -16,15 +16,14 @@ import (
 )
 
 type AlertConfig struct {
-	AlertName           []string
-	Group               []string
-	ExcludeAlerts       []string
-	ExcludeLabels       []string
-	IncludeLabels       []string
-	ProblemsOnly        bool
-	HandleStateLabels   bool
-	HandleStateLabelKey string
-	NoAlertsState       string
+	AlertName     []string
+	Group         []string
+	ExcludeAlerts []string
+	ExcludeLabels []string
+	IncludeLabels []string
+	ProblemsOnly  bool
+	StateLabelKey string
+	NoAlertsState string
 }
 
 var cliAlertConfig AlertConfig
@@ -148,7 +147,7 @@ inactive = 0`,
 			if len(rl.AlertingRule.Alerts) == 0 {
 				// Counting states for perfdata. We don't use the state-label override here
 				// to have the acutal count from Prometheus
-				switch rl.GetStatus(false, "") {
+				switch rl.GetStatus("") {
 				case 0:
 					counterInactive++
 				case 1:
@@ -159,7 +158,7 @@ inactive = 0`,
 
 				sc := result.NewPartialResult()
 
-				_ = sc.SetState(rl.GetStatus(cliAlertConfig.HandleStateLabels, cliAlertConfig.HandleStateLabelKey))
+				_ = sc.SetState(rl.GetStatus(cliAlertConfig.StateLabelKey))
 				sc.Output = rl.GetOutput()
 				overall.AddSubcheck(sc)
 			}
@@ -170,7 +169,7 @@ inactive = 0`,
 				for _, alert := range rl.AlertingRule.Alerts {
 					// Counting states for perfdata. We don't use the state-label override here
 					// to have the acutal count from Prometheus
-					switch rl.GetStatus(false, "") {
+					switch rl.GetStatus("") {
 					case 0:
 						counterInactive++
 					case 1:
@@ -181,7 +180,7 @@ inactive = 0`,
 
 					sc := result.NewPartialResult()
 
-					_ = sc.SetState(rl.GetStatus(cliAlertConfig.HandleStateLabels, cliAlertConfig.HandleStateLabelKey))
+					_ = sc.SetState(rl.GetStatus(cliAlertConfig.StateLabelKey))
 					// Set the alert in the internal Type to generate the output
 					rl.Alert = alert
 					sc.Output = rl.GetOutput()
@@ -253,12 +252,9 @@ func init() {
 	fs.BoolVarP(&cliAlertConfig.ProblemsOnly, "problems", "P", false,
 		"Display only alerts which status is not inactive/OK. Note that in combination with the --name flag this might result in no alerts being displayed")
 
-	fs.BoolVarP(&cliAlertConfig.HandleStateLabels, "use-state-labels", "S", false,
-		"Use the AlertRule label 'icingaState' to override the exit state for firing alerts."+
-			"\nIf this flag is set the plugin looks for warning/critical/ok in the label 'icingaState'")
-
-	fs.StringVarP(&cliAlertConfig.HandleStateLabelKey, "state-labels-key", "K", "icingaState",
-		"Label key for the --use-state-labels. Can be used to override the default label key 'icingaState'")
+	fs.StringVarP(&cliAlertConfig.StateLabelKey, "state-label-key", "S", "",
+		"Use the given AlertRule label to override the exit state for firing alerts."+
+			"\nIf this flag is set the plugin looks for warning/critical/ok in the provided label key")
 }
 
 // Function to convert state to integer.

cmd/alert_test.go

@@ -310,7 +310,7 @@ exit status 2
 				w.WriteHeader(http.StatusOK)
 				w.Write(loadTestdata(alertTestDataSet1))
 			})),
-			args: []string{"run", "../main.go", "alert", "--use-state-labels", "--state-labels-key=icinga"},
+			args: []string{"run", "../main.go", "alert", "--state-label-key=icinga"},
 			expected: `[WARNING] - 3 Alerts: 1 Firing - 1 Pending - 1 Inactive
 \_ [OK] [HostOutOfMemory] is inactive
 \_ [WARNING] [SqlAccessDeniedRate] - Job: [mysql] on Instance: [localhost] is pending - value: 0.40 - {"alertname":"SqlAccessDeniedRate","instance":"localhost","job":"mysql","severity":"warning"}

internal/alert/alert.go

@@ -58,7 +58,7 @@ func FlattenRules(groups []v1.RuleGroup, wantedGroups []string) []Rule {
 	return rules
 }
 
-func (a *Rule) GetStatus(handleStateLabels bool, labelKey string) (status int) {
+func (a *Rule) GetStatus(labelKey string) (status int) {
 	state := a.AlertingRule.State
 
 	switch state {
@@ -72,7 +72,7 @@ func (a *Rule) GetStatus(handleStateLabels bool, labelKey string) (status int) {
 		status = check.Unknown
 	}
 
-	if state == string(v1.AlertStateFiring) && handleStateLabels {
+	if state == string(v1.AlertStateFiring) && labelKey != "" {
 		stateLabel, ok := a.AlertingRule.Labels[model.LabelName(labelKey)]
 		// If there is no such label key, we're done
 		if !ok {

internal/alert/alert_test.go

@@ -48,13 +48,13 @@ func TestGetStatus(t *testing.T) {
 		Alert:        ar.Alerts[0],
 	}
 
-	actual := r.GetStatus(false, "")
+	actual := r.GetStatus("")
 	if actual != check.Critical {
 		t.Error("\nActual: ", actual, "\nExpected: ", check.Critical)
 	}
 
 	r.AlertingRule.State = "pending"
-	actual = r.GetStatus(false, "")
+	actual = r.GetStatus("")
 	if actual != check.Warning {
 		t.Error("\nActual: ", actual, "\nExpected: ", check.Warning)
 	}
@@ -97,13 +97,13 @@ func TestGetStatus_WithLabel(t *testing.T) {
 		Alert:        ar.Alerts[0],
 	}
 
-	actual := r.GetStatus(true, "icingaState")
+	actual := r.GetStatus("icingaState")
 	if actual != check.OK {
 		t.Error("\nActual: ", actual, "\nExpected: ", check.Critical)
 	}
 
 	r.AlertingRule.State = "pending"
-	actual = r.GetStatus(true, "icingaState")
+	actual = r.GetStatus("icingaState")
 	if actual != check.Warning {
 		t.Error("\nActual: ", actual, "\nExpected: ", check.Warning)
 	}