artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 14:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

sg/msp: enable alerting by default for production projects (#63912)

Browse Source 
<!-- PR description tips:
https://www.notion.so/sourcegraph/Write-a-good-pull-request-description-610a7fd3e613496eb76f450db5a49b6e
-->
Opsgenie alert notifications for critical alerts should be enabled by
default for production projects or where `env.alerting.opsgenie` is set
to true.

Closes CORE-223
## Test plan
Tested locally by running `sg msp gen` for a `prod` env which doesn't
have an alerting config and verifying that notification suppression was
disabled

Set `env.alerting.opsgenie` to false which enabled suppression again.

No changes to `test` environments unless `env.alerting.opsgenie` is set
to true.
This commit is contained in:
James Cotter 2024-07-18 20:57:38 +01:00 committed by GitHub
parent 14137ed9df
commit 4c040347ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/managedservicesplatform/operationdocs/diagram/diagram.go
View File

@ -119,7 +119,7 @@ func (d *diagram) Generate(s *spec.Spec, e string) error {
return errors.Wrap(err, "failed to add connection from cloudrun to monitoring")
}
if env.Category != spec.EnvironmentCategoryTest && env.Alerting != nil && pointers.DerefZero(env.Alerting.Opsgenie) {
if env.Alerting.ShouldEnableOpsgenie(env.Category.IsProduction()) {
var opsgenieNode string
graph, opsgenieNode, err = newOpsgenieNode(graph)
if err != nil {

8
dev/managedservicesplatform/spec/environment.go
View File

@ -1055,3 +1055,11 @@ func (s EnvironmentLocationsSpec) Validate() []error {
return errs
}
// ShouldEnableOpsgenie returns env.alerting.opsgenie or falls back to isProduction is the former is nil
func (s *EnvironmentAlertingSpec) ShouldEnableOpsgenie(isProduction bool) bool {
if s == nil || s.Opsgenie == nil {
return isProduction
}
return *s.Opsgenie
}

8
dev/managedservicesplatform/stacks/monitoring/monitoring.go
View File

@ -206,10 +206,10 @@ func NewStack(stacks *stack.Set, vars Variables) (*CrossStackOutput, error) {
// Let the team own the integration.
OwnerTeamId: team.Id(),
// Supress all notifications if Alerting.Opsgenie is false -
// this allows us to see the alerts, but not necessarily get
// paged by it.
SuppressNotifications: !pointers.DerefZero(vars.Alerting.Opsgenie),
// Supress all notifications if Alerting.Opsgenie is explcitly set to false or
// if Alerting.Opsgenie is nil suppress notifications if this is not a production environment.
// This allows us to see the alerts, but not necessarily get paged by it.
SuppressNotifications: !vars.Alerting.ShouldEnableOpsgenie(vars.EnvironmentCategory.IsProduction()),
// Point alerts sent through this integration at the Opsgenie team.
Responders: []*opsgenieintegration.ApiIntegrationResponders{{