Merge branch 'main' into PMM-7-tests-code-housekeeping

Author: yurkovychv

tests/pages/dashboardPage.js

@@ -1366,12 +1366,17 @@ module.exports = {
   },
 
   graphsLocator(metricName) {
-    return locate('.panel-title-container h2').withText(metricName);
+    return locate('.panel-container').withDescendant(locate('.panel-title-container h2').withText(metricName));
+  },
+
+  graphLegendSeriesValue(metricName, value) {
+    return this.graphsLocator(metricName).find('.graph-legend-series').find('td').withText(value);
   },
 
   tabLocator(tabName) {
     return `//a[contains(text(), '${tabName}')]`;
   },
+
   async waitForAllGraphsToHaveData(timeout = 60) {
     await I.waitForInvisible(this.fields.notAvailableMetrics, timeout);
     await I.waitForInvisible(this.fields.notAvailableDataPoints, timeout);

tests/qa-integration/pmm_psmdb_integration_test.js

@@ -169,27 +169,41 @@ Scenario.skip(
   },
 ).retry(2);
 
-Scenario.skip(
-  'T2317 Verify Wrong Replication Lag by Set values if RS is PSA -( MongoDB Cluster Summary) @pmm-psmdb-arbiter-integration @not-ui-pipeline',
+Scenario(
+  'T1775, T1888 Verify Wrong Replication Lag by Set values if RS is PSA -( MongoDB Cluster Summary) @pmm-psmdb-arbiter-integration @not-ui-pipeline',
   async ({
     I, dashboardPage,
   }) => {
     I.amOnPage(`${dashboardPage.mongodbReplicaSetSummaryDashboard.url}&var-replset=rs1`);
     dashboardPage.waitForDashboardOpened();
 
-    // Grab secs or year lag value from Replication Lag min field in UI
-    const replLagLocator = '(//a[@data-testid=\'data-testid dashboard-row-title-Replication Lag\']/following::a[contains(text(),\'mongodb_rs2_1\')]/following::td[contains(text(),\' s\') or contains(text(),\' year\')])[1]';
+    const username = 'dba';
+    const password = 'test1234';
+
+    // Gather Secondary member Service Name from Mongo and PMM admin
+    const secondaryLagPort = (await I.verifyCommand(`docker exec ${arbiter_container_name} ./psmdb_${version}/bin/mongo --eval rs\.printSecondaryReplicationInfo\\(\\) --username=${username} --password=${password} | awk -F ":" '/source/ {print $3}'`)).trim();
+    const serviceName = (await I.verifyCommand(`docker exec ${arbiter_container_name} pmm-admin list | awk -v pat='${secondaryLagPort}' '$0~pat {print $2}'`)).trim();
+
+    // Check if logs has arbiter connection
+    await I.asyncWaitFor(async () => {
+      const checkLog = await I.verifyCommand(`docker exec ${arbiter_container_name} grep -q "level=warning.*some metrics might be unavailable on arbiter nodes" pmm-agent.log; echo $?`);
+
+      return checkLog;
+    }, 60);
 
-    await I.waitForElement(replLagLocator, 500);
-    // Get the text content of the element located
-    const replLagText = await I.grabTextFrom(replLagLocator);
-    // Grab only Lag value required from Text
-    const actualLagValue = +replLagText.split('.', 1);
-    // Grab actual Lag value required from database
-    let expectedLagValue = (await I.verifyCommand(`docker exec -w /mongosh/bin/ ${arbiter_container_name} ./mongosh --eval rs\.printSecondaryReplicationInfo\\(\\) | awk '/replLag:/ {print $2}' | cut -c 2`)).trim();
+    // Check if there are no errors but only warnings
+    let errorCode = 0;
 
-    // Give some threshold increase for actual replication lag, for now 2 secs extra
-    expectedLagValue = +expectedLagValue + 2;
-    I.assertBelow(actualLagValue, expectedLagValue, 'ReplicaLag is more than expected lag vaule');
+    errorCode = (await I.verifyCommand(`docker exec ${arbiter_container_name} grep -q "level=error.*some metrics might be unavailable on arbiter nodes" pmm-agent.log; echo $?`));
+    I.assertTrue(errorCode.includes(1), `No errors for arbiter setup expected but got error code: ${errorCode}`);
+
+    const replLagServiceName = dashboardPage.graphLegendSeriesValue('Replication Lag', 'mongodb_rs2_1_1519');
+    const replLagSeriesValue = `${replLagServiceName.toXPath()}/following::td[contains(text(),'year')]`;
+
+    // Check service name from Replication Lag field in UI
+    await I.waitForElement(replLagServiceName, 180);
+
+    // Check lag value from Replication Lag field is not 'year' in UI
+    await I.dontSeeElement(replLagSeriesValue, 180);
   },
-);
+).retry(1);