From af34b1da22deb003e9e5afd0866a528ccfa3ef9d Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Fri, 12 Dec 2025 14:21:21 +0100 Subject: [PATCH 1/3] PMM-7: Fix pmm client setup --- pmm_qa/tasks/install_pmm_client.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml index 430f2b05..ca6086d2 100644 --- a/pmm_qa/tasks/install_pmm_client.yml +++ b/pmm_qa/tasks/install_pmm_client.yml @@ -21,7 +21,7 @@ - name: Set correct pmm server port set_fact: pmm_server_port: 8443 - when: not (pmm_server_ip | default('') | regex_search('\.')) + when: not (pmm_server_ip | default('') | regex_search('\.') | bool) - name: Detect OS inside the container shell: docker exec {{ container_name }} cat /etc/os-release @@ -178,8 +178,7 @@ - name: Start pmm client shell: | - docker exec --user root {{ container_name }} \ - sh -c 'nohup pmm-agent --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml > /var/log/pmm-agent.log 2>&1 &' + docker exec --user root pdpgsql_pmm_patroni_18_1 sh -c 'nohup pmm-agent --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml > /var/log/pmm-agent.log 2>&1 &' - name: Wait 5 seconds for start to complete pause: From eecff8544566b24058570847c31660fa9b0ce9f7 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Fri, 12 Dec 2025 15:39:15 +0100 Subject: [PATCH 2/3] PMM-7: Fix pmm client setup --- pmm_qa/tasks/install_pmm_client.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml index 60e0a08f..c6cf3e56 100644 --- a/pmm_qa/tasks/install_pmm_client.yml +++ b/pmm_qa/tasks/install_pmm_client.yml @@ -16,12 +16,12 @@ - name: Set correct pmm server port set_fact: pmm_server_port: 443 - when: pmm_server_ip | default('') | regex_search('\.') | bool + when: pmm_server_ip is defined and ((pmm_server_ip | length) - (pmm_server_ip | replace('.', '') | length) == 3) - name: Set correct pmm server port set_fact: pmm_server_port: 8443 - when: not (pmm_server_ip | default('') | regex_search('\.') | bool) + when: pmm_server_ip is defined and ((pmm_server_ip | length) - (pmm_server_ip | replace('.', '') | length) < 3) - name: Detect OS inside the container shell: docker exec {{ container_name }} cat /etc/os-release From 4c00e2f66bb8f7c2e93e28e865c3b77ee4a85715 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Fri, 12 Dec 2025 15:46:15 +0100 Subject: [PATCH 3/3] PMM-7: Fix pmm client setup --- pmm_qa/tasks/install_pmm_client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml index c6cf3e56..2a42b07c 100644 --- a/pmm_qa/tasks/install_pmm_client.yml +++ b/pmm_qa/tasks/install_pmm_client.yml @@ -178,7 +178,7 @@ - name: Start pmm client shell: | - docker exec --user root pdpgsql_pmm_patroni_18_1 sh -c 'nohup pmm-agent --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml > /var/log/pmm-agent.log 2>&1 &' + docker exec --user root {{ container_name }} sh -c 'nohup pmm-agent --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml > /var/log/pmm-agent.log 2>&1 &' - name: Wait 5 seconds for start to complete pause: