Skip to content

Commit

Permalink
PMM-11079 Remove Integrated Alerting (#2309)
Browse files Browse the repository at this point in the history
* PMM-11079 Remove Integrated Alerting

* PMM-11079 Cleanup IA leftovwers

* PMM-11079 Regenerate

* PMM-11079 Fix

* PMM-11079 Refactoring and fixes

* PMM-11079 Fix tests

* PMM-11079 go mod tidy

* PMM-11079 Fix API tests

* PMM-11079 Cleanup

* PMM-11079 Fixes

* PMM-11079 Fix tests

* PMM-11079 Fix tests

* PMM-11079 Fix tests

* PMM-11079 Fix tests

* PMM-11079 Hit CI

* PMM-11079 Revert nolint

* PMM-11079 Remove IA migration script

* PMM-11079 Cleanup

* PMM-11079 Cleanup

* PMM-11079 Refactoring and cleanup

* PMM-11079 Cleanup

* PMM-11079 Cleanup after merge
  • Loading branch information
artemgavrilov authored Oct 12, 2023
1 parent dfdbc87 commit b108991
Show file tree
Hide file tree
Showing 125 changed files with 986 additions and 56,161 deletions.
5 changes: 2 additions & 3 deletions Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ gen-api: ## Generate PMM API

bin/buf generate -v api

for API in api/agentlocalpb api/serverpb api/inventorypb api/managementpb api/managementpb/ia api/managementpb/alerting api/managementpb/backup api/managementpb/azure api/managementpb/role api/qanpb api/managementpb/agent api/managementpb/node api/managementpb/service api/platformpb api/userpb; do \
for API in api/agentlocalpb api/serverpb api/inventorypb api/managementpb api/managementpb/alerting api/managementpb/backup api/managementpb/azure api/managementpb/role api/qanpb api/managementpb/agent api/managementpb/node api/managementpb/service api/platformpb api/userpb; do \
set -x ; \
bin/swagger mixin $$API/json/header.json $$API/*.swagger.json --output=$$API/json/$$(basename $$API).json --keep-spec-order; \
bin/swagger flatten --with-flatten=expand --with-flatten=remove-unused $$API/json/$$(basename $$API).json --output=$$API/json/$$(basename $$API).json ; \
Expand Down Expand Up @@ -83,7 +83,6 @@ gen-api: ## Generate PMM API
api/userpb/json/userpb.json \
api/inventorypb/json/inventorypb.json \
api/managementpb/json/managementpb.json \
api/managementpb/ia/json/ia.json \
api/managementpb/alerting/json/alerting.json \
api/managementpb/backup/json/backup.json \
api/managementpb/azure/json/azure.json \
Expand Down Expand Up @@ -122,7 +121,7 @@ clean: clean_swagger ## Remove generated files
find api -name '*.pb.gw.go' -print -delete
find api -name '*.validate.go' -print -delete

for API in api/agentlocalpb api/serverpb api/inventorypb api/managementpb api/managementpb/ia api/managementpb/alerting api/managementpb/backup api/managementpb/role api/managementpb/agent api/managementpb/node api/managementpb/service api/qanpb api/platformpb ; do \
for API in api/agentlocalpb api/serverpb api/inventorypb api/managementpb api/managementpb/alerting api/managementpb/backup api/managementpb/role api/managementpb/agent api/managementpb/node api/managementpb/service api/qanpb api/platformpb ; do \
rm -fr $$API/json/client $$API/json/models $$API/json/$$(basename $$API).json ; \
done
rm -f api/swagger/swagger.json api/swagger/swagger-dev.json
Expand Down
9 changes: 0 additions & 9 deletions api-tests/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
inventoryClient "github.com/percona/pmm/api/inventorypb/json/client"
alertingClient "github.com/percona/pmm/api/managementpb/alerting/json/client"
backupsClient "github.com/percona/pmm/api/managementpb/backup/json/client"
iaClient "github.com/percona/pmm/api/managementpb/ia/json/client"
managementClient "github.com/percona/pmm/api/managementpb/json/client"
platformClient "github.com/percona/pmm/api/platformpb/json/client"
serverClient "github.com/percona/pmm/api/serverpb/json/client"
Expand All @@ -67,9 +66,6 @@ var (
// RunSTTTests is true if STT tests should be run.
RunSTTTests bool

// RunIATests is true if IA tests should be run.
RunIATests bool

// Kubeconfig contains kubeconfig.
Kubeconfig string
)
Expand Down Expand Up @@ -138,9 +134,6 @@ func init() {
// FIXME we should rethink it once https://jira.percona.com/browse/PMM-5106 is implemented
runSTTTestsF := flag.Bool("pmm.run-stt-tests", false, "Run STT tests that require connected clients [PMM_RUN_STT_TESTS].")

// TODO remove once IA is out of beta: https://jira.percona.com/browse/PMM-7001
runIATestsF := flag.Bool("pmm.run-ia-tests", false, "Run IA tests that require connected clients [PMM_RUN_IA_TESTS].")

testing.Init()
flag.Parse()

Expand Down Expand Up @@ -172,7 +165,6 @@ func init() {
Debug = *debugF || *traceF
RunUpdateTest = *runUpdateTestF
RunSTTTests = *runSTTTestsF
RunIATests = *runIATestsF

var cancel context.CancelFunc
Context, cancel = context.WithCancel(context.Background())
Expand Down Expand Up @@ -221,7 +213,6 @@ func init() {
managementClient.Default = managementClient.New(transport, nil)
serverClient.Default = serverClient.New(transport, nil)
amclient.Default = amclient.New(alertmanagerTransport, nil)
iaClient.Default = iaClient.New(transport, nil)
backupsClient.Default = backupsClient.New(transport, nil)
platformClient.Default = platformClient.New(transport, nil)
alertingClient.Default = alertingClient.New(transport, nil)
Expand Down
Loading

0 comments on commit b108991

Please sign in to comment.