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

PMM-12460 PMM Dump integration #2493

Merged
merged 85 commits into from
Nov 23, 2023
Merged

PMM-12460 PMM Dump integration #2493

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
4785331
PMM-12460 PMM Dump API
artemgavrilov Sep 19, 2023
0fbb593
Merge branch 'main' into PMM-12460-pmm-dump
artemgavrilov Sep 19, 2023
5bfbd42
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Sep 20, 2023
649cc21
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Sep 25, 2023
7195f54
PMM-12460 Add created_at to the dump API model
artemgavrilov Sep 25, 2023
e66ba6b
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Sep 26, 2023
9201b52
PMM-12460 Add dump model, implement ListDumps method
artemgavrilov Sep 26, 2023
41fd1ea
PMM-12460 Fix
artemgavrilov Sep 26, 2023
6fc0f73
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Sep 27, 2023
b9daaed
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Sep 28, 2023
8722c01
PMM-12460 Allow batch dupm deletes
artemgavrilov Sep 28, 2023
2c3d954
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Sep 28, 2023
7433f80
PMM-12460 Dupm integration draft
artemgavrilov Sep 29, 2023
4a2b27e
PMM-12460 Draft
artemgavrilov Sep 29, 2023
5bf94c9
Merge branch 'main' into PMM-12460-pmm-dump
idoqo Oct 5, 2023
d1ced90
PMM-12460 Fix bad merge
artemgavrilov Oct 12, 2023
f92181e
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Oct 12, 2023
7a2d1c4
PMM-12460 Fix dump
artemgavrilov Oct 16, 2023
d40b7c3
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Oct 16, 2023
2b731df
PMM-12460 Use API tokens for pmm-dump authorization
artemgavrilov Oct 16, 2023
c964928
PMM-12460 Linter fixes
artemgavrilov Oct 16, 2023
9b2703d
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Oct 16, 2023
bbb63e0
PMM-12460 Fix dump logs processing
artemgavrilov Oct 17, 2023
d9db7fa
PMM-12460 Use API keys expiration
artemgavrilov Oct 17, 2023
086dedf
PMM-12460 Update dupm statuses, fix dates hadnling
artemgavrilov Oct 17, 2023
6bfaae7
Merge branch 'main' into PMM-12460-pmm-dump
artemgavrilov Oct 17, 2023
879db7b
Merge branch 'main' into PMM-12460-pmm-dump
artemgavrilov Oct 18, 2023
4d3eef4
PMM-12460 Try to fix pmm-dump build
artemgavrilov Oct 19, 2023
cd88bea
PMM-12460 Debug
artemgavrilov Oct 19, 2023
d8ae911
PMM-12460 Debug
artemgavrilov Oct 19, 2023
b76f150
PMM-12460 Different fixes
artemgavrilov Oct 19, 2023
8aeaa8d
PMM-12460 Use service names instead of node ids
artemgavrilov Oct 19, 2023
1651890
PMM-12460 Handle service names
artemgavrilov Oct 19, 2023
bdd0fbe
PMM-12460 Implement dump deletion
artemgavrilov Oct 19, 2023
935d405
PMM-12460 Fix
artemgavrilov Oct 19, 2023
3aa195c
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Oct 23, 2023
54a1bff
PMM-12460 Add dump upload API
artemgavrilov Oct 23, 2023
3e7d631
PMM-12460 Refactoring
artemgavrilov Oct 23, 2023
e4cd2ba
PMM-12460 Refactorinb
artemgavrilov Oct 24, 2023
d25a3d2
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Oct 24, 2023
7c6af35
PMM-12460 Implement FTP upload
artemgavrilov Oct 26, 2023
a4f1825
PMM-12460 Fix pmm-dump authentication
artemgavrilov Oct 26, 2023
953297e
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Oct 26, 2023
3fc6a7b
PMM-12460 Fix migrations
artemgavrilov Oct 26, 2023
47adeac
PMM-12460 Fixes and improvements
artemgavrilov Oct 26, 2023
06d24e8
PMM-12460 Revert API key creation changes
artemgavrilov Oct 26, 2023
abd9ab4
PMM-12460 Fix
artemgavrilov Oct 26, 2023
5a2af0e
PMM-12460 Fixed
artemgavrilov Oct 26, 2023
475d5cc
PMM-12460 Revert debug info
artemgavrilov Oct 26, 2023
fd85aa4
PMM-12460 Fix tests
artemgavrilov Oct 26, 2023
d743ccd
PMM-12460 Fixes
artemgavrilov Oct 26, 2023
6655119
PMM-12460 Fix tests
artemgavrilov Oct 27, 2023
36177fb
PMM-12460 Fix linter
artemgavrilov Oct 27, 2023
0b375e4
Merge branch 'main' into PMM-12460-pmm-dump
artemgavrilov Oct 31, 2023
e01f1af
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Oct 31, 2023
5af0600
PMM-12460 Use SFTP instead FTP
artemgavrilov Oct 31, 2023
fb8746c
PMM-12460 Remove dedug code
artemgavrilov Oct 31, 2023
4d8ab44
PMM-12460 Lint fixes
artemgavrilov Oct 31, 2023
534987e
Merge branch 'main' into PMM-12460-pmm-dump
YashSartanpara1 Nov 1, 2023
282af8a
PMM-12460 Log error
artemgavrilov Nov 1, 2023
3e46e46
PMM-12460 Add dump metrics
artemgavrilov Nov 1, 2023
ac2bf6c
PMM-12460 Fix
artemgavrilov Nov 1, 2023
874e507
PMM-12460 Add pmm dumps telemetry
artemgavrilov Nov 2, 2023
8bacbe7
PMM-12460 Expose directory with pmm-dupm artifacts via nginx
artemgavrilov Nov 2, 2023
1f97da2
PMM-12460 Fix dumps telemetry
artemgavrilov Nov 2, 2023
42b1998
PMM-12460 Fix comments
artemgavrilov Nov 2, 2023
f052600
PMM-12460 Tune nginx config
artemgavrilov Nov 2, 2023
f20a686
PMM-12460 Make start and end time optional (nullable)
artemgavrilov Nov 2, 2023
02eda4d
PMM-12460 Polishing
artemgavrilov Nov 3, 2023
26ba632
PMM-12460 Don't return filepath for dupms that are not in success state
artemgavrilov Nov 3, 2023
66e16ee
Merge branch 'main' into PMM-12460-pmm-dump
artemgavrilov Nov 6, 2023
838f2d6
PMM-12460 Remove redundant field
artemgavrilov Nov 7, 2023
a9236b9
PMM-12460 Remove dump metrics
artemgavrilov Nov 7, 2023
2d860cd
PMM-12460 Refactoring
artemgavrilov Nov 7, 2023
36d89c3
PMM-12460 Fix
artemgavrilov Nov 7, 2023
862e5e7
PMM-12460 Add API validation rules
artemgavrilov Nov 7, 2023
eff8337
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Nov 7, 2023
96895eb
PMM-12460 Configure ssh key exchange algos
artemgavrilov Nov 9, 2023
f2b4681
Merge branch 'main' into PMM-12460-pmm-dump
artemgavrilov Nov 9, 2023
3579696
Merge branch 'main' into PMM-12460-pmm-dump
artemgavrilov Nov 9, 2023
359d0ef
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Nov 14, 2023
0a9a430
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Nov 16, 2023
1e0874a
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Nov 20, 2023
d240552
Merge remote-tracking branch 'origin/main' into PMM-12460-pmm-dump
artemgavrilov Nov 23, 2023
8ac82dc
PMM-12460 Update pmm-dump
artemgavrilov Nov 23, 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: 3 additions & 2 deletions Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ gen-api: ## Generate PMM API

bin/buf generate -v api

for API in api/agentlocalpb api/serverpb api/inventorypb api/managementpb api/managementpb/dbaas 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/dbaas api/managementpb/ia api/managementpb/alerting api/managementpb/backup api/managementpb/dump 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 @@ -91,6 +91,7 @@ gen-api: ## Generate PMM API
api/managementpb/ia/json/ia.json \
api/managementpb/alerting/json/alerting.json \
api/managementpb/backup/json/backup.json \
api/managementpb/dump/json/dump.json \
api/managementpb/azure/json/azure.json \
api/managementpb/role/json/role.json \
api/managementpb/agent/json/agent.json \
Expand Down Expand Up @@ -127,7 +128,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/dbaas 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/dbaas api/managementpb/ia api/managementpb/alerting api/managementpb/backup api/management/dump 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
Loading