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

Author: yurkovychv

tests/QAN/common_test.js

@@ -5,7 +5,7 @@ Feature('QAN common').retry(1);
 
 Before(async ({ I, qanPage }) => {
   await I.Authorize();
-  I.amOnPage(qanPage.url);
+  I.amOnPage(I.buildUrlWithParams(qanPage.clearUrl, { from: 'now-1h' }));
 });
 
 Scenario(

tests/QAN/details_test.js

@@ -106,9 +106,9 @@ Scenario(
 Scenario(
   'PMM-T13 - Check Explain and Example for supported DBs - mongodb @qan',
   async ({
-    I, qanOverview, qanFilters, qanDetails,
+    I, qanPage, qanOverview, qanFilters, qanDetails,
   }) => {
-    await qanFilters.applyFilter('mongodb');
+    I.amOnPage(I.buildUrlWithParams(qanPage.clearUrl, { service_name: 'rs101', from: 'now-1h' }));
     I.waitForElement(qanOverview.elements.querySelector, 30);
     qanOverview.selectRow(1);
     qanFilters.waitForFiltersToLoad();
@@ -128,7 +128,7 @@ Scenario(
     qanOverview.selectRow(1);
     qanFilters.waitForFiltersToLoad();
     qanDetails.checkExplainTab();
-    await qanFilters.applyFilter('mongodb');
+    await qanFilters.applyFilter('rs101');
     I.waitForElement(qanOverview.elements.querySelector, 30);
     qanOverview.selectRow(1);
 

tests/QAN/filters_test.js

@@ -2,10 +2,10 @@ const assert = require('assert');
 
 const shortCutTests = new DataTable(['type', 'dashboard', 'shortcutLink', 'filter']);
 
-shortCutTests.add(['Cluster', 'MongoDB Cluster Summary', 'graph/d/mongodb-cluster-summary/mongodb-cluster-summary', 'mongodb_node_cluster']);
+shortCutTests.add(['Cluster', 'MongoDB Cluster Summary', 'graph/d/mongodb-cluster-summary/mongodb-cluster-summary', 'replicaset']);
 shortCutTests.add(['Replication Set', 'MySQL Replication Summary', 'graph/d/mysql-replicaset-summary/mysql-replication-summary', 'ps-repl1']);
 shortCutTests.add(['Node Name', 'Node Summary', 'graph/d/node-instance-summary/node-summary?var-node_name=pmm-server', 'pmm-server']);
-shortCutTests.add(['Service Name', 'MongoDB Instance Summary', 'graph/d/mongodb-instance-summary/mongodb-instance-summary', 'mongodb_rs1_2']);
+shortCutTests.add(['Service Name', 'MongoDB Instance Summary', 'graph/d/mongodb-instance-summary/mongodb-instance-summary', 'rs101']);
 
 Feature('QAN filters').retry(1);
 // filterToApply - filter witch we check, searchValue - value to get zero search result

tests/QAN/pagination_test.js

@@ -2,7 +2,7 @@ Feature('QAN pagination');
 
 Before(async ({ I, qanPage, qanOverview }) => {
   await I.Authorize();
-  I.amOnPage(qanPage.url);
+  I.amOnPage(I.buildUrlWithParams(qanPage.clearUrl, { from: 'now-1h' }));
   qanOverview.waitForOverviewLoaded();
 });
 

tests/configuration/pages/pmmInventoryPage.js

@@ -36,7 +36,7 @@ module.exports = {
     inventoryTableRows: locate('tr').after('table'),
     inventoryTableRowCount: (count) => locate('span').withText(`${count}`),
     kebabMenu: (serviceName) => `${service(serviceName)}//ancestor::tr//button[@data-testid="dropdown-menu-toggle"]`,
-    mongoServiceName: locate('td').withText('mongodb'),
+    mongoServiceName: locate('td').withText('rs10'),
     mysqlServiceName: locate('td').withText('ms-single'),
     // cannot be changed to locate because it's failing in I.waitForVisible()
     nodesLink: locate('[role="tablist"] a').withText('Nodes').withAttr({ 'aria-label': 'Tab Nodes' }),

tests/configuration/pages/pmmSettingsPage.js

@@ -556,14 +556,7 @@ module.exports = {
   },
 
   async verifySettingsValue(field, expectedValue) {
-    I.waitForElement(field, 30);
-    const fieldActualValue = await I.grabValueFrom(field);
-
-    assert.equal(
-      expectedValue,
-      fieldActualValue,
-      `The Value for Setting ${field} is not the same as expected Value ${expectedValue}, value found was ${fieldActualValue}`,
-    );
+    I.waitForValue(field, expectedValue, 30);
   },
 
   async verifyTooltip(tooltipObj) {

tests/configuration/verifyPMMSettingsPageElements_test.js

@@ -191,4 +191,4 @@ Scenario('@PMM-T1866 - Verify if public address has an port assigned and followi
   I.click(pmmSettingsPage.fields.applyButton);
   I.dontSeeElement(pmmSettingsPage.fields.errorPopUpElement);
   await pmmSettingsPage.verifySettingsValue(pmmSettingsPage.fields.dataRetentionInput, '1');
-});
+}).retry(1);

tests/configuration/verifyPMMSettingsPageFunctionality_test.js

@@ -358,7 +358,7 @@ Scenario(
       `Expected the Public Address to be saved and Match ${publicAddressValue}`,
     );
   },
-).retry(1);
+).retry(2);
 
 Scenario(
   'PMM-T254 ensure Advisors are on by default @instances',

tests/metrics/verifyMongoDBCollectionFlags_test.js

@@ -227,27 +227,27 @@ module.exports = {
 
     switch (agentType) {
       case 'mongodb':
-        agent_id = (await I.verifyCommand(`pmm-admin inventory add agent mongodb-exporter --password=${dbDetails.password} --push-metrics ${logLvlFlag} ${dbDetails.pmm_agent_id} ${dbDetails.service_id} ${dbDetails.username} | grep "Agent ID" | grep -v "PMM-Agent ID" | awk -F " " '{print $4}'`)).trim();
+        agent_id = (await I.verifyCommand(`docker exec ${dbDetails.container_name} pmm-admin inventory add agent mongodb-exporter --password=${dbDetails.password} --push-metrics ${logLvlFlag} ${dbDetails.pmm_agent_id} ${dbDetails.service_id} ${dbDetails.username} | grep "Agent ID" | grep -v "PMM-Agent ID" | awk -F " " '{print $4}'`)).trim();
         output = await this.apiGetAgentDetailsViaAgentId(agent_id);
         log_level = output.data.mongodb_exporter.log_level;
         await grafanaAPI.waitForMetric('mongodb_up', [{ type: 'agent_id', value: agent_id }], 90);
         I.assertEqual(log_level, logLevel || 'warn', `Was expecting Mongo Exporter for service ${dbDetails.service_name} added again via inventory command and log level to have ${logLevel || 'warn'} set`);
         break;
       case 'node':
-        agent_id = (await I.verifyCommand(`pmm-admin inventory add agent node-exporter --push-metrics ${logLvlFlag} ${dbDetails.pmm_agent_id} | grep "Agent ID" | grep -v "PMM-Agent ID" | awk -F " " '{print $4}'`)).trim();
+        agent_id = (await I.verifyCommand(`docker exec ${dbDetails.container_name} pmm-admin inventory add agent node-exporter --push-metrics ${logLvlFlag} ${dbDetails.pmm_agent_id} | grep "Agent ID" | grep -v "PMM-Agent ID" | awk -F " " '{print $4}'`)).trim();
         output = await this.apiGetAgentDetailsViaAgentId(agent_id);
         log_level = output.data.node_exporter.log_level;
         await grafanaAPI.waitForMetric('node_memory_MemTotal_bytes', [{ type: 'agent_id', value: agent_id }], 90);
         assert.ok(log_level === logLevel || 'warn', `Was expecting Node Exporter for service ${dbDetails.service_name} added again via inventory command and log level to have ${logLevel || 'warn'} set`);
         break;
       case 'mongodb_profiler':
-        agent_id = (await I.verifyCommand(`pmm-admin inventory add agent qan-mongodb-profiler-agent --password=${dbDetails.password} ${logLvlFlag} ${dbDetails.pmm_agent_id} ${dbDetails.service_id} ${dbDetails.username} | grep "Agent ID" | grep -v "PMM-Agent ID" | awk -F " " '{print $4}'`)).trim();
+        agent_id = (await I.verifyCommand(`docker exec ${dbDetails.container_name} pmm-admin inventory add agent qan-mongodb-profiler-agent --password=${dbDetails.password} ${logLvlFlag} ${dbDetails.pmm_agent_id} ${dbDetails.service_id} ${dbDetails.username} | grep "Agent ID" | grep -v "PMM-Agent ID" | awk -F " " '{print $4}'`)).trim();
         output = await this.apiGetAgentDetailsViaAgentId(agent_id);
         log_level = output.data.qan_mongodb_profiler_agent.log_level;
 
         // Wait for Status to change to running
         I.wait(10);
-        await I.verifyCommand(`pmm-admin list | grep mongodb_profiler_agent | grep ${agent_id} | grep ${dbDetails.service_id} | grep "Running"`);
+        await I.verifyCommand(`docker exec ${dbDetails.container_name} pmm-admin list | grep mongodb_profiler_agent | grep ${agent_id} | grep ${dbDetails.service_id} | grep "Running"`);
         assert.ok(log_level === logLevel || 'warn', `Was expecting MongoDB QAN Profile for service ${dbDetails.service_name} added again via inventory command and log level to have ${logLevel || 'warn'} set`);
         break;
       case 'postgresql':

tests/pages/api/inventoryAPI.js

@@ -4,7 +4,7 @@ const assert = require('assert');
 const annotation = new DataTable(['annotationName', 'service', 'dashboard', 'service_type']);
 
 annotation.add(['annotation-for-postgres-server', 'pmm-server', dashboardPage.postgresqlInstanceSummaryDashboard.url, 'POSTGRESQL_SERVICE']);
-annotation.add(['annotation-for-mongo', 'mongodb', dashboardPage.mongoDbInstanceSummaryDashboard.url, 'MONGODB_SERVICE']);
+annotation.add(['annotation-for-mongo', 'rs10', dashboardPage.mongoDbInstanceSummaryDashboard.url, 'MONGODB_SERVICE']);
 annotation.add(['annotation-for-postgres', 'PGSQL', dashboardPage.postgresqlInstanceSummaryDashboard.url, 'POSTGRESQL_SERVICE']);
 annotation.add(['annotation-for-mysql', 'ms-', dashboardPage.mysqlInstanceSummaryDashboard.url, 'MYSQL_SERVICE']);
 annotation.add(['mysql-node-name', 'ms-', dashboardPage.nodesCompareDashboard.url, 'MYSQL_SERVICE']);
@@ -56,8 +56,8 @@ Scenario(
     I, annotationAPI, pmmInventoryPage,
   }) => {
     I.amOnPage(pmmInventoryPage.url);
-    I.waitForVisible(pmmInventoryPage.fields.mysqlServiceName, 10);
-    const serviceName = await I.grabTextFrom(pmmInventoryPage.fields.mysqlServiceName);
+    I.waitForVisible(pmmInventoryPage.fields.mongoServiceName, 10);
+    const serviceName = await I.grabTextFrom(pmmInventoryPage.fields.mongoServiceName);
 
     // wrong node name
     await annotationAPI.setAnnotation('wrong-node-name', 'PMM-T878', 'random1', serviceName, 404);

tests/verifyAnnotations_test.js

@@ -8,10 +8,9 @@ Scenario(
   async ({
     I,
   }) => {
-    const version = '4.4';
+    const version = '6.0';
     const edition = 'Community';
 
-    await I.verifyCommand(`${pmmFrameworkLoader} --mongomagic --with-sharding --pmm2 --mo-version=${version}`);
     const containerName = await I.verifyCommand(`docker ps --format "table {{.ID}}\\t{{.Image}}\\t{{.Names}}" | grep 'psmdb.*${version}_sharded' | awk -F " " '{print $3}'`);
     const agentId = await I.verifyCommand(`docker exec ${containerName} pmm-admin list | grep "42002" | awk -F " " '{print $4}'`);
     const serviceId = await I.verifyCommand(`docker exec ${containerName} pmm-admin list | grep "mongodb_shraded" | awk -F " " '{print $4}'`);