Merge branch 'v3' into PMM-13202-fix-double-unlock

percona · Oct 7, 2024 · 4a42403 · 4a42403
2 parents 5f4d738 + 730ef71
commit 4a42403
Show file tree

Hide file tree

Showing 61 changed files with 347 additions and 244 deletions.
diff --git a/api-tests/docker-compose.yml b/api-tests/docker-compose.yml
@@ -35,13 +35,16 @@ services:
       --sql-mode="ANSI_QUOTES"
       --performance-schema --innodb_monitor_enable=all
       --slow_query_log --slow_query_log_file=/mysql/slowlogs/slow.log --long_query_time=0
-    ports:
-      - 127.0.0.1:3306:3306
     environment:
       - MYSQL_ROOT_PASSWORD=root-password
       - MYSQL_USER=pmm-agent
       - MYSQL_PASSWORD=pmm-agent-password
       - UMASK=0777  # for slowlog file
+    healthcheck:
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-uroot", "-proot-password"]
+      interval: 5s
+      timeout: 5s
+      retries: 20
     volumes:
       - test_db_mysql:/docker-entrypoint-initdb.d/:ro
       - ./testdata/mysql:/mysql
@@ -50,8 +53,6 @@ services:
     image: ${MONGO_IMAGE:-percona/percona-server-mongodb:4.2}
     container_name: pmm-agent_mongo
     command: --profile 2
-    ports:
-      - 127.0.0.1:27017:27017
     environment:
       - MONGO_INITDB_ROOT_USERNAME=root
       - MONGO_INITDB_ROOT_PASSWORD=root-password
@@ -66,14 +67,33 @@ services:
       -c pg_stat_statements.track=all
       -c pg_stat_statements.save=off
       -c track_io_timing=on
-    ports:
-      - 127.0.0.1:5432:5432
     environment:
       - POSTGRES_USER=pmm-agent
       - POSTGRES_PASSWORD=pmm-agent-password
     volumes:
       - test_db_postgres:/docker-entrypoint-initdb.d/
 
+
+  pmm-client-mysql:
+    image: percona/pmm-client:2
+    platform: "linux/amd64"
+    container_name: pmm-client-mysql
+    depends_on:
+      pmm-server:
+        condition: service_healthy
+      mysql:
+        condition: service_healthy
+    environment:
+      PMM_AGENT_SERVER_ADDRESS: pmm-server
+      PMM_AGENT_SERVER_USERNAME: admin
+      PMM_AGENT_SERVER_PASSWORD: admin
+      PMM_AGENT_SERVER_INSECURE_TLS: 1
+      PMM_AGENT_CONFIG_FILE: config/pmm-agent.yaml
+      PMM_AGENT_SETUP: 1
+      PMM_AGENT_SETUP_FORCE: 1
+      PMM_AGENT_SIDECAR: 1
+#      PMM_AGENT_PRERUN_SCRIPT: "pmm-admin status --wait=10s; pmm-admin add mysql --username=pmm-agent --password=pmm-agent-password --host=pmm-agent_mysql --port=3306"
+
   sysbench:
     image: perconalab/sysbench
     container_name: pmm-agent_sysbench

diff --git a/api/accesscontrol/v1beta1/accesscontrol.pb.go b/api/accesscontrol/v1beta1/accesscontrol.pb.go
diff --git a/api/actions/v1/actions.pb.go b/api/actions/v1/actions.pb.go
diff --git a/api/advisors/v1/advisors.pb.go b/api/advisors/v1/advisors.pb.go
diff --git a/api/agent/v1/agent.pb.go b/api/agent/v1/agent.pb.go
diff --git a/api/agent/v1/collector.pb.go b/api/agent/v1/collector.pb.go
diff --git a/api/agentlocal/v1/agentlocal.pb.go b/api/agentlocal/v1/agentlocal.pb.go
diff --git a/api/alerting/v1/alerting.pb.go b/api/alerting/v1/alerting.pb.go
diff --git a/api/alerting/v1/params.pb.go b/api/alerting/v1/params.pb.go
diff --git a/api/backup/v1/artifacts.pb.go b/api/backup/v1/artifacts.pb.go
diff --git a/api/backup/v1/backup.pb.go b/api/backup/v1/backup.pb.go
diff --git a/api/backup/v1/common.pb.go b/api/backup/v1/common.pb.go
diff --git a/api/backup/v1/errors.pb.go b/api/backup/v1/errors.pb.go
diff --git a/api/backup/v1/locations.pb.go b/api/backup/v1/locations.pb.go
diff --git a/api/backup/v1/restores.pb.go b/api/backup/v1/restores.pb.go
diff --git a/api/common/common.pb.go b/api/common/common.pb.go
diff --git a/api/common/metrics_resolutions.pb.go b/api/common/metrics_resolutions.pb.go
diff --git a/api/dump/v1beta1/dump.pb.go b/api/dump/v1beta1/dump.pb.go
diff --git a/api/inventory/v1/agent_status.pb.go b/api/inventory/v1/agent_status.pb.go
diff --git a/api/inventory/v1/agents.pb.go b/api/inventory/v1/agents.pb.go
diff --git a/api/inventory/v1/log_level.pb.go b/api/inventory/v1/log_level.pb.go
diff --git a/api/inventory/v1/nodes.pb.go b/api/inventory/v1/nodes.pb.go
diff --git a/api/inventory/v1/services.pb.go b/api/inventory/v1/services.pb.go
diff --git a/api/management/v1/agent.pb.go b/api/management/v1/agent.pb.go
diff --git a/api/management/v1/annotation.pb.go b/api/management/v1/annotation.pb.go
diff --git a/api/management/v1/azure.pb.go b/api/management/v1/azure.pb.go
diff --git a/api/management/v1/external.pb.go b/api/management/v1/external.pb.go
diff --git a/api/management/v1/haproxy.pb.go b/api/management/v1/haproxy.pb.go
diff --git a/api/management/v1/metrics.pb.go b/api/management/v1/metrics.pb.go
diff --git a/api/management/v1/mongodb.pb.go b/api/management/v1/mongodb.pb.go
diff --git a/api/management/v1/mysql.pb.go b/api/management/v1/mysql.pb.go
diff --git a/api/management/v1/node.pb.go b/api/management/v1/node.pb.go
diff --git a/api/management/v1/postgresql.pb.go b/api/management/v1/postgresql.pb.go
diff --git a/api/management/v1/proxysql.pb.go b/api/management/v1/proxysql.pb.go
diff --git a/api/management/v1/rds.pb.go b/api/management/v1/rds.pb.go
diff --git a/api/management/v1/service.pb.go b/api/management/v1/service.pb.go
diff --git a/api/management/v1/severity.pb.go b/api/management/v1/severity.pb.go
diff --git a/api/platform/v1/platform.pb.go b/api/platform/v1/platform.pb.go
diff --git a/api/qan/v1/collector.pb.go b/api/qan/v1/collector.pb.go
diff --git a/api/qan/v1/filters.pb.go b/api/qan/v1/filters.pb.go
diff --git a/api/qan/v1/object_details.pb.go b/api/qan/v1/object_details.pb.go
diff --git a/api/qan/v1/profile.pb.go b/api/qan/v1/profile.pb.go
diff --git a/api/qan/v1/qan.pb.go b/api/qan/v1/qan.pb.go