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

PMM-11079 Remove Integrated Alerting #2309

Merged
merged 31 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
d987447
PMM-11079 Remove Integrated Alerting
artemgavrilov Jun 26, 2023
0547147
PMM-11079 Cleanup IA leftovwers
artemgavrilov Jun 26, 2023
9ba085b
PMM-11079 Regenerate
artemgavrilov Jun 26, 2023
6a0835c
PMM-11079 Fix
artemgavrilov Jun 26, 2023
dd9bc7d
Merge remote-tracking branch 'origin/main' into PMM-11079-remove-inte…
artemgavrilov Jun 27, 2023
7eacc37
Merge remote-tracking branch 'origin/main' into PMM-11079-remove-inte…
artemgavrilov Jun 28, 2023
9e8b6c3
PMM-11079 Refactoring and fixes
artemgavrilov Jun 28, 2023
880d087
PMM-11079 Fix tests
artemgavrilov Jun 28, 2023
80420e8
PMM-11079 go mod tidy
artemgavrilov Jun 28, 2023
8c34890
Merge remote-tracking branch 'origin/main' into PMM-11079-remove-inte…
artemgavrilov Jun 29, 2023
69af991
PMM-11079 Fix API tests
artemgavrilov Jun 30, 2023
e30029c
Merge remote-tracking branch 'origin/main' into PMM-11079-remove-inte…
artemgavrilov Jun 30, 2023
d57a526
PMM-11079 Cleanup
artemgavrilov Jun 30, 2023
b9b82be
PMM-11079 Fixes
artemgavrilov Jun 30, 2023
cd0e64a
PMM-11079 Fix tests
artemgavrilov Jun 30, 2023
0ba46b1
PMM-11079 Fix tests
artemgavrilov Jun 30, 2023
b8a17a3
PMM-11079 Fix tests
artemgavrilov Jun 30, 2023
a0f774f
PMM-11079 Fix tests
artemgavrilov Jun 30, 2023
86293d0
PMM-11079 Hit CI
artemgavrilov Jun 30, 2023
34b82ca
PMM-11079 Revert nolint
artemgavrilov Jun 30, 2023
eab8184
Merge remote-tracking branch 'origin/main' into PMM-11079-remove-inte…
artemgavrilov Jul 3, 2023
dfbd235
PMM-11079 Remove IA migration script
artemgavrilov Jul 3, 2023
b8a7043
PMM-11079 Cleanup
artemgavrilov Jul 3, 2023
7605d21
PMM-11079 Cleanup
artemgavrilov Jul 3, 2023
b80b3cb
PMM-11079 Refactoring and cleanup
artemgavrilov Jul 3, 2023
73e6617
Merge remote-tracking branch 'origin/main' into PMM-11079-remove-inte…
artemgavrilov Jul 3, 2023
72534ea
PMM-11079 Cleanup
artemgavrilov Jul 3, 2023
8c69b4e
Merge remote-tracking branch 'origin/v3' into PMM-11079-remove-integr…
artemgavrilov Sep 28, 2023
3c53eb9
PMM-11079 Cleanup after merge
artemgavrilov Sep 28, 2023
923d8d4
Merge remote-tracking branch 'origin/v3' into PMM-11079-remove-integr…
artemgavrilov Sep 28, 2023
b5b695f
Merge remote-tracking branch 'origin/v3' into PMM-11079-remove-integr…
artemgavrilov Oct 11, 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
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
Loading