Skip to content

Commit

Permalink
Merge branch 'PMM-2.0' into PMM-12151-12273-explain
Browse files Browse the repository at this point in the history
  • Loading branch information
JiriCtvrtka committed Jul 25, 2023
2 parents 441b479 + b2f5d6e commit 8249b29
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 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 43 files
+1 −1 .github/workflows/admin.yml
+62 −0 .github/workflows/devcontainer.yml
+36 −2 agent/agents/mysql/perfschema/perfschema.go
+6 −0 agent/agents/supervisor/supervisor.go
+5 −1 agent/commands/run.go
+21 −7 agent/config/config.go
+68 −27 agent/config/config_test.go
+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
+7 −6 build/docker/server/Dockerfile.el9
+1 −1 go.mod
+3 −2 go.sum
+4 −0 managed/Makefile
+8 −1 managed/cmd/pmm-managed-starlark/main_test.go
+11 −5 managed/cmd/pmm-managed/main.go
+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
+4 −4 tools/go.mod
+8 −8 tools/go.sum

0 comments on commit 8249b29

Please sign in to comment.