From 8002b3d78fd490fbc2aa231821f99c15fb5644e0 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 10:34:17 +0100
Subject: [PATCH 01/13] PMM-7: Install pmm client

---
 pmm_qa/external_setup.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pmm_qa/external_setup.yml b/pmm_qa/external_setup.yml
index 456e636d..6c4dce21 100644
--- a/pmm_qa/external_setup.yml
+++ b/pmm_qa/external_setup.yml
@@ -50,11 +50,10 @@
     with_items:
       - docker exec {{ external_container }} bash -x ./external_setup.sh > setup_external.log
 
-  - name: Install pmm2-client on the external_container
-    shell: "{{ item }}"
-    with_items:
-      - docker network connect pmm-qa {{ external_container }}
-      - docker exec {{ external_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no
+  - name: Install PMM Client inside of container
+    include_tasks: ./tasks/install_pmm_client.yml
+    vars:
+      container_name: {{ external_container }}
 
   - name: Execute Setup script inside the External container for Redis
     shell: "{{ item }}"

From e39ebcb44ae3e0d88e3d4825f70e0339654cfeab Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 10:36:42 +0100
Subject: [PATCH 02/13] PMM-7: Install pmm client

---
 pmm_qa/external_setup.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/external_setup.yml b/pmm_qa/external_setup.yml
index 6c4dce21..7daebb9b 100644
--- a/pmm_qa/external_setup.yml
+++ b/pmm_qa/external_setup.yml
@@ -53,7 +53,7 @@
   - name: Install PMM Client inside of container
     include_tasks: ./tasks/install_pmm_client.yml
     vars:
-      container_name: {{ external_container }}
+      container_name: "{{ external_container }}"
 
   - name: Execute Setup script inside the External container for Redis
     shell: "{{ item }}"

From 3de8a0f2d83a17c03d7f516f706c028c2911892a Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 10:41:06 +0100
Subject: [PATCH 03/13] PMM-7: Install pmm client

---
 pmm_qa/external_setup.yml           |  1 -
 pmm_qa/tasks/install_pmm_client.yml | 14 --------------
 2 files changed, 15 deletions(-)

diff --git a/pmm_qa/external_setup.yml b/pmm_qa/external_setup.yml
index 7daebb9b..af53f6b0 100644
--- a/pmm_qa/external_setup.yml
+++ b/pmm_qa/external_setup.yml
@@ -35,7 +35,6 @@
     shell: "{{ item }}"
     with_items:
       - docker cp ./external_setup.sh {{ external_container }}:/
-      - docker cp ./pmm3-client-setup.sh {{ external_container }}:/
       - docker exec {{ external_container }} apt-get update
       - docker exec {{ external_container }} apt-get -y install wget curl git gnupg2 lsb-release
 
diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml
index 188b5739..8852c45e 100644
--- a/pmm_qa/tasks/install_pmm_client.yml
+++ b/pmm_qa/tasks/install_pmm_client.yml
@@ -8,20 +8,6 @@
     pmm_server_ip: "{{ pmm_server_ip_output.stdout }}"
   when: pmm_server_ip == "127.0.0.1"
 
-- name: Print pmm server address
-  debug:
-    var: pmm_server_ip
-
-- name: Copy a file into the container
-  community.docker.docker_container_copy_into:
-    container: "{{ container_name }}"
-    path: ../pmm3-client-setup-centos.sh
-    container_path: /pmm3-client-setup.sh
-
-- name: "PMM Server IP is"
-  debug:
-    msg: "{{ pmm_server_ip }} is pmm server IP"
-
 - name: Set correct pmm server port
   set_fact:
     pmm_server_port: 443

From 48868de8374d92f44262370890e39bd25cc7e86d Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 10:43:18 +0100
Subject: [PATCH 04/13] PMM-7: Install pmm client

---
 pmm_qa/tasks/install_pmm_client.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml
index 8852c45e..8f01014e 100644
--- a/pmm_qa/tasks/install_pmm_client.yml
+++ b/pmm_qa/tasks/install_pmm_client.yml
@@ -1,3 +1,8 @@
+- name: Set default metrics mode
+  register:
+    metrics_mode: 'auto'
+  when: metrics_mode is undefined
+
 - name: Get PMM server address
   shell: 'docker ps -f name=-server --format "{{ "{{" }}.Names{{ "}}" }}"'
   register: pmm_server_ip_output

From 5168f94d5548c718da65c1cb596d1d20bdbb9d57 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 10:45:13 +0100
Subject: [PATCH 05/13] PMM-7: Install pmm client

---
 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 8f01014e..087d17d1 100644
--- a/pmm_qa/tasks/install_pmm_client.yml
+++ b/pmm_qa/tasks/install_pmm_client.yml
@@ -1,7 +1,7 @@
 - name: Set default metrics mode
-  register:
+  set_fact:
     metrics_mode: 'auto'
-  when: metrics_mode is undefined
+  when: metrics_mode is not defined
 
 - name: Get PMM server address
   shell: 'docker ps -f name=-server --format "{{ "{{" }}.Names{{ "}}" }}"'

From df50b9e268e199fec321825f2dd08f8beb6ff691 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 10:54:28 +0100
Subject: [PATCH 06/13] PMM-7: Install pmm client

---
 pmm_qa/external_setup.yml           | 9 ++++++---
 pmm_qa/tasks/install_pmm_client.yml | 4 ----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pmm_qa/external_setup.yml b/pmm_qa/external_setup.yml
index af53f6b0..dfd7df9a 100644
--- a/pmm_qa/external_setup.yml
+++ b/pmm_qa/external_setup.yml
@@ -27,9 +27,12 @@
     ignore_errors: true
 
   - name: Prepare Container for External Exporters
-    shell: >
-      sudo docker run -d -p 43100:43100 --name={{ external_container }}
-      phusion/baseimage:jammy-1.0.1
+    shell: |
+      docker run -d \
+        -p 43100:43100 \
+        --name={{ external_container }} \
+        --network=pmm-qa \
+        phusion/baseimage:noble-1.0.2
 
   - name: Copy all required Artifacts to the docker external_container
     shell: "{{ item }}"
diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml
index 087d17d1..714a60ea 100644
--- a/pmm_qa/tasks/install_pmm_client.yml
+++ b/pmm_qa/tasks/install_pmm_client.yml
@@ -78,10 +78,6 @@
   set_fact:
     lsb_release: "{{ lsb_release.stdout }}"
 
-- name: Print expected client version
-  debug:
-    msg: "{{ metrics_mode }}"
-
 - name: Install percona release on Debian-family containers
   community.docker.docker_container_exec:
     container: "{{ container_name }}"

From 3c52b7168da4e5dd92ce046ba201d9fd5ff39a7c Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 11:01:17 +0100
Subject: [PATCH 07/13] PMM-7: Install pmm client

---
 pmm_qa/external_setup.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pmm_qa/external_setup.yml b/pmm_qa/external_setup.yml
index dfd7df9a..20f5477c 100644
--- a/pmm_qa/external_setup.yml
+++ b/pmm_qa/external_setup.yml
@@ -92,11 +92,11 @@
   - name: Add Redis for Monitoring to PMM via pmm-admin add external command
     shell: "{{ item }}"
     with_items:
-      - docker exec {{ external_container }} bash -c 'source ~/.bash_profile || true; pmm-admin list'
-      - docker exec {{ external_container }} bash -c 'source ~/.bash_profile || true; pmm-admin add external --listen-port=42200 --group="redis" --service-name=redis_external_service_{{ random_number }}'
+      - docker exec {{ external_container }} pmm-admin list
+      - docker exec {{ external_container }} pmm-admin add external --listen-port=42200 --group="redis" --service-name=redis_external_service_{{ random_number }}
 
   - name: Add Node Process for Monitoring to PMM via pmm-admin add external command
     shell: "{{ item }}"
     with_items:
-      - docker exec {{ external_container }} bash -c 'source ~/.bash_profile || true; pmm-admin list'
-      - docker exec {{ external_container }} bash -c 'source ~/.bash_profile || true; pmm-admin add external --group=processes  --listen-port=9256 --service-name=nodeprocess_service_{{ random_number }}'
+      - docker exec {{ external_container }} pmm-admin list
+      - docker exec {{ external_container }} pmm-admin add external --group=processes  --listen-port=9256 --service-name=nodeprocess_service_{{ random_number }}

From d77a9e9b738c08506fd003e93e2040a8899ee1a0 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 11:07:08 +0100
Subject: [PATCH 08/13] PMM-7: Install pmm client

---
 pmm_qa/external_setup.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pmm_qa/external_setup.yml b/pmm_qa/external_setup.yml
index 20f5477c..a3f66d62 100644
--- a/pmm_qa/external_setup.yml
+++ b/pmm_qa/external_setup.yml
@@ -42,10 +42,12 @@
       - docker exec {{ external_container }} apt-get -y install wget curl git gnupg2 lsb-release
 
   - name: Run Redis Container in Host
-    shell: "{{ item }}"
-    with_items:
-      - docker run --name redis_container -d -p 6379:6379 redis '--requirepass oFukiBRg7GujAJXq3tmd'
-      - docker network connect pmm-qa redis_container
+    shell: |
+      docker run -d \
+        --name=redis_container \
+        --network=pmm-qa \
+        -p 6379:6379 \
+        redis '--requirepass oFukiBRg7GujAJXq3tmd'
 
   - name: Setup External Exporters for monitoring
     shell: "{{ item }}"

From 054cade0ee92ee6b6d23edd3df2a0303d17235d1 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 11:10:28 +0100
Subject: [PATCH 09/13] PMM-7: Install pmm client

---
 pmm_qa/external_setup.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/external_setup.yml b/pmm_qa/external_setup.yml
index a3f66d62..aed0a9d7 100644
--- a/pmm_qa/external_setup.yml
+++ b/pmm_qa/external_setup.yml
@@ -95,7 +95,7 @@
     shell: "{{ item }}"
     with_items:
       - docker exec {{ external_container }} pmm-admin list
-      - docker exec {{ external_container }} pmm-admin add external --listen-port=42200 --group="redis" --service-name=redis_external_service_{{ random_number }}
+#      - docker exec {{ external_container }} pmm-admin add external --listen-port=42200 --group="redis" --service-name=redis_external_service_{{ random_number }}
 
   - name: Add Node Process for Monitoring to PMM via pmm-admin add external command
     shell: "{{ item }}"

From 85796e389194cbabec04ceb62e520479362628e5 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 11:43:03 +0100
Subject: [PATCH 10/13] PMM-7: Install pmm client

---
 pmm_qa/external_setup.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/external_setup.yml b/pmm_qa/external_setup.yml
index aed0a9d7..a3f66d62 100644
--- a/pmm_qa/external_setup.yml
+++ b/pmm_qa/external_setup.yml
@@ -95,7 +95,7 @@
     shell: "{{ item }}"
     with_items:
       - docker exec {{ external_container }} pmm-admin list
-#      - docker exec {{ external_container }} pmm-admin add external --listen-port=42200 --group="redis" --service-name=redis_external_service_{{ random_number }}
+      - docker exec {{ external_container }} pmm-admin add external --listen-port=42200 --group="redis" --service-name=redis_external_service_{{ random_number }}
 
   - name: Add Node Process for Monitoring to PMM via pmm-admin add external command
     shell: "{{ item }}"

From 6f96b7e1b0a5bbef2af64d148c2b34353b76811f Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 11:47:09 +0100
Subject: [PATCH 11/13] PMM-7: Install pmm client

---
 pmm_qa/tasks/install_pmm_client.yml | 52 ++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml
index 714a60ea..45a50ea5 100644
--- a/pmm_qa/tasks/install_pmm_client.yml
+++ b/pmm_qa/tasks/install_pmm_client.yml
@@ -24,9 +24,7 @@
   when: not (pmm_server_ip | default('') | regex_search('\.'))
 
 - name: Detect OS inside the container
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    command: cat /etc/os-release
+  shell: docker exec {{ container_name }} cat /etc/os-release
   register: container_os_info
 
 - name: Set distro family (debian/rhel)
@@ -41,28 +39,42 @@
       }}
 
 - name: Install dependencies inside Debian-family container
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    command: >
-      sh -c '
-      apt-get update &&
-      apt-get install -y wget gnupg2 jq lsb-base lsb-release curl
-      '
-    user: "root"
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      apt-get update && \
+      apt-get install -y \
+        wget \
+        gnupg2 \
+        jq \
+        lsb-base \
+        lsb-release \
+        curl
+    '
   when: distro_family == "debian"
 
-- name: Install dependencies on RHEL-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    command: microdnf install -y wget gnupg2 jq
-    user: "root"
+- name: Install dependencies inside Debian-family container
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      microdnf install -y \
+        wget \
+        gnupg2 \
+        jq \
+    '
+  when: distro_family == "debian"
+
+- name: Install dependencies inside Debian-family container
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      microdnf install -y \
+        wget \
+        gnupg2 \
+        jq \
+        '
   when: distro_family == "rhel"
 
 - name: Install curl on RHEL-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    command: microdnf install -y curl-minimal
-    user: "root"
+  shell: |
+    docker exec --user root {{ container_name }} sh -c 'microdnf install -y curl-minimal'
   when: distro_family == "rhel"
   ignore_errors: true
 

From 92e264e6f2c443b8d2938c20843b7316ccff2894 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 12:01:23 +0100
Subject: [PATCH 12/13] PMM-7: Install pmm client

---
 pmm_qa/tasks/install_pmm_client.yml | 218 +++++++++++++---------------
 1 file changed, 97 insertions(+), 121 deletions(-)

diff --git a/pmm_qa/tasks/install_pmm_client.yml b/pmm_qa/tasks/install_pmm_client.yml
index 45a50ea5..1f4b14ad 100644
--- a/pmm_qa/tasks/install_pmm_client.yml
+++ b/pmm_qa/tasks/install_pmm_client.yml
@@ -79,11 +79,9 @@
   ignore_errors: true
 
 - name: Get lsb_release
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    command: >
+  shell: |
+    docker exec --user root {{ container_name }} \
       bash -c "grep '^VERSION_CODENAME=' /etc/os-release | cut -d '=' -f2 | tr -d '\"'"
-    user: "root"
   register: lsb_release
 
 - name: Set lsb_release
@@ -91,159 +89,139 @@
     lsb_release: "{{ lsb_release.stdout }}"
 
 - name: Install percona release on Debian-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        wget -O /percona-release_latest.{{ lsb_release }}_all.deb https://repo.percona.com/apt/percona-release_latest.{{ lsb_release }}_all.deb &&
-        dpkg -i /percona-release_latest.{{ lsb_release }}_all.deb
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      wget -O /percona-release_latest.{{ lsb_release.stdout | trim }}_all.deb \
+        https://repo.percona.com/apt/percona-release_latest.{{ lsb_release.stdout | trim }}_all.deb &&
+      dpkg -i /percona-release_latest.{{ lsb_release.stdout | trim }}_all.deb
+    '
   when:
     - distro_family == 'debian'
+  ignore_errors: true
 
-- name: Install specific PMM client version on RHEL-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        wget -O /percona-release-latest.noarch.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm &&
-        rpm -i /percona-release-latest.noarch.rpm
-      '
-  when:
-    - distro_family == 'rhel'
+- name: Install percona release on RHEL-family containers
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      wget -O /percona-release-latest.noarch.rpm \
+        https://repo.percona.com/yum/percona-release-latest.noarch.rpm && \
+      rpm -i /percona-release-latest.noarch.rpm
+    '
+  when: distro_family == 'rhel'
   ignore_errors: true
 
 - name: Install pmm client experimental on Debian-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        percona-release enable-only pmm3-client experimental &&
-        apt-get update &&
-        apt-get -y install pmm-client
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      percona-release enable-only pmm3-client experimental &&
+      apt-get update &&
+      apt-get -y install pmm-client
+    '
   when: distro_family == "debian" and client_version == "3-dev-latest"
 
 - name: Install pmm client experimental on RHEL-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        percona-release enable-only pmm3-client experimental &&
-        microdnf install -y pmm-client
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      percona-release enable-only pmm3-client experimental &&
+      microdnf install -y pmm-client
+    '
   when: distro_family == "rhel" and client_version == "3-dev-latest"
 
 - name: Install pmm client testing on Debian-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        percona-release enable-only pmm3-client testing &&
-        apt-get update &&
-        apt-get -y install pmm-client
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      percona-release enable-only pmm3-client testing &&
+      apt-get update &&
+      apt-get -y install pmm-client
+    '
   when: distro_family == "debian" and client_version == "pmm3-rc"
 
 - name: Install pmm client testing on RHEL-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        percona-release enable-only pmm3-client testing &&
-        microdnf install -y pmm-client
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      percona-release enable-only pmm3-client testing &&
+      microdnf install -y pmm-client
+    '
   when: distro_family == "rhel" and client_version == "pmm3-rc"
 
 - name: Install pmm client release on Debian-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        percona-release enable-only pmm3-client release &&
-        apt-get update &&
-        apt-get -y install pmm-client
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      percona-release enable-only pmm3-client release &&
+      apt-get update &&
+      apt-get -y install pmm-client
+    '
   when: distro_family == "debian" and client_version == "pmm3-latest"
 
 - name: Install pmm client release on RHEL-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        percona-release enable-only pmm3-client release &&
-        microdnf install -y pmm-client
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      percona-release enable-only pmm3-client release &&
+      microdnf install -y pmm-client
+    '
   when: distro_family == "rhel" and client_version == "pmm3-latest"
 
 - name: Install specific PMM client version on Debian-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        wget -O /pmm-client.deb https://repo.percona.com/pmm3-client/apt/pool/main/p/pmm-client/pmm-client_{{ client_version }}-7.$(lsb_release -sc)_amd64.deb &&
-        dpkg -i /pmm-client.deb
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      wget -O /pmm-client.deb https://repo.percona.com/pmm3-client/apt/pool/main/p/pmm-client/pmm-client_{{ client_version }}-7.$(lsb_release -sc)_amd64.deb &&
+      dpkg -i /pmm-client.deb
+    '
   when:
     - distro_family == 'debian'
     - client_version is match('^3\\.[0-9]+\\.[0-9]+$')
 
 - name: Install specific PMM client version on RHEL-family containers
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        wget -O /pmm-client.rpm https://repo.percona.com/pmm3-client/yum/release/9/RPMS/x86_64/pmm-client-{{ client_version }}-7.el9.x86_64.rpm &&
-        rpm -i /pmm-client.rpm
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      wget -O /pmm-client.rpm https://repo.percona.com/pmm3-client/yum/release/9/RPMS/x86_64/pmm-client-{{ client_version }}-7.el9.x86_64.rpm &&
+      rpm -i /pmm-client.rpm
+    '
   when:
     - distro_family == 'rhel'
     - client_version is match('^3\\.[0-9]+\\.[0-9]+$')
 
 - name: Install tarball PMM client version
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
-      sh -c '
-        wget -O /pmm-client.tar.gz "{{ client_version }}" &&
-        tar -zxpf /pmm-client.tar.gz &&
-        PMM_CLIENT=`ls -1td pmm-client* 2>/dev/null | grep -v ".tar" | grep -v ".sh" | head -n1` &&
-        echo ${PMM_CLIENT} &&
-        rm -rf pmm-client &&
-        mv ${PMM_CLIENT} pmm-client &&
-        rm -rf /usr/local/bin/pmm-client &&
-        mv -f pmm-client /usr/local/bin &&
-        bash -x /usr/local/bin/pmm-client/install_tarball &&
-        ln -sf /usr/local/percona/pmm/bin/pmm-admin /usr/local/bin/pmm-admin &&
-        ln -sf /usr/local/percona/pmm/bin/pmm-agent /usr/local/bin/pmm-agent &&
-        pmm-admin --version
-      '
+  shell: |
+    docker exec --user root {{ container_name }} sh -c '
+      wget -O /pmm-client.tar.gz "{{ client_version }}" &&
+      tar -zxpf /pmm-client.tar.gz &&
+      PMM_CLIENT=`ls -1td pmm-client* 2>/dev/null | grep -v ".tar" | grep -v ".sh" | head -n1` &&
+      echo ${PMM_CLIENT} &&
+      rm -rf pmm-client &&
+      mv ${PMM_CLIENT} pmm-client &&
+      rm -rf /usr/local/bin/pmm-client &&
+      mv -f pmm-client /usr/local/bin &&
+      bash -x /usr/local/bin/pmm-client/install_tarball &&
+      ln -sf /usr/local/percona/pmm/bin/pmm-admin /usr/local/bin/pmm-admin &&
+      ln -sf /usr/local/percona/pmm/bin/pmm-agent /usr/local/bin/pmm-agent &&
+      pmm-admin --version
+    '
   when:
     - client_version | regex_search('^https?://.*\\.tar\\.gz$') is not none
 
 - name: Connect pmm client to pmm server using metrics mode
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address={{ pmm_server_ip }}:{{ pmm_server_port }} --server-insecure-tls --metrics-mode={{ metrics_mode }} --server-username=admin --server-password={{ admin_password }} {{ container_name }}
+  shell: |
+    docker exec --user root {{ container_name }} \
+      pmm-agent setup \
+        --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml \
+        --server-address={{ pmm_server_ip }}:{{ pmm_server_port }} \
+        --server-insecure-tls \
+        --metrics-mode={{ metrics_mode }} \
+        --server-username=admin \
+        --server-password={{ admin_password }} \
+        {{ container_name }}
   when: metrics_mode | length > 0
 
-- name: Connect pmm client to pmm server using metrics mode
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address={{ pmm_server_ip }}:{{ pmm_server_port }} --server-insecure-tls --server-username=admin --server-password={{ admin_password }} {{ container_name }}
+- name: Connect pmm client to pmm server using default metrics mode
+  shell: |
+    docker exec --user root {{ container_name }} \
+      pmm-agent setup \
+        --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml \
+        --server-address={{ pmm_server_ip }}:{{ pmm_server_port }} \
+        --server-insecure-tls \
+        --server-username=admin \
+        --server-password={{ admin_password }} \
+        {{ container_name }}
   when: metrics_mode | length == 0
 
 - name: Wait 5 seconds for connection to complete
@@ -251,10 +229,8 @@
     seconds: 5
 
 - name: Start pmm client
-  community.docker.docker_container_exec:
-    container: "{{ container_name }}"
-    user: "root"
-    command: >
+  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 &'
 
 - name: Wait 5 seconds for start to complete

From f47195c34a26aa57e41951044514a04c1b8048ae Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 3 Nov 2025 13:45:13 +0100
Subject: [PATCH 13/13] PMM-7: add new codeowner

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7aa5ac9a..b4768071 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 # Order is important; the last matching pattern takes the most precedence.
 
-*	@yurkovychv @puneet0191 @olexandr-havryliak @sandraromanchenko
+*	@yurkovychv @puneet0191 @olexandr-havryliak @sandraromanchenko @peterSirotnak