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-12382-custom-labels-validation
  • Loading branch information
matejkubinec committed Aug 16, 2023
2 parents c9429b9 + b2b0c8f commit 198e197
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion sources/grafana-dashboards
2 changes: 1 addition & 1 deletion sources/grafana/src/github.com/grafana/grafana
2 changes: 1 addition & 1 deletion sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
2 changes: 1 addition & 1 deletion sources/pmm/src/github.com/percona/pmm
Submodule pmm updated 56 files
+1 −1 Dockerfile
+3 −5 agent/cmd/pmm-agent-entrypoint/main.go
+2 −24 agent/main.go
+7 −6 build/ansible/roles/pmm2-images/tasks/main.yml
+1 −2 build/packages/rpm/server/SPECS/grafana-db-migrator.spec
+2 −0 build/scripts/build-server-rpm-all
+76 −0 build/scripts/create-tags
+0 −48 build/scripts/create-tags.py
+34 −54 cli-tests/package-lock.json
+1 −1 cli-tests/package.json
+6 −6 go.mod
+11 −11 go.sum
+1 −1 managed/cmd/pmm-managed-init/main.go
+1 −1 managed/cmd/pmm-managed-starlark/main.go
+1 −1 managed/cmd/pmm-managed/main.go
+1 −1 managed/services/agents/channel/channel.go
+1 −1 managed/services/agents/connection_checker.go
+1 −1 managed/services/agents/handler.go
+1 −1 managed/services/agents/registry.go
+1 −1 managed/services/agents/state.go
+1 −1 managed/services/grafana/auth_server_test.go
+1 −1 managed/services/inventory/agents.go
+1 −1 managed/services/inventory/inventory_metrics.go
+1 −1 managed/services/inventory/services_test.go
+1 −1 managed/services/management/agent_test.go
+1 −1 managed/services/management/annotation_test.go
+1 −1 managed/services/management/azure_database.go
+1 −1 managed/services/management/dbaas/components_service_test.go
+1 −1 managed/services/management/dbaas/db_cluster_service_test.go
+1 −1 managed/services/management/dbaas/kubernetes_server_test.go
+1 −1 managed/services/management/dbaas/psmdb_cluster_service_test.go
+1 −1 managed/services/management/dbaas/pxc_cluster_service_test.go
+1 −1 managed/services/management/node_mgmt_test.go
+1 −1 managed/services/management/node_test.go
+1 −1 managed/services/management/rds.go
+1 −1 managed/services/management/rds_test.go
+1 −1 managed/services/management/role_test.go
+1 −1 managed/services/management/service_mgmt_test.go
+1 −1 managed/services/management/service_test.go
+1 −1 managed/services/qan/client_test.go
+1 −1 managed/services/supervisord/logs.go
+1 −1 managed/services/supervisord/logs_test.go
+1 −0 managed/services/supervisord/supervisord.go
+1 −1 managed/services/vmalert/init_test.go
+1 −1 managed/utils/interceptors/interceptors.go
+2 −22 qan-api2/main.go
+10 −10 tools/go.mod
+20 −20 tools/go.sum
+12 −2 update/ansible/playbook/tasks/roles/grafana/files/grafana.ini
+36 −0 update/ansible/playbook/tasks/roles/grafana/tasks/main.yml
+37 −0 update/ansible/playbook/tasks/roles/initialization/tasks/main.yml
+122 −0 update/ansible/playbook/tasks/roles/sqlite-to-postgres/tasks/main.yml
+33 −0 update/ansible/playbook/tasks/update.yml
+1 −3 utils/logger/global.go
+0 −0 utils/logger/grpc.go
+0 −0 utils/logger/logger.go

0 comments on commit 198e197

Please sign in to comment.