From a726c3b0173f5cead38ba130d1eb82f2a040293e Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 12:41:42 +0200
Subject: [PATCH 01/69] PMM-13276: Start pmm client container

---
 .../pmmClientDockerMultiArch_test.js          | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
new file mode 100644
index 000000000..773206bf2
--- /dev/null
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -0,0 +1,26 @@
+Feature('Test PMM client multi arch docker container').retry(1);
+
+BeforeSuite(async ({ I }) => {
+  const DOCKER_IMAGE = process.env.DOCKER_VERSION || 'perconalab/pmm-client-test:dev-latest';
+  const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
+
+  await I.verifyCommand(`docker run 
+          --rm \
+          --name pmm-client \
+          -e PMM_AGENT_SERVER_ADDRESS=pmm-server \
+          -e PMM_AGENT_SERVER_USERNAME=admin \
+          -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD} \
+          -e PMM_AGENT_SERVER_INSECURE_TLS=1 \
+          -e PMM_AGENT_SETUP=1 \
+          -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml \
+          --volumes-from pmm-client-data \
+          ${DOCKER_IMAGE}`);
+});
+
+Before(async ({ I }) => {
+  await I.Authorize();
+});
+
+Scenario('Verify that dashboards contain data @client-docker-multi-arch', async ({ I }) => {
+  I.say('Test');
+});

From e5eba605e0f6fc671889e18df3690585f5fb0c03 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 12:55:11 +0200
Subject: [PATCH 02/69] PMM-13276: Remove volume for pmm client

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 773206bf2..2892192fb 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -13,7 +13,6 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 \
           -e PMM_AGENT_SETUP=1 \
           -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml \
-          --volumes-from pmm-client-data \
           ${DOCKER_IMAGE}`);
 });
 

From bdbab99d3f3514c76e274fb363ad7f8cf31979a2 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 19:25:45 +0200
Subject: [PATCH 03/69] PMM-13276: add mysql and verify dashboard

---
 .../pmmClientDockerMultiArch_test.js          | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 2892192fb..af36c50ef 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -5,21 +5,34 @@ BeforeSuite(async ({ I }) => {
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
 
   await I.verifyCommand(`docker run 
-          --rm \
-          --name pmm-client \
-          -e PMM_AGENT_SERVER_ADDRESS=pmm-server \
-          -e PMM_AGENT_SERVER_USERNAME=admin \
-          -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD} \
-          -e PMM_AGENT_SERVER_INSECURE_TLS=1 \
-          -e PMM_AGENT_SETUP=1 \
-          -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml \
+          --rm 
+          --name pmm-client 
+          -e PMM_AGENT_SERVER_ADDRESS=pmm-server 
+          -e PMM_AGENT_SERVER_USERNAME=admin 
+          -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD} 
+          -e PMM_AGENT_SERVER_INSECURE_TLS=1 
+          -e PMM_AGENT_SETUP=1 
+          -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml 
+          -- network pmm-qa 
           ${DOCKER_IMAGE}`);
+
+  await I.verifyCommand(`docker run -d 
+           --name mysql-multiarch 
+           -- network pmm-qa 
+           -e MYSQL_ROOT_PASSWORD=testPassword 
+           mysql:8`);
+  await I.verifyCommand('docker exec pmm-client pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306');
 });
 
 Before(async ({ I }) => {
   await I.Authorize();
 });
 
-Scenario('Verify that dashboards contain data @client-docker-multi-arch', async ({ I }) => {
-  I.say('Test');
+Scenario('Verify that dashboards contain data @client-docker-multi-arch', async ({ I, dashboardPage }) => {
+  const url = I.buildUrlWithParams(dashboardPage.mysqlInstanceSummaryDashboard.clearUrl, { from: 'now-5m' });
+
+  I.amOnPage(url);
+  dashboardPage.waitForDashboardOpened();
+  await dashboardPage.verifyThereAreNoGraphsWithNA(1);
+  await dashboardPage.verifyThereAreNoGraphsWithoutData(5);
 });

From 9570831293e40501166b2419c93bb5ab5e619a63 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 19:33:42 +0200
Subject: [PATCH 04/69] PMM-13276: Fix typo

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index af36c50ef..8a447de1a 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -13,7 +13,7 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 
           -e PMM_AGENT_SETUP=1 
           -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml 
-          -- network pmm-qa 
+          --network pmm-qa 
           ${DOCKER_IMAGE}`);
 
   await I.verifyCommand(`docker run -d 

From a0658a7f86e33dda2dd1c3a8456a0a3405b705c6 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 19:41:17 +0200
Subject: [PATCH 05/69] PMM-13276: Create network

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 8a447de1a..5379e15c1 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -3,6 +3,9 @@ Feature('Test PMM client multi arch docker container').retry(1);
 BeforeSuite(async ({ I }) => {
   const DOCKER_IMAGE = process.env.DOCKER_VERSION || 'perconalab/pmm-client-test:dev-latest';
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
+  const networkName = 'pmm-ui-tests-network';
+
+  await I.verifyCommand(`'docker create network -d bridge ${networkName}`);
 
   await I.verifyCommand(`docker run 
           --rm 
@@ -13,12 +16,12 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 
           -e PMM_AGENT_SETUP=1 
           -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml 
-          --network pmm-qa 
+          --network ${networkName} 
           ${DOCKER_IMAGE}`);
 
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 
-           -- network pmm-qa 
+           --network ${networkName}  
            -e MYSQL_ROOT_PASSWORD=testPassword 
            mysql:8`);
   await I.verifyCommand('docker exec pmm-client pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306');

From 776aefedbeeef4708d453ef7c969ead0acb92001 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 22:06:40 +0200
Subject: [PATCH 06/69] PMM-13276: Fixtypo

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 5379e15c1..e88365bc0 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -5,7 +5,7 @@ BeforeSuite(async ({ I }) => {
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
   const networkName = 'pmm-ui-tests-network';
 
-  await I.verifyCommand(`'docker create network -d bridge ${networkName}`);
+  await I.verifyCommand(`docker create network -d bridge ${networkName}`);
 
   await I.verifyCommand(`docker run 
           --rm 

From af634ff2e11826614196676df2f1ad59bccbd6ef Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 22:12:38 +0200
Subject: [PATCH 07/69] PMM-13276: Fixtypo

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index e88365bc0..cb751561c 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -5,7 +5,7 @@ BeforeSuite(async ({ I }) => {
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
   const networkName = 'pmm-ui-tests-network';
 
-  await I.verifyCommand(`docker create network -d bridge ${networkName}`);
+  await I.verifyCommand(`docker network create -d bridge ${networkName}`);
 
   await I.verifyCommand(`docker run 
           --rm 

From 0543fd8a2792971f5c5131af220b9f3a94f38ecc Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 22:39:23 +0200
Subject: [PATCH 08/69] PMM-13276: run container detached

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index cb751561c..94c9aa89e 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -7,7 +7,7 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker network create -d bridge ${networkName}`);
 
-  await I.verifyCommand(`docker run 
+  await I.verifyCommand(`docker run -d 
           --rm 
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=pmm-server 

From d20168d1b22c5f493f732fb52fe911ecb364b1ad Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 22:45:14 +0200
Subject: [PATCH 09/69] PMM-13276: echo running containers

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 94c9aa89e..7f9934fd9 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -7,6 +7,8 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker network create -d bridge ${networkName}`);
 
+  console.log(I.verifyCommand('docker ps -a'));
+
   await I.verifyCommand(`docker run -d 
           --rm 
           --name pmm-client 

From 4359246755dce6b2a8d380140c08bcb9e5de1aa3 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 22:52:16 +0200
Subject: [PATCH 10/69] PMM-13276: Fix async method

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 7f9934fd9..724b21335 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -7,7 +7,7 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker network create -d bridge ${networkName}`);
 
-  console.log(I.verifyCommand('docker ps -a'));
+  console.log(await I.verifyCommand('docker ps -a'));
 
   await I.verifyCommand(`docker run -d 
           --rm 

From da192c8b0809981fcf9f0d4bbe748b448a1cf529 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 23:01:26 +0200
Subject: [PATCH 11/69] PMM-13276: debug commands

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 724b21335..1c1d44c83 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -7,8 +7,6 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker network create -d bridge ${networkName}`);
 
-  console.log(await I.verifyCommand('docker ps -a'));
-
   await I.verifyCommand(`docker run -d 
           --rm 
           --name pmm-client 
@@ -20,6 +18,11 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml 
           --network ${networkName} 
           ${DOCKER_IMAGE}`);
+  await I.wait(10);
+
+  console.log(await I.verifyCommand('docker ps -a'));
+  console.log(await I.verifyCommand('docker exec pmm-client pmm-agent status'));
+  console.log(await I.verifyCommand('docker exec pmm-client pmm-admin list'));
 
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 

From 349c7f7014ee742f53745158ee3b09f80a54d12b Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 23:03:20 +0200
Subject: [PATCH 12/69] PMM-13276: Change network type

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 1c1d44c83..467492b95 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -5,7 +5,7 @@ BeforeSuite(async ({ I }) => {
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
   const networkName = 'pmm-ui-tests-network';
 
-  await I.verifyCommand(`docker network create -d bridge ${networkName}`);
+  await I.verifyCommand(`docker network create ${networkName}`);
 
   await I.verifyCommand(`docker run -d 
           --rm 

From 06e5c740a10451e14f40747afa4719275dae306a Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 23:08:36 +0200
Subject: [PATCH 13/69] PMM-13276: fix container tag

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 467492b95..d86301537 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -1,7 +1,8 @@
 Feature('Test PMM client multi arch docker container').retry(1);
 
 BeforeSuite(async ({ I }) => {
-  const DOCKER_IMAGE = process.env.DOCKER_VERSION || 'perconalab/pmm-client-test:dev-latest';
+  // eslint-disable-next-line no-inline-comments
+  const DOCKER_IMAGE = /* process.env.CLIENT_VERSION || */ 'perconalab/pmm-client-test:dev-latest';
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
   const networkName = 'pmm-ui-tests-network';
 

From 5fdd824b66775735dd60f29b6a9b5e93493c27a5 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 23:18:25 +0200
Subject: [PATCH 14/69] PMM-13276: Debug command

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index d86301537..127a6ad29 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -8,7 +8,8 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker network create ${networkName}`);
 
-  await I.verifyCommand(`docker run -d 
+  console.log(`Image name is: ${DOCKER_IMAGE}`);
+  console.log(await I.verifyCommand(`docker run -d 
           --rm 
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=pmm-server 
@@ -18,7 +19,7 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_SETUP=1 
           -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml 
           --network ${networkName} 
-          ${DOCKER_IMAGE}`);
+          ${DOCKER_IMAGE}`));
   await I.wait(10);
 
   console.log(await I.verifyCommand('docker ps -a'));

From f44cae0cc0bdb304ab13f76e5932bea4c32186f3 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 23:30:25 +0200
Subject: [PATCH 15/69] PMM-13276: Debug command

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 127a6ad29..3375edc69 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -10,7 +10,6 @@ BeforeSuite(async ({ I }) => {
 
   console.log(`Image name is: ${DOCKER_IMAGE}`);
   console.log(await I.verifyCommand(`docker run -d 
-          --rm 
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=pmm-server 
           -e PMM_AGENT_SERVER_USERNAME=admin 

From 16d3241d26c1a383565135d2b4efa77316f3d0c2 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 23:38:10 +0200
Subject: [PATCH 16/69] PMM-13276: Debug command

---
 .../dockerConfiguration/pmmClientDockerMultiArch_test.js  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 3375edc69..063721b4b 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -15,12 +15,18 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD} 
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 
+          -e PMM_AGENT_PORTS_MIN=41000
+          -e PMM_AGENT_PORTS_MAX=41500
           -e PMM_AGENT_SETUP=1 
           -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml 
+          -e PMM_AGENT_SETUP_NODE_NAME=pmm-client
+          -e PMM_AGENT_SETUP_FORCE=1
+          -e PMM_AGENT_SETUP_NODE_TYPE=container
           --network ${networkName} 
           ${DOCKER_IMAGE}`));
-  await I.wait(10);
+  I.wait(10);
 
+  console.log(await I.verifyCommand('docker logs pmm-client'));
   console.log(await I.verifyCommand('docker ps -a'));
   console.log(await I.verifyCommand('docker exec pmm-client pmm-agent status'));
   console.log(await I.verifyCommand('docker exec pmm-client pmm-admin list'));

From 714109ca057757fef83b4523ffc12166fb4e30bc Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Mon, 29 Jul 2024 23:44:07 +0200
Subject: [PATCH 17/69] PMM-13276: Debug command

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 063721b4b..513b0d4f4 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -11,7 +11,7 @@ BeforeSuite(async ({ I }) => {
   console.log(`Image name is: ${DOCKER_IMAGE}`);
   console.log(await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=pmm-server 
+          -e PMM_AGENT_SERVER_ADDRESS=127.0.0.1 
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD} 
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 

From 58962b4e39d426538d991cb7077a0f2f5c751039 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 30 Jul 2024 08:50:49 +0200
Subject: [PATCH 18/69] PMM-13276: Test different password

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 513b0d4f4..654285c90 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -13,7 +13,7 @@ BeforeSuite(async ({ I }) => {
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=127.0.0.1 
           -e PMM_AGENT_SERVER_USERNAME=admin 
-          -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD} 
+          -e PMM_AGENT_SERVER_PASSWORD=admin
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 
           -e PMM_AGENT_PORTS_MIN=41000
           -e PMM_AGENT_PORTS_MAX=41500

From 40e17993ed648743a57a395cee24a7cc289ea4f3 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 30 Jul 2024 09:01:41 +0200
Subject: [PATCH 19/69] PMM-13276: Connect pmm server to network

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 654285c90..d4b81d662 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -7,13 +7,15 @@ BeforeSuite(async ({ I }) => {
   const networkName = 'pmm-ui-tests-network';
 
   await I.verifyCommand(`docker network create ${networkName}`);
+  await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
+  I.wait(30);
 
   console.log(`Image name is: ${DOCKER_IMAGE}`);
   console.log(await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=127.0.0.1 
+          -e PMM_AGENT_SERVER_ADDRESS=pmm-server
           -e PMM_AGENT_SERVER_USERNAME=admin 
-          -e PMM_AGENT_SERVER_PASSWORD=admin
+          -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 
           -e PMM_AGENT_PORTS_MIN=41000
           -e PMM_AGENT_PORTS_MAX=41500

From c380f9a01b3b84e9fa53e489d93571b1a5f92615 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 30 Jul 2024 09:09:14 +0200
Subject: [PATCH 20/69] PMM-13276: config pmm agent

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index d4b81d662..85f506891 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -20,13 +20,14 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_PORTS_MIN=41000
           -e PMM_AGENT_PORTS_MAX=41500
           -e PMM_AGENT_SETUP=1 
-          -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml 
+          -e PMM_AGENT_CONFIG_FILE=/usr/local/percona/pmm2/config/pmm-agent.yaml 
           -e PMM_AGENT_SETUP_NODE_NAME=pmm-client
           -e PMM_AGENT_SETUP_FORCE=1
           -e PMM_AGENT_SETUP_NODE_TYPE=container
           --network ${networkName} 
           ${DOCKER_IMAGE}`));
   I.wait(10);
+  await I.verifyCommand('docker exec pmm-client pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml');
 
   console.log(await I.verifyCommand('docker logs pmm-client'));
   console.log(await I.verifyCommand('docker ps -a'));

From 17ed956330e7206781476a84b75e12d2f7c41bc4 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 30 Jul 2024 09:17:51 +0200
Subject: [PATCH 21/69] PMM-13276: Skip config command

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 85f506891..fe7ba81fd 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -27,7 +27,7 @@ BeforeSuite(async ({ I }) => {
           --network ${networkName} 
           ${DOCKER_IMAGE}`));
   I.wait(10);
-  await I.verifyCommand('docker exec pmm-client pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml');
+  // await I.verifyCommand('docker exec pmm-client pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml');
 
   console.log(await I.verifyCommand('docker logs pmm-client'));
   console.log(await I.verifyCommand('docker ps -a'));

From 48dfcb4eb258a0fb00f2a71a2bfba34ee6e588fe Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 30 Jul 2024 09:24:26 +0200
Subject: [PATCH 22/69] PMM-13276: add config command with correct status

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index fe7ba81fd..ca67726bd 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -20,14 +20,14 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_PORTS_MIN=41000
           -e PMM_AGENT_PORTS_MAX=41500
           -e PMM_AGENT_SETUP=1 
-          -e PMM_AGENT_CONFIG_FILE=/usr/local/percona/pmm2/config/pmm-agent.yaml 
+          -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml 
           -e PMM_AGENT_SETUP_NODE_NAME=pmm-client
           -e PMM_AGENT_SETUP_FORCE=1
           -e PMM_AGENT_SETUP_NODE_TYPE=container
           --network ${networkName} 
           ${DOCKER_IMAGE}`));
   I.wait(10);
-  // await I.verifyCommand('docker exec pmm-client pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml');
+  await I.verifyCommand('docker exec pmm-client pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml', null, 'fail');
 
   console.log(await I.verifyCommand('docker logs pmm-client'));
   console.log(await I.verifyCommand('docker ps -a'));

From 2c832ddb2fc8a1b0c2ed2c4134f2db1b7aa99bfc Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 30 Jul 2024 09:33:41 +0200
Subject: [PATCH 23/69] PMM-13276: Log config

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index ca67726bd..1001afcfa 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -27,7 +27,7 @@ BeforeSuite(async ({ I }) => {
           --network ${networkName} 
           ${DOCKER_IMAGE}`));
   I.wait(10);
-  await I.verifyCommand('docker exec pmm-client pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml', null, 'fail');
+  console.log(await I.verifyCommand('docker exec pmm-client pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml', null, 'fail', true));
 
   console.log(await I.verifyCommand('docker logs pmm-client'));
   console.log(await I.verifyCommand('docker ps -a'));

From 11414c1ce05be6bb1a1fddd535660de4c2bde5e3 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 30 Jul 2024 10:05:41 +0200
Subject: [PATCH 24/69] PMM-13276: force config

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 1001afcfa..06d427033 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -10,8 +10,7 @@ BeforeSuite(async ({ I }) => {
   await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
   I.wait(30);
 
-  console.log(`Image name is: ${DOCKER_IMAGE}`);
-  console.log(await I.verifyCommand(`docker run -d 
+  await I.verifyCommand(`docker run -d 
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=pmm-server
           -e PMM_AGENT_SERVER_USERNAME=admin 
@@ -25,9 +24,9 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_SETUP_FORCE=1
           -e PMM_AGENT_SETUP_NODE_TYPE=container
           --network ${networkName} 
-          ${DOCKER_IMAGE}`));
+          ${DOCKER_IMAGE}`);
   I.wait(10);
-  console.log(await I.verifyCommand('docker exec pmm-client pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml', null, 'fail', true));
+  console.log(await I.verifyCommand(`docker exec pmm-client pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true));
 
   console.log(await I.verifyCommand('docker logs pmm-client'));
   console.log(await I.verifyCommand('docker ps -a'));

From debdf710436c110e3fd5c00ebb5b6cd506be33a9 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 30 Jul 2024 10:36:55 +0200
Subject: [PATCH 25/69] PMM-13276: remove status command

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 06d427033..757279851 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -30,7 +30,7 @@ BeforeSuite(async ({ I }) => {
 
   console.log(await I.verifyCommand('docker logs pmm-client'));
   console.log(await I.verifyCommand('docker ps -a'));
-  console.log(await I.verifyCommand('docker exec pmm-client pmm-agent status'));
+  // console.log(await I.verifyCommand('docker exec pmm-client pmm-agent status'));
   console.log(await I.verifyCommand('docker exec pmm-client pmm-admin list'));
 
   await I.verifyCommand(`docker run -d 

From 7b78470aa8102c46c236dd9843ea47ee1b568d34 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 30 Jul 2024 11:35:59 +0200
Subject: [PATCH 26/69] PMM-13276: Wait for mysql to start

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 757279851..0d544ca7f 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -38,6 +38,7 @@ BeforeSuite(async ({ I }) => {
            --network ${networkName}  
            -e MYSQL_ROOT_PASSWORD=testPassword 
            mysql:8`);
+  I.wait(30);
   await I.verifyCommand('docker exec pmm-client pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306');
 });
 

From 66e626949a2c36ee56af95daff24358edcab89ab Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 08:33:09 +0200
Subject: [PATCH 27/69] PMM-13276: Test screenshot

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 0d544ca7f..19cee71d8 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -53,4 +53,5 @@ Scenario('Verify that dashboards contain data @client-docker-multi-arch', async
   dashboardPage.waitForDashboardOpened();
   await dashboardPage.verifyThereAreNoGraphsWithNA(1);
   await dashboardPage.verifyThereAreNoGraphsWithoutData(5);
+  await dashboardPage.verifyThereAreNoGraphsWithoutData();
 });

From 35eab0f75bd980a51f79ee2016a015ddfba5b331 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 08:41:23 +0200
Subject: [PATCH 28/69] PMM-13276: Test screenshot

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 19cee71d8..979df796b 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -53,5 +53,7 @@ Scenario('Verify that dashboards contain data @client-docker-multi-arch', async
   dashboardPage.waitForDashboardOpened();
   await dashboardPage.verifyThereAreNoGraphsWithNA(1);
   await dashboardPage.verifyThereAreNoGraphsWithoutData(5);
+  await dashboardPage.verifyThereAreNoGraphsWithNA();
   await dashboardPage.verifyThereAreNoGraphsWithoutData();
+  I.saveScreenshot();
 });

From 6b644c55c866fb41b39aab9be578930878a636a1 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 08:48:49 +0200
Subject: [PATCH 29/69] PMM-13276: Refactor tests

---
 .../pmmClientDockerMultiArch_test.js                 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 979df796b..18a822783 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -26,12 +26,9 @@ BeforeSuite(async ({ I }) => {
           --network ${networkName} 
           ${DOCKER_IMAGE}`);
   I.wait(10);
-  console.log(await I.verifyCommand(`docker exec pmm-client pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true));
+  await I.verifyCommand(`docker exec pmm-client pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
 
-  console.log(await I.verifyCommand('docker logs pmm-client'));
   console.log(await I.verifyCommand('docker ps -a'));
-  // console.log(await I.verifyCommand('docker exec pmm-client pmm-agent status'));
-  console.log(await I.verifyCommand('docker exec pmm-client pmm-admin list'));
 
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 
@@ -40,17 +37,22 @@ BeforeSuite(async ({ I }) => {
            mysql:8`);
   I.wait(30);
   await I.verifyCommand('docker exec pmm-client pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306');
+  I.wait(10);
+  console.log(await I.verifyCommand('docker exec pmm-client pmm-admin list'));
 });
 
 Before(async ({ I }) => {
   await I.Authorize();
 });
 
-Scenario('Verify that dashboards contain data @client-docker-multi-arch', async ({ I, dashboardPage }) => {
+Scenario('Verify that dashboards contain data @client-docker-multi-arch', async ({ I, dashboardPage, adminPage }) => {
   const url = I.buildUrlWithParams(dashboardPage.mysqlInstanceSummaryDashboard.clearUrl, { from: 'now-5m' });
 
   I.amOnPage(url);
   dashboardPage.waitForDashboardOpened();
+  adminPage.performPageDown(5);
+  await dashboardPage.expandEachDashboardRow();
+  adminPage.performPageUp(5);
   await dashboardPage.verifyThereAreNoGraphsWithNA(1);
   await dashboardPage.verifyThereAreNoGraphsWithoutData(5);
   await dashboardPage.verifyThereAreNoGraphsWithNA();

From bd10bc0a134db5116254b29074798907528f51bf Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 09:01:37 +0200
Subject: [PATCH 30/69] PMM-13276: change count of expected elements without
 data.

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 18a822783..af41d285f 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -54,8 +54,6 @@ Scenario('Verify that dashboards contain data @client-docker-multi-arch', async
   await dashboardPage.expandEachDashboardRow();
   adminPage.performPageUp(5);
   await dashboardPage.verifyThereAreNoGraphsWithNA(1);
-  await dashboardPage.verifyThereAreNoGraphsWithoutData(5);
-  await dashboardPage.verifyThereAreNoGraphsWithNA();
   await dashboardPage.verifyThereAreNoGraphsWithoutData();
   I.saveScreenshot();
 });

From 408944accd27c67349c046dc442a8af7ee7c20bb Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 09:10:02 +0200
Subject: [PATCH 31/69] PMM-13276: change count of expected elements without
 data.

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index af41d285f..f592cb347 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -53,7 +53,7 @@ Scenario('Verify that dashboards contain data @client-docker-multi-arch', async
   adminPage.performPageDown(5);
   await dashboardPage.expandEachDashboardRow();
   adminPage.performPageUp(5);
-  await dashboardPage.verifyThereAreNoGraphsWithNA(1);
+  await dashboardPage.verifyThereAreNoGraphsWithNA(4);
   await dashboardPage.verifyThereAreNoGraphsWithoutData();
   I.saveScreenshot();
 });

From cb16c36104a0ad406640772ce3ddd135f4d4a042 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 09:19:50 +0200
Subject: [PATCH 32/69] PMM-13276: change count of expected elements without
 data.

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index f592cb347..32014bcda 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -50,10 +50,8 @@ Scenario('Verify that dashboards contain data @client-docker-multi-arch', async
 
   I.amOnPage(url);
   dashboardPage.waitForDashboardOpened();
-  adminPage.performPageDown(5);
   await dashboardPage.expandEachDashboardRow();
-  adminPage.performPageUp(5);
   await dashboardPage.verifyThereAreNoGraphsWithNA(4);
-  await dashboardPage.verifyThereAreNoGraphsWithoutData();
+  await dashboardPage.verifyThereAreNoGraphsWithoutData(5);
   I.saveScreenshot();
 });

From 5bd5b039bc5ed09d6d10c7b1384d967ed676361c Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 09:26:51 +0200
Subject: [PATCH 33/69] PMM-13276: change count of expected elements without
 data.

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 32014bcda..f76764a7e 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -53,5 +53,4 @@ Scenario('Verify that dashboards contain data @client-docker-multi-arch', async
   await dashboardPage.expandEachDashboardRow();
   await dashboardPage.verifyThereAreNoGraphsWithNA(4);
   await dashboardPage.verifyThereAreNoGraphsWithoutData(5);
-  I.saveScreenshot();
 });

From 19d2b17d737662a6f66953a554a52739428abfe1 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 09:35:07 +0200
Subject: [PATCH 34/69] PMM-13276: Refactors testcase

---
 .../dockerConfiguration/pmmClientDockerMultiArch_test.js  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index f76764a7e..2d2c784ff 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -8,7 +8,7 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker network create ${networkName}`);
   await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
-  I.wait(30);
+  // I.wait(30);
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
@@ -28,17 +28,13 @@ BeforeSuite(async ({ I }) => {
   I.wait(10);
   await I.verifyCommand(`docker exec pmm-client pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
 
-  console.log(await I.verifyCommand('docker ps -a'));
-
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 
            --network ${networkName}  
            -e MYSQL_ROOT_PASSWORD=testPassword 
            mysql:8`);
-  I.wait(30);
+  // I.wait(30);
   await I.verifyCommand('docker exec pmm-client pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306');
-  I.wait(10);
-  console.log(await I.verifyCommand('docker exec pmm-client pmm-admin list'));
 });
 
 Before(async ({ I }) => {

From 491e68efded1f45b825c7373ccca43345a0a7597 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 09:40:58 +0200
Subject: [PATCH 35/69] PMM-13276: Refactors testcase

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 2d2c784ff..7af2a7c72 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -33,7 +33,7 @@ BeforeSuite(async ({ I }) => {
            --network ${networkName}  
            -e MYSQL_ROOT_PASSWORD=testPassword 
            mysql:8`);
-  // I.wait(30);
+  I.wait(15);
   await I.verifyCommand('docker exec pmm-client pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306');
 });
 

From de98cc03dda42ed62405565c782490a91c5f207c Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 15:28:50 +0200
Subject: [PATCH 36/69] PMM-13276: logs server IP address

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 7af2a7c72..95cd326a2 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -10,6 +10,8 @@ BeforeSuite(async ({ I }) => {
   await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
   // I.wait(30);
 
+  console.log(`Ip address is: ${process.env.SERVER_IP}`);
+
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=pmm-server

From 4eca0a8750fa2a71a7981bf987d919845c22e6f1 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 15:44:17 +0200
Subject: [PATCH 37/69] PMM-13276: logs server IP address

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 95cd326a2..784f74d6d 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -6,11 +6,13 @@ BeforeSuite(async ({ I }) => {
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
   const networkName = 'pmm-ui-tests-network';
 
+  console.log(`Ip address is: ${process.env.SERVER_IP}`);
+
   await I.verifyCommand(`docker network create ${networkName}`);
   await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
   // I.wait(30);
 
-  console.log(`Ip address is: ${process.env.SERVER_IP}`);
+
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 

From 97be2953885969d2a79ef5eae7865f3d89d64c86 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 15:45:23 +0200
Subject: [PATCH 38/69] PMM-13276: logs server IP address

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 784f74d6d..53a5fd3ad 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -7,6 +7,7 @@ BeforeSuite(async ({ I }) => {
   const networkName = 'pmm-ui-tests-network';
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
+  console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
 
   await I.verifyCommand(`docker network create ${networkName}`);
   await I.verifyCommand(`docker network connect ${networkName} pmm-server`);

From 5e0c3c798170553ffb63a230158195fc40c78f72 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 15:59:49 +0200
Subject: [PATCH 39/69] PMM-13276: Fix pmm server address for client

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 53a5fd3ad..b2932ffc7 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -17,7 +17,7 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=pmm-server
+          -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 

From 5938ad43bd17e7c97f1060f91bf3a0810711d65d Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 31 Jul 2024 16:00:12 +0200
Subject: [PATCH 40/69] PMM-13276: Skip connecting pmm server to network

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index b2932ffc7..f587ccf4f 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -10,11 +10,9 @@ BeforeSuite(async ({ I }) => {
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
 
   await I.verifyCommand(`docker network create ${networkName}`);
-  await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
+  // await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
   // I.wait(30);
 
-
-
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}

From 91198e54729ba3d04741a3cfdb63f44082fa7238 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 11:34:31 +0200
Subject: [PATCH 41/69] PMM-13276: Logs for pmm client.

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index f587ccf4f..248f598cb 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -37,6 +37,7 @@ BeforeSuite(async ({ I }) => {
            -e MYSQL_ROOT_PASSWORD=testPassword 
            mysql:8`);
   I.wait(15);
+  console.log(await I.verifyCommand('docker logs pmm-client'));
   await I.verifyCommand('docker exec pmm-client pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306');
 });
 

From 1f6d655f361b9ab930d1232ee4149deaa1898201 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 11:41:54 +0200
Subject: [PATCH 42/69] PMM-13276: Test different password

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 248f598cb..c2dd74134 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -17,7 +17,7 @@ BeforeSuite(async ({ I }) => {
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}
           -e PMM_AGENT_SERVER_USERNAME=admin 
-          -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
+          -e PMM_AGENT_SERVER_PASSWORD=admin
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 
           -e PMM_AGENT_PORTS_MIN=41000
           -e PMM_AGENT_PORTS_MAX=41500

From cba932b92a01ca83aa7b03297ca77f7e41d8e5ea Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 11:51:05 +0200
Subject: [PATCH 43/69] PMM-13276: log architecture

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index c2dd74134..026a6845d 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -8,6 +8,7 @@ BeforeSuite(async ({ I }) => {
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
+  console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
 
   await I.verifyCommand(`docker network create ${networkName}`);
   // await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
@@ -17,7 +18,7 @@ BeforeSuite(async ({ I }) => {
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}
           -e PMM_AGENT_SERVER_USERNAME=admin 
-          -e PMM_AGENT_SERVER_PASSWORD=admin
+          -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 
           -e PMM_AGENT_PORTS_MIN=41000
           -e PMM_AGENT_PORTS_MAX=41500

From 1d000388acf4c9990f6f4ad437dea9bdcd7f68db Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 11:58:32 +0200
Subject: [PATCH 44/69] PMM-13276: change node name

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 026a6845d..f5c7cb6a9 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -24,7 +24,7 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_PORTS_MAX=41500
           -e PMM_AGENT_SETUP=1 
           -e PMM_AGENT_CONFIG_FILE=config/pmm-agent.yaml 
-          -e PMM_AGENT_SETUP_NODE_NAME=pmm-client
+          -e PMM_AGENT_SETUP_NODE_NAME=pmm-client-${process.env.ARCHITECTURE}
           -e PMM_AGENT_SETUP_FORCE=1
           -e PMM_AGENT_SETUP_NODE_TYPE=container
           --network ${networkName} 

From 59464cc1ed640e78ff05488534eae571d2668f52 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 12:11:39 +0200
Subject: [PATCH 45/69] PMM-13276: change node name

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index f5c7cb6a9..aa9e3e913 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -30,7 +30,7 @@ BeforeSuite(async ({ I }) => {
           --network ${networkName} 
           ${DOCKER_IMAGE}`);
   I.wait(10);
-  await I.verifyCommand(`docker exec pmm-client pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
+  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
 
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 

From 1428d165d084eefa9ef778933437b4c88e26956d Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 12:17:42 +0200
Subject: [PATCH 46/69] PMM-13276: do not connect to the server

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index aa9e3e913..741124680 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -30,7 +30,7 @@ BeforeSuite(async ({ I }) => {
           --network ${networkName} 
           ${DOCKER_IMAGE}`);
   I.wait(10);
-  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
+  // await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
 
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 

From 8c97f828c8df6af80163b089424b56a75fd4d86c Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 12:24:18 +0200
Subject: [PATCH 47/69] PMM-13276: test different pmm server address

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 741124680..d290b61d5 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -16,7 +16,7 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}
+          -e PMM_AGENT_SERVER_ADDRESS=pmm-server
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 

From bb792690ac34d6492ec42671211aeadd9e2b1fad Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 12:35:38 +0200
Subject: [PATCH 48/69] PMM-13276: log running containers

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index d290b61d5..6e07a365c 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -9,6 +9,7 @@ BeforeSuite(async ({ I }) => {
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
+  console.log('docker ps -a');
 
   await I.verifyCommand(`docker network create ${networkName}`);
   // await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
@@ -16,7 +17,7 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=pmm-server
+          -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 

From 257ee59d08ebb4e5220f5f6c54dd9f97586385c0 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 13:01:29 +0200
Subject: [PATCH 49/69] PMM-13276: log running containers

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 6e07a365c..54cc9ba97 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -9,7 +9,7 @@ BeforeSuite(async ({ I }) => {
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
-  console.log('docker ps -a');
+  console.log(await I.verifyCommand('docker ps -a'));
 
   await I.verifyCommand(`docker network create ${networkName}`);
   // await I.verifyCommand(`docker network connect ${networkName} pmm-server`);

From 6a8003633c4ee0b0c652d9cab6309b1e7f99a5a0 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 13:10:29 +0200
Subject: [PATCH 50/69] PMM-13276: change network

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 54cc9ba97..58ce76a35 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -4,20 +4,20 @@ BeforeSuite(async ({ I }) => {
   // eslint-disable-next-line no-inline-comments
   const DOCKER_IMAGE = /* process.env.CLIENT_VERSION || */ 'perconalab/pmm-client-test:dev-latest';
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
-  const networkName = 'pmm-ui-tests-network';
+  const networkName = 'pmm-network';
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
   console.log(await I.verifyCommand('docker ps -a'));
 
-  await I.verifyCommand(`docker network create ${networkName}`);
+  await I.verifyCommand(`docker network create ${networkName} || true`);
   // await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
   // I.wait(30);
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}
+          -e PMM_AGENT_SERVER_ADDRESS=pmm-server
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 

From 737ac0c85a0f0874984150985aa3f608c0805c04 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 13:23:19 +0200
Subject: [PATCH 51/69] PMM-13276: change network

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 58ce76a35..27a3c8f0b 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -13,11 +13,11 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker network create ${networkName} || true`);
   // await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
-  // I.wait(30);
+  I.wait(60);
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=pmm-server
+          -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 

From fa85dfacb1296aad7010257a583fb9fadfced6b0 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 13:38:29 +0200
Subject: [PATCH 52/69] PMM-13276: refactors

---
 .../dockerConfiguration/pmmClientDockerMultiArch_test.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 27a3c8f0b..f58216df2 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -4,16 +4,17 @@ BeforeSuite(async ({ I }) => {
   // eslint-disable-next-line no-inline-comments
   const DOCKER_IMAGE = /* process.env.CLIENT_VERSION || */ 'perconalab/pmm-client-test:dev-latest';
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
-  const networkName = 'pmm-network';
+  const networkName = 'pmm-ui-tests-network';
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
+  console.log(`Server Password is: ${SERVER_PASSWORD}`);
   console.log(await I.verifyCommand('docker ps -a'));
 
-  await I.verifyCommand(`docker network create ${networkName} || true`);
+  await I.verifyCommand(`docker network create ${networkName}`);
   // await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
-  I.wait(60);
+  // I.wait(60);
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
@@ -31,7 +32,7 @@ BeforeSuite(async ({ I }) => {
           --network ${networkName} 
           ${DOCKER_IMAGE}`);
   I.wait(10);
-  // await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
+  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
 
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 

From add84e586400b0ab0890ccc3d1b7b175a579907e Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 13:55:10 +0200
Subject: [PATCH 53/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index f58216df2..ba96c899f 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -7,6 +7,7 @@ BeforeSuite(async ({ I }) => {
   const networkName = 'pmm-ui-tests-network';
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
+  console.log(`Ip address is: ${process.env.IP}`);
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
   console.log(`Server Password is: ${SERVER_PASSWORD}`);

From 36cccf1176e0833e461456d10e99fe3b953cbdf1 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:01:28 +0200
Subject: [PATCH 54/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index ba96c899f..08fc8d21d 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -7,7 +7,7 @@ BeforeSuite(async ({ I }) => {
   const networkName = 'pmm-ui-tests-network';
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
-  console.log(`Ip address is: ${process.env.IP}`);
+  console.log(`Ip address is: ${await I.verifyCommand('curl -s ifconfig.me')}`);
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
   console.log(`Server Password is: ${SERVER_PASSWORD}`);

From da6f254da675467b06d0db4a46f4ab4d52bc10fb Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:09:11 +0200
Subject: [PATCH 55/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 08fc8d21d..e3ab99e34 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -5,9 +5,10 @@ BeforeSuite(async ({ I }) => {
   const DOCKER_IMAGE = /* process.env.CLIENT_VERSION || */ 'perconalab/pmm-client-test:dev-latest';
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
   const networkName = 'pmm-ui-tests-network';
+  const pmmServerAddress = await I.verifyCommand('curl -s ifconfig.me');
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
-  console.log(`Ip address is: ${await I.verifyCommand('curl -s ifconfig.me')}`);
+  console.log(`Ip address is: ${pmmServerAddress}`);
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
   console.log(`Server Password is: ${SERVER_PASSWORD}`);
@@ -19,7 +20,7 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}
+          -e PMM_AGENT_SERVER_ADDRESS=${pmmServerAddress}
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 

From 93f03db665e27d85c6fd5c163355613b866c7468 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:18:33 +0200
Subject: [PATCH 56/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index e3ab99e34..364fb1365 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -5,13 +5,10 @@ BeforeSuite(async ({ I }) => {
   const DOCKER_IMAGE = /* process.env.CLIENT_VERSION || */ 'perconalab/pmm-client-test:dev-latest';
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
   const networkName = 'pmm-ui-tests-network';
-  const pmmServerAddress = await I.verifyCommand('curl -s ifconfig.me');
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
-  console.log(`Ip address is: ${pmmServerAddress}`);
   console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
-  console.log(`Server Password is: ${SERVER_PASSWORD}`);
   console.log(await I.verifyCommand('docker ps -a'));
 
   await I.verifyCommand(`docker network create ${networkName}`);
@@ -20,7 +17,7 @@ BeforeSuite(async ({ I }) => {
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=${pmmServerAddress}
+          -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}:443
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 

From e4e2f1146035e79770225e51fc9fdfe559643528 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:25:29 +0200
Subject: [PATCH 57/69] PMM-13276: Log IP

---
 .../dockerConfiguration/pmmClientDockerMultiArch_test.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 364fb1365..0e2dd9566 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -7,14 +7,9 @@ BeforeSuite(async ({ I }) => {
   const networkName = 'pmm-ui-tests-network';
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
-  console.log(`Ip address is: ${process.env.PMM_UI_URL}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
-  console.log(await I.verifyCommand('docker ps -a'));
 
   await I.verifyCommand(`docker network create ${networkName}`);
-  // await I.verifyCommand(`docker network connect ${networkName} pmm-server`);
-  // I.wait(60);
-
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}:443
@@ -30,14 +25,16 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_SETUP_NODE_TYPE=container
           --network ${networkName} 
           ${DOCKER_IMAGE}`);
+
   I.wait(10);
+  console.log(await I.verifyCommand('docker logs pmm-client'));
   await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
-
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 
            --network ${networkName}  
            -e MYSQL_ROOT_PASSWORD=testPassword 
            mysql:8`);
+
   I.wait(15);
   console.log(await I.verifyCommand('docker logs pmm-client'));
   await I.verifyCommand('docker exec pmm-client pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306');

From 000cc1d9c6ac68b54e9f2037ed90ef7bb10bf593 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:33:04 +0200
Subject: [PATCH 58/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 0e2dd9566..1ed80b5ab 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -8,7 +8,7 @@ BeforeSuite(async ({ I }) => {
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
-
+  console.log(await I.verifyCommand('docker network ls'));
   await I.verifyCommand(`docker network create ${networkName}`);
   await I.verifyCommand(`docker run -d 
           --name pmm-client 

From 3512523e956fbfc35a08886eacb3de90ce4e58a2 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:39:15 +0200
Subject: [PATCH 59/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 1ed80b5ab..8437c94ec 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -5,14 +5,15 @@ BeforeSuite(async ({ I }) => {
   const DOCKER_IMAGE = /* process.env.CLIENT_VERSION || */ 'perconalab/pmm-client-test:dev-latest';
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
   const networkName = 'pmm-ui-tests-network';
+  const pmmServerAddress = process.env.ARCHITECTURE === 'agent-amd64' ? 'pmm-server' : process.env.SERVER_IP;
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
-  console.log(await I.verifyCommand('docker network ls'));
+  console.log(await I.verifyCommand('docker network ls --format "{{ .Name }}'));
   await I.verifyCommand(`docker network create ${networkName}`);
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
-          -e PMM_AGENT_SERVER_ADDRESS=${process.env.SERVER_IP}:443
+          -e PMM_AGENT_SERVER_ADDRESS=${pmmServerAddress}
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 

From 3c2c73861f1af2b4aba5656ae4c2ada52f1c269c Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:40:18 +0200
Subject: [PATCH 60/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 8437c94ec..f720e94e6 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -4,13 +4,13 @@ BeforeSuite(async ({ I }) => {
   // eslint-disable-next-line no-inline-comments
   const DOCKER_IMAGE = /* process.env.CLIENT_VERSION || */ 'perconalab/pmm-client-test:dev-latest';
   const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
-  const networkName = 'pmm-ui-tests-network';
+  const networkName = 'pmm2-ui-tests_pmm-network';
   const pmmServerAddress = process.env.ARCHITECTURE === 'agent-amd64' ? 'pmm-server' : process.env.SERVER_IP;
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
   console.log(await I.verifyCommand('docker network ls --format "{{ .Name }}'));
-  await I.verifyCommand(`docker network create ${networkName}`);
+  // await I.verifyCommand(`docker network create ${networkName}`);
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=${pmmServerAddress}

From 2a7f7fd9cde012ed55912040a0fe8295bbc58722 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:44:49 +0200
Subject: [PATCH 61/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index f720e94e6..5045881e1 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -9,8 +9,8 @@ BeforeSuite(async ({ I }) => {
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
-  console.log(await I.verifyCommand('docker network ls --format "{{ .Name }}'));
-  // await I.verifyCommand(`docker network create ${networkName}`);
+  console.log(await I.verifyCommand('docker network ls --format "{{ .Names }}'));
+
   await I.verifyCommand(`docker run -d 
           --name pmm-client 
           -e PMM_AGENT_SERVER_ADDRESS=${pmmServerAddress}

From 3f7bc5831f35e61e5c9f10ff61ba572d406f915d Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:52:16 +0200
Subject: [PATCH 62/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 5045881e1..32e28e0c3 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -9,7 +9,7 @@ BeforeSuite(async ({ I }) => {
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
-  console.log(await I.verifyCommand('docker network ls --format "{{ .Names }}'));
+  console.log(await I.verifyCommand('docker network ls --format "{{ .Names }}"'));
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 

From 91193aa2e820f68310696cb3dadecdc2aeeb6933 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 14:58:51 +0200
Subject: [PATCH 63/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 32e28e0c3..4a4174fc8 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -9,7 +9,7 @@ BeforeSuite(async ({ I }) => {
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
-  console.log(await I.verifyCommand('docker network ls --format "{{ .Names }}"'));
+  console.log(await I.verifyCommand('docker network ls --format "{{ .Name }}"'));
 
   await I.verifyCommand(`docker run -d 
           --name pmm-client 

From 54637239196aa4e2fa4a1fbbd54b943cb79425d5 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 15:05:32 +0200
Subject: [PATCH 64/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 4a4174fc8..bcfa6e23c 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -29,7 +29,7 @@ BeforeSuite(async ({ I }) => {
 
   I.wait(10);
   console.log(await I.verifyCommand('docker logs pmm-client'));
-  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@pmm-server:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`, null, 'fail', true);
+  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@${pmmServerAddress}:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`);
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 
            --network ${networkName}  

From c9f56c3be6cf136fcd8f9489947f6693c9fe146f Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 15:13:40 +0200
Subject: [PATCH 65/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index bcfa6e23c..c8ac43b39 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -12,7 +12,7 @@ BeforeSuite(async ({ I }) => {
   console.log(await I.verifyCommand('docker network ls --format "{{ .Name }}"'));
 
   await I.verifyCommand(`docker run -d 
-          --name pmm-client 
+          --name pmm-client-${process.env.ARCHITECTURE}
           -e PMM_AGENT_SERVER_ADDRESS=${pmmServerAddress}
           -e PMM_AGENT_SERVER_USERNAME=admin 
           -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}

From 3bebaa2d5ab1cf30f93d7fa8231e3b5afcb483ad Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 15:21:06 +0200
Subject: [PATCH 66/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index c8ac43b39..e20f7ded5 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -9,6 +9,7 @@ BeforeSuite(async ({ I }) => {
 
   console.log(`Ip address is: ${process.env.SERVER_IP}`);
   console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
+  await I.verifyCommand(`docker network create ${networkName} || true`);
   console.log(await I.verifyCommand('docker network ls --format "{{ .Name }}"'));
 
   await I.verifyCommand(`docker run -d 
@@ -28,7 +29,7 @@ BeforeSuite(async ({ I }) => {
           ${DOCKER_IMAGE}`);
 
   I.wait(10);
-  console.log(await I.verifyCommand('docker logs pmm-client'));
+  console.log(await I.verifyCommand(`docker logs pmm-client-${process.env.ARCHITECTURE}`));
   await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@${pmmServerAddress}:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`);
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 
@@ -37,8 +38,8 @@ BeforeSuite(async ({ I }) => {
            mysql:8`);
 
   I.wait(15);
-  console.log(await I.verifyCommand('docker logs pmm-client'));
-  await I.verifyCommand('docker exec pmm-client pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306');
+  console.log(await I.verifyCommand(`docker logs pmm-client-${process.env.ARCHITECTURE}`));
+  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306`);
 });
 
 Before(async ({ I }) => {

From ab2e02fe586d40179e8fca5d3cca5a51886c59f0 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 14 Aug 2024 15:28:04 +0200
Subject: [PATCH 67/69] PMM-13276: Log IP

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index e20f7ded5..5e69a76de 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -30,7 +30,7 @@ BeforeSuite(async ({ I }) => {
 
   I.wait(10);
   console.log(await I.verifyCommand(`docker logs pmm-client-${process.env.ARCHITECTURE}`));
-  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent --force --server-insecure-tls --server-url=https://admin:${SERVER_PASSWORD}@${pmmServerAddress}:443 --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml`);
+  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent setup --force --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml --server-address=${pmmServerAddress}:443 --server-insecure-tls --server-username=admin --server-password=${SERVER_PASSWORD}`)
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 
            --network ${networkName}  

From a7bc16045ead059005d60a2fd1b4934eb2403df0 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Thu, 15 Aug 2024 08:42:53 +0200
Subject: [PATCH 68/69] PMM-13276: Refactor test

---
 .../pmmClientDockerMultiArch_test.js          | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 5e69a76de..792b742fa 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -1,22 +1,17 @@
 Feature('Test PMM client multi arch docker container').retry(1);
 
 BeforeSuite(async ({ I }) => {
-  // eslint-disable-next-line no-inline-comments
-  const DOCKER_IMAGE = /* process.env.CLIENT_VERSION || */ 'perconalab/pmm-client-test:dev-latest';
-  const SERVER_PASSWORD = process.env.ADMIN_PASSWORD || 'admin';
+  const pmmClientDockerTag = process.env.CLIENT_VERSION || 'perconalab/pmm-client-test:dev-latest';
+  const pmmServerAdminPassword = process.env.ADMIN_PASSWORD || 'admin';
   const networkName = 'pmm2-ui-tests_pmm-network';
   const pmmServerAddress = process.env.ARCHITECTURE === 'agent-amd64' ? 'pmm-server' : process.env.SERVER_IP;
 
-  console.log(`Ip address is: ${process.env.SERVER_IP}`);
-  console.log(`Architecture is: ${process.env.ARCHITECTURE}`);
   await I.verifyCommand(`docker network create ${networkName} || true`);
-  console.log(await I.verifyCommand('docker network ls --format "{{ .Name }}"'));
-
   await I.verifyCommand(`docker run -d 
           --name pmm-client-${process.env.ARCHITECTURE}
           -e PMM_AGENT_SERVER_ADDRESS=${pmmServerAddress}
           -e PMM_AGENT_SERVER_USERNAME=admin 
-          -e PMM_AGENT_SERVER_PASSWORD=${SERVER_PASSWORD}
+          -e PMM_AGENT_SERVER_PASSWORD=${pmmServerAdminPassword}
           -e PMM_AGENT_SERVER_INSECURE_TLS=1 
           -e PMM_AGENT_PORTS_MIN=41000
           -e PMM_AGENT_PORTS_MAX=41500
@@ -26,11 +21,12 @@ BeforeSuite(async ({ I }) => {
           -e PMM_AGENT_SETUP_FORCE=1
           -e PMM_AGENT_SETUP_NODE_TYPE=container
           --network ${networkName} 
-          ${DOCKER_IMAGE}`);
+          ${pmmClientDockerTag}`);
 
   I.wait(10);
-  console.log(await I.verifyCommand(`docker logs pmm-client-${process.env.ARCHITECTURE}`));
-  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent setup --force --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml --server-address=${pmmServerAddress}:443 --server-insecure-tls --server-username=admin --server-password=${SERVER_PASSWORD}`)
+
+  await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-agent setup --force --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml --server-address=${pmmServerAddress}:443 --server-insecure-tls --server-username=admin --server-password=${pmmServerAdminPassword}`);
+
   await I.verifyCommand(`docker run -d 
            --name mysql-multiarch 
            --network ${networkName}  
@@ -38,7 +34,7 @@ BeforeSuite(async ({ I }) => {
            mysql:8`);
 
   I.wait(15);
-  console.log(await I.verifyCommand(`docker logs pmm-client-${process.env.ARCHITECTURE}`));
+
   await I.verifyCommand(`docker exec pmm-client-${process.env.ARCHITECTURE} pmm-admin add mysql --query-source=perfschema --username=root --password=testPassword --host=mysql-multiarch --port=3306`);
 });
 

From 473d187771ee1e0dfaad58febdadfde8783956f9 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Thu, 22 Aug 2024 10:55:48 +0200
Subject: [PATCH 69/69] PMM-13276: Fix test name according to zephyr

---
 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
index 792b742fa..7c3c5250c 100644
--- a/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+++ b/tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
@@ -42,7 +42,7 @@ Before(async ({ I }) => {
   await I.Authorize();
 });
 
-Scenario('Verify that dashboards contain data @client-docker-multi-arch', async ({ I, dashboardPage, adminPage }) => {
+Scenario('PMM-T1923 Verify sanity check on pmm-client docker multi arch image (amd64, arm64) @client-docker-multi-arch', async ({ I, dashboardPage, adminPage }) => {
   const url = I.buildUrlWithParams(dashboardPage.mysqlInstanceSummaryDashboard.clearUrl, { from: 'now-5m' });
 
   I.amOnPage(url);