From 0ae2a985eb44e1457ce09695e0e8433d760b0583 Mon Sep 17 00:00:00 2001 From: yurkovychv Date: Tue, 6 Jan 2026 12:46:39 +0200 Subject: [PATCH 1/2] PMM-14669 fix remote pmm-server client install --- pmm_qa/tasks/install_pmm_client.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml index 2a42b07c..b5647cf6 100644 --- a/pmm_qa/tasks/install_pmm_client.yml +++ b/pmm_qa/tasks/install_pmm_client.yml @@ -15,13 +15,12 @@ - name: Set correct pmm server port set_fact: - pmm_server_port: 443 - when: pmm_server_ip is defined and ((pmm_server_ip | length) - (pmm_server_ip | replace('.', '') | length) == 3) + pmm_server_port: "{{ 443 if (pmm_server_ip | default('') is search('\\.')) else 8443 }}" -- name: Set correct pmm server port - set_fact: - pmm_server_port: 8443 - 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('\.')) - name: Detect OS inside the container shell: docker exec {{ container_name }} cat /etc/os-release @@ -178,7 +177,8 @@ - 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 {{ 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: From 779ea6baaf9b3de492b4a0e546765754c68aea29 Mon Sep 17 00:00:00 2001 From: yurkovychv Date: Tue, 6 Jan 2026 12:51:27 +0200 Subject: [PATCH 2/2] PMM-14669 fix remote pmm-server client install --- pmm_qa/tasks/install_pmm_client.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml index b5647cf6..34af7b3a 100644 --- a/pmm_qa/tasks/install_pmm_client.yml +++ b/pmm_qa/tasks/install_pmm_client.yml @@ -13,14 +13,15 @@ pmm_server_ip: "{{ pmm_server_ip_output.stdout }}" when: pmm_server_ip == "127.0.0.1" -- name: Set correct pmm server port - set_fact: - pmm_server_port: "{{ 443 if (pmm_server_ip | default('') is search('\\.')) else 8443 }}" - -#- name: Set correct pmm server port -# set_fact: -# pmm_server_port: 8443 -# when: not (pmm_server_ip | default('') | regex_search('\.')) +- set_fact: + pmm_server_port: 443 + when: pmm_server_ip is defined and + ((pmm_server_ip | length) - (pmm_server_ip | replace('.', '') | length) >= 3) + +- set_fact: + pmm_server_port: 8443 + 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