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.

Sign up for GitHub

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

Jump to bottom

PMM-12252 Removing Alertmanager from advisors dependencies #1915

Merged
merged 20 commits into from
Sep 4, 2023
Merged

PMM-12252 Removing Alertmanager from advisors dependencies #1915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
43ffe22
PMM-11796 Remove alertmanager from Advisors flow
artemgavrilov Mar 27, 2023
d023c4e
PMM-11796 Deprecate some APIs
artemgavrilov Mar 28, 2023
909795b
PMM-11796 Cleanup AM leftovers, add positive advisors alerts
artemgavrilov Mar 28, 2023
6a8a108
PMM-11796 Remove unused code, fix bug
artemgavrilov Mar 28, 2023
dcba3de
PMM=-11796 Fix tests
artemgavrilov Mar 28, 2023
3117db3
Merge branch 'main' into PMM-11796-positive-advisor-insights
artemgavrilov Mar 28, 2023
f5600cf
PMM-11796 Fix
artemgavrilov Mar 28, 2023
28553b6
Merge remote-tracking branch 'origin/main' into PMM-11796-positive-ad…
artemgavrilov Mar 29, 2023
73c8c90
PMM-11796 Fix tests
artemgavrilov Mar 29, 2023
d164168
PMM-11796 Hit CI
artemgavrilov Mar 29, 2023
0dd7a1c
Merge branch 'main' into PMM-11796-positive-advisor-insights
artemgavrilov Mar 30, 2023
047d651
Merge remote-tracking branch 'origin/main' into PMM-11796-positive-ad…
artemgavrilov Apr 11, 2023
8f35835
Merge branch 'main' into PMM-11796-positive-advisor-insights
artemgavrilov Apr 20, 2023
3559879
Merge branch 'main' into PMM-11796-positive-advisor-insights
artemgavrilov Jun 7, 2023
21f2ee7
PMM-12252 Revert positive advisor insights
artemgavrilov Jun 23, 2023
0033a89
Merge remote-tracking branch 'origin/main' into PMM-11796-positive-ad…
artemgavrilov Jun 23, 2023
c122d4f
Merge remote-tracking branch 'origin/main' into PMM-11796-positive-ad…
artemgavrilov Jun 28, 2023
4fdb679
Refactoring
artemgavrilov Jun 28, 2023
70d4c96
Merge remote-tracking branch 'origin/main' into PMM-11796-positive-ad…
artemgavrilov Jul 10, 2023
4fd3d62
Merge remote-tracking branch 'origin/main' into PMM-11796-positive-ad…
artemgavrilov Sep 4, 2023
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
184 changes: 92 additions & 92 deletions api/managementpb/checks.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions api/managementpb/checks.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,15 @@ service SecurityChecks {
}
// ToggleCheckAlert allows to switch alerts state for a check result between "silenced" and "unsilenced".
rpc ToggleCheckAlert(ToggleCheckAlertRequest) returns (ToggleCheckAlertResponse) {
option deprecated = true;
option (google.api.http) = {
post: "/v1/management/SecurityChecks/ToggleCheckAlert"
body: "*"
};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
summary: "Toggle Check Alert"
description: "Silence/Unsilence alerts for a specific check result."
deprecated: true
};
}
// GetSecurityCheckResults returns Security Thread Tool's latest checks results.
Expand All @@ -223,6 +225,7 @@ service SecurityChecks {
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
summary: "Get Security Check Results"
description: "Returns Security Thread Tool's latest checks results."
deprecated: true
};
}
// StartSecurityChecks executes Security Thread Tool checks and returns when all checks are executed.
Expand Down
3 changes: 3 additions & 0 deletions api/managementpb/checks_grpc.pb.go
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions api/managementpb/json/managementpb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6365,6 +6365,7 @@
],
"summary": "Get Security Check Results",
"operationId": "GetSecurityCheckResults",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down Expand Up @@ -6788,6 +6789,7 @@
],
"summary": "Toggle Check Alert",
"operationId": "ToggleCheckAlert",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down
2 changes: 2 additions & 0 deletions api/swagger/swagger-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29902,6 +29902,7 @@
],
"summary": "Get Security Check Results",
"operationId": "GetSecurityCheckResults",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down Expand Up @@ -30325,6 +30326,7 @@
],
"summary": "Toggle Check Alert",
"operationId": "ToggleCheckAlert",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down
2 changes: 2 additions & 0 deletions api/swagger/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20529,6 +20529,7 @@
],
"summary": "Get Security Check Results",
"operationId": "GetSecurityCheckResults",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down Expand Up @@ -20952,6 +20953,7 @@
],
"summary": "Toggle Check Alert",
"operationId": "ToggleCheckAlert",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down
6 changes: 3 additions & 3 deletions managed/cmd/pmm-managed-starlark/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ func runChecks(l *logrus.Entry, data *checks.StarlarkScriptData) ([]check.Result
if !ok {
return nil, errors.Errorf("unexpected query result type: %T", dbQr)
}
if dbRes[dbName], err = unmarshallQueryResult(s); err != nil {
if dbRes[dbName], err = unmarshalQueryResult(s); err != nil {
return nil, err
}
}
res[i] = dbRes
case string: // used for all other databases
if res[i], err = unmarshallQueryResult(qr); err != nil {
if res[i], err = unmarshalQueryResult(qr); err != nil {
return nil, err
}
default:
Expand All @@ -158,7 +158,7 @@ func runChecks(l *logrus.Entry, data *checks.StarlarkScriptData) ([]check.Result
return results, nil
}

func unmarshallQueryResult(qr string) ([]map[string]any, error) {
func unmarshalQueryResult(qr string) ([]map[string]any, error) {
b, err := base64.StdEncoding.DecodeString(qr)
if err != nil {
return nil, errors.Wrap(err, "failed to decode base64 encoded query result")
Expand Down
3 changes: 1 addition & 2 deletions managed/cmd/pmm-managed/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"github.com/percona/pmm/managed/services/alertmanager"
"github.com/percona/pmm/managed/services/backup"
"github.com/percona/pmm/managed/services/checks"
"github.com/percona/pmm/managed/services/config"

Check failure on line 84 in managed/cmd/pmm-managed/main.go

View workflow job for this annotation

GitHub Actions / Checks 

SA1019: "github.com/percona/pmm/managed/services/config" is deprecated: please don't extend this package, it will be removed soon https://jira.percona.com/browse/PMM-11155 (staticcheck)
"github.com/percona/pmm/managed/services/dbaas"
"github.com/percona/pmm/managed/services/grafana"
"github.com/percona/pmm/managed/services/inventory"
Expand Down Expand Up @@ -912,8 +912,7 @@
l.Fatalf("Could not create Clickhouse client: %s", err)
}

checksService := checks.New(db, platformClient, actionsService, alertManager, v1.NewAPI(vmClient), clickhouseClient)

checksService := checks.New(db, platformClient, actionsService, v1.NewAPI(vmClient), clickhouseClient)
prom.MustRegister(checksService)

// Integrated alerts services
Expand Down
Loading
Loading