Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add silencing notification #167

Merged
merged 3 commits into from
Feb 1, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
services:
postgres:
image: postgres:12
image: postgres:13
ports:
- 5432:5432
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
services:
postgres:
image: postgres:12
image: postgres:13
ports:
- 5432:5432
env:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ NAME="github.com/odpf/siren"
LAST_COMMIT := $(shell git rev-parse --short HEAD)
LAST_TAG := "$(shell git rev-list --tags --max-count=1)"
APP_VERSION := "$(shell git describe --tags ${LAST_TAG})-next"
PROTON_COMMIT := "03dcfd9c4dab173e2c191363d980805ad5029d38"
PROTON_COMMIT := "546b6368150b4c12e24f25cf4657bc76dc3177a1"

.PHONY: all build test clean dist vet proto install

Expand Down
53 changes: 40 additions & 13 deletions cli/deps.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ import (

"github.com/newrelic/go-agent/v3/newrelic"
"github.com/odpf/salt/db"
"github.com/odpf/salt/log"
saltlog "github.com/odpf/salt/log"
"github.com/odpf/siren/config"
"github.com/odpf/siren/core/alert"
"github.com/odpf/siren/core/log"
"github.com/odpf/siren/core/namespace"
"github.com/odpf/siren/core/notification"
"github.com/odpf/siren/core/provider"
"github.com/odpf/siren/core/receiver"
"github.com/odpf/siren/core/rule"
"github.com/odpf/siren/core/silence"
"github.com/odpf/siren/core/subscription"
"github.com/odpf/siren/core/template"
"github.com/odpf/siren/internal/api"
Expand All @@ -30,18 +32,19 @@ import (

func InitDeps(
ctx context.Context,
logger log.Logger,
logger saltlog.Logger,
cfg config.Config,
queue notification.Queuer,
) (*api.Deps, *newrelic.Application, *pgc.Client, map[string]notification.Notifier, error) {

telemetry.Init(ctx, cfg.Telemetry, logger)

nrApp, err := newrelic.NewApplication(
newrelic.ConfigAppName(cfg.Telemetry.ServiceName),
newrelic.ConfigAppName(cfg.Telemetry.NewRelicAppName),
newrelic.ConfigLicense(cfg.Telemetry.NewRelicAPIKey),
)
if err != nil {
return nil, nil, nil, nil, err
logger.Warn("failed to init newrelic", "err", err)
}

dbClient, err := db.New(cfg.DB)
Expand All @@ -59,22 +62,26 @@ func InitDeps(
return nil, nil, nil, nil, fmt.Errorf("cannot initialize encryptor: %w", err)
}

idempotencyRepository := postgres.NewIdempotencyRepository(pgClient)
templateRepository := postgres.NewTemplateRepository(pgClient)
templateService := template.NewService(templateRepository)

alertRepository := postgres.NewAlertRepository(pgClient)

providerRepository := postgres.NewProviderRepository(pgClient)
providerService := provider.NewService(providerRepository)

namespaceRepository := postgres.NewNamespaceRepository(pgClient)
logRepository := postgres.NewLogRepository(pgClient)
logService := log.NewService(logRepository)

cortexPluginService := cortex.NewPluginService(logger, cfg.Providers.Cortex)
alertRepository := postgres.NewAlertRepository(pgClient)
alertService := alert.NewService(
alertRepository,
logService,
map[string]alert.AlertTransformer{
provider.TypeCortex: cortexPluginService,
},
)

alertHistoryService := alert.NewService(alertRepository, map[string]alert.AlertTransformer{
provider.TypeCortex: cortexPluginService,
})
namespaceRepository := postgres.NewNamespaceRepository(pgClient)
namespaceService := namespace.NewService(encryptor, namespaceRepository, providerService, map[string]namespace.ConfigSyncer{
provider.TypeCortex: cortexPluginService,
})
Expand All @@ -89,6 +96,9 @@ func InitDeps(
},
)

silenceRepository := postgres.NewSilenceRepository(pgClient)
silenceService := silence.NewService(silenceRepository)

// plugin receiver services
slackPluginService := slack.NewPluginService(cfg.Receivers.Slack, encryptor)
pagerDutyPluginService := pagerduty.NewPluginService(cfg.Receivers.Pagerduty)
Expand All @@ -109,6 +119,7 @@ func InitDeps(
subscriptionRepository := postgres.NewSubscriptionRepository(pgClient)
subscriptionService := subscription.NewService(
subscriptionRepository,
logService,
namespaceService,
receiverService,
)
Expand All @@ -121,17 +132,33 @@ func InitDeps(
receiver.TypeFile: filePluginService,
}

notificationService := notification.NewService(logger, queue, idempotencyRepository, receiverService, subscriptionService, notifierRegistry)
idempotencyRepository := postgres.NewIdempotencyRepository(pgClient)
notificationRepository := postgres.NewNotificationRepository(pgClient)
notificationService := notification.NewService(
logger,
notificationRepository,
queue,
notifierRegistry,
notification.Deps{
LogService: logService,
IdempotencyRepository: idempotencyRepository,
ReceiverService: receiverService,
SubscriptionService: subscriptionService,
SilenceService: silenceService,
AlertService: alertService,
},
)

return &api.Deps{
TemplateService: templateService,
RuleService: ruleService,
AlertService: alertHistoryService,
AlertService: alertService,
ProviderService: providerService,
NamespaceService: namespaceService,
ReceiverService: receiverService,
SubscriptionService: subscriptionService,
NotificationService: notificationService,
SilenceService: silenceService,
}, nrApp, pgClient, notifierRegistry,
nil
}
2 changes: 1 addition & 1 deletion config/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/mcuadros/go-defaults"
"github.com/odpf/siren/core/receiver"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

func Init(configFile string) error {
Expand Down
24 changes: 13 additions & 11 deletions core/alert/alert.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@ import (
type Repository interface {
Create(context.Context, Alert) (Alert, error)
List(context.Context, Filter) ([]Alert, error)
BulkUpdateSilence(context.Context, []int64, string) error
}

type Alert struct {
ID uint64 `json:"id"`
ProviderID uint64 `json:"provider_id"`
NamespaceID uint64 `json:"namespace_id"`
ResourceName string `json:"resource_name"`
MetricName string `json:"metric_name"`
MetricValue string `json:"metric_value"`
Severity string `json:"severity"`
Rule string `json:"rule"`
TriggeredAt time.Time `json:"triggered_at"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
ID uint64 `json:"id"`
ProviderID uint64 `json:"provider_id"`
NamespaceID uint64 `json:"namespace_id"`
ResourceName string `json:"resource_name"`
MetricName string `json:"metric_name"`
MetricValue string `json:"metric_value"`
Severity string `json:"severity"`
Rule string `json:"rule"`
TriggeredAt time.Time `json:"triggered_at"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
SilenceStatus string `json:"silence_status"`

// These fields won't be stored in the DB
// these are additional information for notification purposes
Expand Down
2 changes: 2 additions & 0 deletions core/alert/filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ type Filter struct {
NamespaceID uint64
StartTime int64
EndTime int64
SilenceID string
IDs []int64
}
39 changes: 39 additions & 0 deletions core/alert/mocks/alert_repository.go

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

84 changes: 84 additions & 0 deletions core/alert/mocks/log_service.go

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

Loading