feat: filter not firing alerts on /firing (#15)

* feat: filter not firing alerts on /firing * chore: fix linting
freak12techno · Jan 31, 2023 · f647381 · f647381
1 parent 52914a4
commit f647381
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 6 deletions.
diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml
@@ -10,7 +10,7 @@ jobs:
  go-version: '^1.18.0'
  - run: go version
  - run: go mod download
- - run: go build cmd/grafana-interacter/main.go
+ - run: go build cmd/grafana-interacter.go
  go-vet:
  runs-on: ubuntu-latest
  steps:

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ config.yml
 main
 .idea
 dist/
+grafana-interacter
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -2,7 +2,7 @@ before:
  hooks:
  - go mod tidy
 builds:
- - main: ./cmd/grafana-interacter
+ - main: ./cmd/grafana-interacter.go
  env:
  - CGO_ENABLED=0
  goos:

diff --git a/Makefile b/Makefile
@@ -1,5 +1,8 @@
 build:
- go build cmd/grafana-interacter/main.go
+ go build cmd/grafana-interacter.go
 
 install:
- go install cmd/grafana-interacter/main.go
+ go install cmd/grafana-interacter.go
+
+lint:
+ golangci-lint run --fix ./...
diff --git a/cmd/grafana-interacter/main.go → cmd/grafana-interacter.go b/cmd/grafana-interacter/main.go → cmd/grafana-interacter.go
diff --git a/go.mod b/go.mod
@@ -6,6 +6,7 @@ require (
  github.com/creasty/defaults v1.5.2
  github.com/rs/zerolog v1.26.1
  github.com/spf13/cobra v1.4.0
+ golang.org/x/exp v0.0.0-20230131120322-dfa7d7a641b0
  golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
  gopkg.in/telebot.v3 v3.0.0
  gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b

diff --git a/go.sum b/go.sum
@@ -43,6 +43,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/exp v0.0.0-20230131120322-dfa7d7a641b0 h1:Fi9VR3JnhlA3HOMXAmw2ZY4zypNQvZq01MpVbIA7hY4=
+golang.org/x/exp v0.0.0-20230131120322-dfa7d7a641b0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -9,6 +9,8 @@ import (
  "strings"
  "time"
 
+ "golang.org/x/exp/slices"
+
  tele "gopkg.in/telebot.v3"
 )
 
@@ -236,13 +238,35 @@ func ParseSilenceOptions(query string, c tele.Context) (*types.Silence, string)
 func FilterFiringOrPendingAlertGroups(groups []types.GrafanaAlertGroup) []types.GrafanaAlertGroup {
  var returnGroups []types.GrafanaAlertGroup
 
+ alertingStatuses := []string{"firing", "alerting", "pending"}
+
  for _, group := range groups {
  rules := []types.GrafanaAlertRule{}
  hasAnyRules := false
 
  for _, rule := range group.Rules {
- if rule.State == "firing" || rule.State == "alerting" || rule.State == "pending" {
- rules = append(rules, rule)
+ if !slices.Contains(alertingStatuses, strings.ToLower(rule.State)) {
+ continue
+ }
+
+ alerts := []types.GrafanaAlert{}
+ hasAnyAlerts := false
+
+ for _, alert := range rule.Alerts {
+ if !slices.Contains(alertingStatuses, strings.ToLower(alert.State)) {
+ continue
+ }
+
+ alerts = append(alerts, alert)
+ hasAnyAlerts = true
+ }
+
+ if hasAnyAlerts {
+ rules = append(rules, types.GrafanaAlertRule{
+ State: rule.State,
+ Name: rule.Name,
+ Alerts: alerts,
+ })
  hasAnyRules = true
  }
  }