feat: add group and common labels for templating (#125)

maxwo · Jan 8, 2023 · f520c6f · f520c6f
1 parent 62d375d
commit f520c6f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/alertparser/alert_parser.go b/alertparser/alert_parser.go
@@ -54,7 +54,16 @@ func (alertParser AlertParser) Parse(alertsData types.AlertsData) (*types.AlertB
 		}
 		key := strings.Join([]string{*oid, "[", groupID, "]"}, "")
 		if _, found := alertGroups[key]; !found {
-			alertGroups[key] = &types.AlertGroup{OID: *oid, GroupID: groupID, Severity: alertParser.getLowestSeverity(), Alerts: []types.Alert{}, DeclaredAlerts: []types.Alert{}}
+			alertGroups[key] = &types.AlertGroup{
+				OID:               *oid,
+				GroupID:           groupID,
+				GroupLabels:       alertsData.GroupLabels,
+				CommonLabels:      alertsData.CommonLabels,
+				CommonAnnotations: alertsData.CommonAnnotations,
+				Severity:          alertParser.getLowestSeverity(),
+				Alerts:            []types.Alert{},
+				DeclaredAlerts:    []types.Alert{},
+			}
 		}
 		alertGroups[key].DeclaredAlerts = append(alertGroups[key].DeclaredAlerts, alert)
 		if alert.Status == "firing" {

diff --git a/alertparser/test_mixed_bucket.json b/alertparser/test_mixed_bucket.json
@@ -3,6 +3,10 @@
     "1.3.6.1.4.1.666.0.10.1.1.1.2.1[environment=production,label=test]": {
       "OID": "1.3.6.1.4.1.666.0.10.1.1.1.2.1",
       "GroupID": "environment=production,label=test",
+      "GroupLabels": {
+        "environment": "production",
+        "label": "test"
+      },
       "Severity": "critical",
       "Alerts": [
         {
@@ -68,6 +72,10 @@
     "1.1[environment=production,label=test]": {
       "OID": "1.1",
       "GroupID": "environment=production,label=test",
+      "GroupLabels": {
+        "environment": "production",
+        "label": "test"
+      },
       "Severity": "critical",
       "Alerts": [
         {
@@ -103,6 +111,10 @@
     "1.3.6.1.4.1.666.0.10.1.1.1.1.1[environment=production,label=test]": {
       "OID": "1.3.6.1.4.1.666.0.10.1.1.1.1.1",
       "GroupID": "environment=production,label=test",
+      "GroupLabels": {
+        "environment": "production",
+        "label": "test"
+      },
       "Severity": "info",
       "Alerts": [],
       "DeclaredAlerts": [

diff --git a/scripts/local/listen.sh b/scripts/local/listen.sh
@@ -4,5 +4,5 @@ set -ex
 
 rm -rf /var/db/net-snmp
 mkdir -p $HOME/.snmp/mibs
-ln -s $PWD/../mibs/SNMP-NOTIFIER-MIB.my $HOME/.snmp/mibs/SNMP-NOTIFIER-MIB.my
-snmptrapd -m ALL -m +SNMP-NOTIFIER-MIB -f -Of -Lo -c snmptrapd.conf -x 127.0.0.1 "::1"
+ln -s $PWD/../mibs/SNMP-NOTIFIER-MIB.my $HOME/.snmp/mibs/SNMP-NOTIFIER-MIB.my || true
+snmptrapd -m ALL -m +SNMP-NOTIFIER-MIB -f -Of -Lo -c snmptrapd.conf
diff --git a/types/types.go b/types/types.go
@@ -20,11 +20,14 @@ type AlertBucket struct {
 
 // AlertGroup type, with OID and group ID
 type AlertGroup struct {
-	OID            string
-	GroupID        string
-	Severity       string
-	Alerts         []Alert
-	DeclaredAlerts []Alert
+	OID               string
+	GroupID           string
+	GroupLabels       map[string]string
+	CommonLabels      map[string]string
+	CommonAnnotations map[string]string
+	Severity          string
+	Alerts            []Alert
+	DeclaredAlerts    []Alert
 }
 
 // GetAlertGroupName allows to retrieve a group name from a given alert