Merge pull request #1164 from flanksource/alertman-exlclude-labels

feat: add option to exclude alerts via labels
flanksource · Jul 20, 2023 · 5ab2298 · 5ab2298
2 parents 18b21dd + 6dd6060
commit 5ab2298
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 6 deletions.
diff --git a/api/v1/checks.go b/api/v1/checks.go
@@ -466,12 +466,13 @@ type AlertManager struct {
 }
 
 type AlertManagerCheck struct {
-	Description `yaml:",inline" json:",inline"`
-	Templatable `yaml:",inline" json:",inline"`
-	Connection  `yaml:",inline" json:",inline"`
-	Alerts      []string          `yaml:"alerts" json:"alerts,omitempty" template:"true"`
-	Filters     map[string]string `yaml:"filters" json:"filters,omitempty" template:"true"`
-	Ignore      []string          `yaml:"ignore" json:"ignore,omitempty" template:"true"`
+	Description    `yaml:",inline" json:",inline"`
+	Templatable    `yaml:",inline" json:",inline"`
+	Connection     `yaml:",inline" json:",inline"`
+	Alerts         []string          `yaml:"alerts" json:"alerts,omitempty" template:"true"`
+	Filters        map[string]string `yaml:"filters" json:"filters,omitempty" template:"true"`
+	ExcludeFilters map[string]string `yaml:"exclude_filters" json:"exclude_filters,omitempty" template:"true"`
+	Ignore         []string          `yaml:"ignore" json:"ignore,omitempty" template:"true"`
 }
 
 func (c AlertManagerCheck) GetType() string {

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/checks/alertmanager.go b/checks/alertmanager.go
@@ -58,6 +58,9 @@ func (c *AlertManagerChecker) Check(ctx *context.Context, extConfig external.Che
 	for _, ignore := range check.Ignore {
 		filters = append(filters, fmt.Sprintf("alertname!~%s", ignore))
 	}
+	for k, v := range check.ExcludeFilters {
+		filters = append(filters, fmt.Sprintf("%s!=%s", k, v))
+	}
 
 	alerts, err := client.Alert.GetAlerts(&alertmanagerAlert.GetAlertsParams{
 		Context: gocontext.Background(),

diff --git a/config/deploy/crd.yaml b/config/deploy/crd.yaml
@@ -81,6 +81,10 @@ spec:
                           template:
                             type: string
                         type: object
+                      exclude_filters:
+                        additionalProperties:
+                          type: string
+                        type: object
                       filters:
                         additionalProperties:
                           type: string

diff --git a/config/deploy/manifests.yaml b/config/deploy/manifests.yaml
@@ -81,6 +81,10 @@ spec:
                           template:
                             type: string
                         type: object
+                      exclude_filters:
+                        additionalProperties:
+                          type: string
+                        type: object
                       filters:
                         additionalProperties:
                           type: string

diff --git a/config/schemas/canary.schema.json b/config/schemas/canary.schema.json
@@ -85,6 +85,14 @@
           },
           "type": "object"
         },
+        "exclude_filters": {
+          "patternProperties": {
+            ".*": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
         "ignore": {
           "items": {
             "type": "string"

diff --git a/config/schemas/component.schema.json b/config/schemas/component.schema.json
@@ -85,6 +85,14 @@
           },
           "type": "object"
         },
+        "exclude_filters": {
+          "patternProperties": {
+            ".*": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
         "ignore": {
           "items": {
             "type": "string"

diff --git a/config/schemas/health_alertmanager.schema.json b/config/schemas/health_alertmanager.schema.json
@@ -55,6 +55,14 @@
           },
           "type": "object"
         },
+        "exclude_filters": {
+          "patternProperties": {
+            ".*": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
         "ignore": {
           "items": {
             "type": "string"

diff --git a/config/schemas/topology.schema.json b/config/schemas/topology.schema.json
@@ -85,6 +85,14 @@
           },
           "type": "object"
         },
+        "exclude_filters": {
+          "patternProperties": {
+            ".*": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
         "ignore": {
           "items": {
             "type": "string"

diff --git a/fixtures/datasources/alertmanager_fail.yaml b/fixtures/datasources/alertmanager_fail.yaml
@@ -13,6 +13,8 @@ spec:
         - .*
       ignore:
         - KubeScheduler.*
+      exclude_filters:
+        namespace: elastic-system
       transform:
         javascript: |
           var out = _.map(results, function(r) {