a little bit of clean up work for names being in a-z order, also added "category"

Author: chrroberts-pure

internal/openmetrics-exporter/alerts_collector.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	client "purestorage/fa-openmetrics-exporter/internal/rest-client"
 	"strings"
-        "strconv"
+
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -24,22 +24,24 @@ func (c *AlertsCollector) Collect(ch chan<- prometheus.Metric) {
 	}
 	al := make(map[string]float64)
 	for _, alert := range alerts.Items {
-		al[fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s",
+		al[fmt.Sprintf("%s,%d,%s,%d,%s,%s,%s,%s",
+			alert.Category,
+			alert.Code,
 			alert.ComponentType,
-			alert.Severity,
-			strconv.Itoa(alert.Created),
+			alert.Created,
+			alert.Issue,
 			alert.Name,
-			strconv.Itoa(alert.Code),
+			alert.Severity,
 			alert.Summary,
-			alert.Issue)] += 1
+		)] += 1
 	}
 	for a, n := range al {
 		alert := strings.Split(a, ",")
 		ch <- prometheus.MustNewConstMetric(
 			c.AlertsDesc,
 			prometheus.GaugeValue,
 			n,
-			alert[0], alert[1], alert[2], alert[3], alert[4], alert[5], alert[6],
+			alert[0], alert[1], alert[2], alert[3], alert[4], alert[5], alert[6], alert[7],
 		)
 	}
 }
@@ -49,7 +51,7 @@ func NewAlertsCollector(fa *client.FAClient) *AlertsCollector {
 		AlertsDesc: prometheus.NewDesc(
 			"purefa_alerts_open",
 			"FlashArray open alert events",
-			[]string{"component_type", "severity", "created", "name", "code", "summary", "issue"},
+			[]string{"category", "code", "component_type", "created", "issue", "name", "severity", "summary"},
 			prometheus.Labels{},
 		),
 		Client: fa,

internal/openmetrics-exporter/alerts_collector_test.go

@@ -44,14 +44,13 @@ func TestAlertsCollector(t *testing.T) {
 	e := endp[len(endp)-1]
 	al := make(map[string]float64)
 	for _, a := range aopen.Items {
-		al[fmt.Sprintf("%s,%s", a.ComponentType, a.Severity, a.Created, a.Name, a.Code, a.Summary, a.Issue)] += 1
+		al[fmt.Sprintf("%s,%d,%s,%d,%s,%s,%s,%s", a.Category, a.Code, a.ComponentType, a.Created, a.Issue, a.Name, a.Severity, a.Summary)] += 1
 	}
 	want := make(map[string]bool)
 	for a, n := range al {
 		alert := strings.Split(a, ",")
-		//		want[fmt.Sprintf("label:{name:\"component_type\" value:\"%s\"} label:{name:\"severity\" value:\"%s\"} gauge:{value:%g}", alert[0], alert[1], n)] = true
-		//      want[fmt.Sprintf("label:{name:\"component_type\" value:\"%s\"} label:{name:\"severity\" value:\"%s\"} gauge:{value:%g}", alert[0], alert[1], n)] = true
-		want[fmt.Sprintf("label:{name:\"component_type\" value:\"%s\"} label:{name:\"severity\" value:\"%s\"} gauge:{value:%g}", alert[0], alert[1], alert[2], alert[3], alert[4], alert[5], alert[6], n)] = true
+
+		want[fmt.Sprintf("label:{name:\"category\" value:\"%s\"} label:{name:\"code\" value:\"%s\"} label:{name:\"component_type\" value:\"%s\"} label:{name:\"created\" value:\"%s\"} label:{name:\"issue\" value:\"%s\"} label:{name:\"name\" value:\"%s\"} label:{name:\"severity\" value:\"%s\"} label:{name:\"summary\" value:\"%s\"} gauge:{value:%g}", alert[0], alert[1], alert[2], alert[3], alert[4], alert[5], alert[6], alert[7], n)] = true
 	}
 	c := client.NewRestClient(e, "fake-api-token", "latest", false)
 	ac := NewAlertsCollector(c)

internal/rest-client/alerts.go

@@ -1,33 +1,32 @@
 package client
 
-
 type Alert struct {
-	Id            string    `json:"id"`
-	Name          string    `json:"name"`
-	Actual        string    `json:"actual"`
-	Closed        int       `json:"closed"`
-	Code          int       `json:"code"`
-	ComponentName string    `json:"component_name"`
-	ComponentType string    `json:"component_type"`
-	Created       int       `json:"created"`
-	Description   string    `json:"description"`
-	Expected      string    `json:"expected"`
-	Flagged       bool      `json:"flagged"`
-	Issue         string    `json:"issue"`
-	Index         int       `json:"index"`
-	KnowledgeBaseUrl         string    `json:"knowledge_base_url"`
-	Notified      int       `json:"notified"`
-	Severity      string    `json:"severity"`
-	State         string    `json:"state"`
-	Summary       string    `json:"summary"`
-	Updated       int       `json:"updated"`
+	Id               string `json:"id"`
+	Name             string `json:"name"`
+	Actual           string `json:"actual"`
+	Category         string `json:"category"`
+	Closed           int64  `json:"closed"`
+	Code             int64  `json:"code"`
+	ComponentName    string `json:"component_name"`
+	ComponentType    string `json:"component_type"`
+	Created          int64  `json:"created"`
+	Description      string `json:"description"`
+	Expected         string `json:"expected"`
+	Flagged          bool   `json:"flagged"`
+	Issue            string `json:"issue"`
+	KnowledgeBaseUrl string `json:"knowledge_base_url"`
+	Notified         int64  `json:"notified"`
+	Severity         string `json:"severity"`
+	State            string `json:"state"`
+	Summary          string `json:"summary"`
+	Updated          int64  `json:"updated"`
 }
 
 type AlertsList struct {
-        ContinuationToken    string   `json:"continuation_token"`
-        TotalItemCount       int      `json:"total_item_count"`
-        MoreItemsRemaining   bool     `json:"more_items_remaining"`
-	Items                []Alert  `json:"items"`
+	ContinuationToken  string  `json:"continuation_token"`
+	TotalItemCount     int32   `json:"total_item_count"`
+	MoreItemsRemaining bool    `json:"more_items_remaining"`
+	Items              []Alert `json:"items"`
 }
 
 func (fa *FAClient) GetAlerts(filter string) *AlertsList {
@@ -48,6 +47,6 @@ func (fa *FAClient) GetAlerts(filter string) *AlertsList {
 	if err != nil {
 		fa.Error = err
 	}
-	
+
 	return result
 }