Skip to content

Commit

Permalink
Merge branch 'PMM-2.0' of github.com:Percona-Lab/pmm-submodules into …
Browse files Browse the repository at this point in the history
…PMM-11148-inventory-manage-labels
  • Loading branch information
matejkubinec committed Jul 19, 2023
2 parents 492304b + 538cffd commit e60ddf0
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion sources/grafana/src/github.com/grafana/grafana
2 changes: 1 addition & 1 deletion sources/pmm/src/github.com/percona/pmm
Submodule pmm updated 40 files
+3 −0 agent/runner/jobs/errors.go
+1 −1 agent/runner/jobs/mongodb_backup_job.go
+19 −33 agent/runner/jobs/mongodb_restore_job.go
+37 −16 agent/runner/jobs/pbm_helpers.go
+3 −0 api/managementpb/json/client/rds/add_rds_responses.go
+5 −0 api/managementpb/json/managementpb.json
+89 −79 api/managementpb/rds.pb.go
+2 −0 api/managementpb/rds.pb.validate.go
+2 −0 api/managementpb/rds.proto
+5 −0 api/swagger/swagger-dev.json
+5 −0 api/swagger/swagger.json
+8 −5 build/packages/rpm/server/SPECS/percona-dashboards.spec
+10 −12 cli-tests/package-lock.json
+2 −2 cli-tests/package.json
+1 −1 go.mod
+3 −2 go.sum
+9 −0 managed/models/artifact_helpers.go
+26 −0 managed/models/artifact_helpers_test.go
+16 −0 managed/models/scheduled_tasks_helpers.go
+4 −0 managed/services/backup/backup_service.go
+5 −7 managed/services/backup/backup_service_test.go
+3 −6 managed/services/backup/compatibility_helpers.go
+19 −3 managed/services/backup/compatibility_service.go
+146 −102 managed/services/backup/compatibility_service_test.go
+1 −7 managed/services/backup/removal_service.go
+1 −1 managed/services/backup/removal_service_test.go
+8 −4 managed/services/errors.go
+32 −85 managed/services/management/backup/backups_service.go
+1 −0 managed/services/management/rds.go
+86 −1 managed/services/preconditions.go
+124 −0 managed/services/preconditions_test.go
+25 −3 managed/services/scheduler/scheduler.go
+47 −18 managed/services/scheduler/scheduler_test.go
+59 −32 qan-api2/models/metrics.go
+3 −5 qan-api2/test_data/GetMetrics_group_by_queryid.json
+3 −5 qan-api2/test_data/GetMetrics_sparklines_90_points.json
+3 −5 qan-api2/test_data/GetMetrics_total.json
+12 −12 tools/go.mod
+24 −29 tools/go.sum
+8 −0 update/ansible/playbook/tasks/roles/dashboards_upgrade/tasks/main.yml

0 comments on commit e60ddf0

Please sign in to comment.