Skip to content
This repository was archived by the owner on Apr 7, 2024. It is now read-only.

Bump go.uber.org/atomic from 1.9.0 to 1.10.0 #25

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
332c932
Slack web api (#1)
AlexandrClick Dec 17, 2021
bc70ad7
Sigma notyfiers (#2)
M-Indyukov Dec 20, 2021
e575648
Iti 0/feature/sigmasms (#4)
M-Indyukov Dec 21, 2021
98f64ac
Iti 0/feature/sigmasms (#5)
M-Indyukov Dec 21, 2021
c4eb56e
Iti 0/feature/sigmasms (#6)
M-Indyukov Dec 21, 2021
452b304
Iti 0/feature/sigmasms (#7)
M-Indyukov Dec 21, 2021
c0f818b
Iti 0/feature/sigmasms (#8)
M-Indyukov Dec 22, 2021
fd7e222
Itt 0/feature/slack v2 (#3)
AlexandrClick Dec 22, 2021
89087a2
Itt 0/feature/slack v2 (#9)
AlexandrClick Dec 23, 2021
fe25f0a
Add alert deduplication
cl-bvl Dec 23, 2021
7ca3e77
Fix slack v2 alerts
cl-bvl Dec 23, 2021
669f7f7
Remove unneede config param
cl-bvl Dec 23, 2021
b08bb71
Implement resend notification logic
cl-bvl Dec 23, 2021
4d64eb0
Small fixes
cl-bvl Dec 23, 2021
805bc6c
Fix description name
cl-bvl Dec 23, 2021
a010f62
Itt 0/feature/slack v2 (#11)
AlexandrClick Dec 23, 2021
b37bb97
Add check for orhaped alerts
cl-bvl Dec 24, 2021
eed33b2
Itt 0/feature/mention interval (#12)
AlexandrClick Dec 27, 2021
230e1ea
Iti 0/feature/sigmasms (#13)
M-Indyukov Jan 10, 2022
515b287
Первая попытка модификации саммари (#14)
AlexandrClick Jan 12, 2022
d84e7a4
Itt 0/feature/fix alerts (#15)
AlexandrClick Jan 12, 2022
d0d2e71
new grafana notify (#16)
AlexandrClick May 23, 2022
894b089
Small improvements (#17)
cl-bvl May 23, 2022
c0edbca
added grafana metrics (#18)
AlexandrClick Jul 7, 2022
75c65d5
Make Annotations case insentive
cl-bvl Jul 12, 2022
79923f2
Update golang image
cl-bvl Jul 12, 2022
bcf026f
Twilio integration
cl-bvl Aug 17, 2022
9771d70
don't adding metric field if there don't have a value (#19)
AlexandrClick Aug 17, 2022
82a115e
Merge pull request #20 from WinnerSoftLab/ITT-1350/feature/twillio
cl-bvl Aug 17, 2022
124e9f9
merge
cl-bvl Aug 17, 2022
8074ac3
Fix merge
cl-bvl Aug 17, 2022
a164029
Merge pull request #21 from WinnerSoftLab/ITT-1350/feature/update_ale…
cl-bvl Aug 17, 2022
f9574d7
Bump go.uber.org/atomic from 1.9.0 to 1.10.0
dependabot[bot] Aug 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
/.release
/.tarballs
/vendor

/.idea/workspace.xml
*.idea
/.idea/*
/template/slack.tmpl
!.golangci.yml
!/cli/testdata/*.yml
!/cli/config/testdata/*.yml
Expand Down
17 changes: 12 additions & 5 deletions api/v2/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,8 @@ func (api *API) getAlertGroupsHandler(params alertgroup_ops.GetAlertGroupsParams

res := make(open_api_models.AlertGroups, 0, len(alertGroups))

dedup := make(map[prometheus_model.Fingerprint]bool)

for _, alertGroup := range alertGroups {
ag := &open_api_models.AlertGroup{
Receiver: &open_api_models.Receiver{Name: &alertGroup.Receiver},
Expand All @@ -397,12 +399,17 @@ func (api *API) getAlertGroupsHandler(params alertgroup_ops.GetAlertGroupsParams

for _, alert := range alertGroup.Alerts {
fp := alert.Fingerprint()
receivers := allReceivers[fp]
status := api.getAlertStatus(fp)
apiAlert := AlertToOpenAPIAlert(alert, status, receivers)
ag.Alerts = append(ag.Alerts, apiAlert)
if _, ok := dedup[fp]; !ok {
dedup[fp] = true
receivers := allReceivers[fp]
status := api.getAlertStatus(fp)
apiAlert := AlertToOpenAPIAlert(alert, status, receivers)
ag.Alerts = append(ag.Alerts, apiAlert)
}
}
if len(ag.Alerts) > 0 {
res = append(res, ag)
}
res = append(res, ag)
}

return alertgroup_ops.NewGetAlertGroupsOK().WithPayload(res)
Expand Down
4 changes: 2 additions & 2 deletions api/v2/client/alert/alert_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/alert/get_alerts_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions api/v2/client/alert/get_alerts_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/alert/post_alerts_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions api/v2/client/alert/post_alerts_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v2/client/alertgroup/alertgroup_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/alertgroup/get_alert_groups_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions api/v2/client/alertgroup/get_alert_groups_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v2/client/general/general_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/general/get_status_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/general/get_status_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/receiver/get_receivers_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/receiver/get_receivers_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v2/client/receiver/receiver_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/silence/delete_silence_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions api/v2/client/silence/delete_silence_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/silence/get_silence_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions api/v2/client/silence/get_silence_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/silence/get_silences_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions api/v2/client/silence/get_silences_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/v2/client/silence/post_silences_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions api/v2/client/silence/post_silences_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading