PMM-13599 v3 tags

.gitignore

@@ -1,5 +1,6 @@
 .idea
 .vscode
+.DS_Store
 # Logs
 logs
 *.log

README.md

@@ -78,7 +78,7 @@ Execute command in the Project Root folder
                                 (e.g. Data from exporters is displayed at those dashboards)
     @dbaas                  DB as a Service functionality tests
     @grafana-pr             Executed in Github Actions for PRs in percona-platform/grafana repository
-    @alerting-fb                     Integrated Alerting functionality tests
+    @fb-alerting                     Integrated Alerting functionality tests
     @instances              Remote Instances addition functionality 
                                 and checking that data appears from exporters
     @inventory              Inventory functionality, removing nodes, services, etc.
@@ -104,11 +104,11 @@ Execute command in the Project Root folder
     @not-ui-pipeline        legacy/deprecated
     @not-pr-pipeline        legacy/deprecated
     @cli                    cli related tests
-    @alerting-fb            alerting related tests executed on FB
+    @fb-alerting            alerting related tests executed on FB
     @advisors-fb            advisors related tests executed on FB
     @bm-fb                  backup management related tests executed on FB
-    @instances-fb           remote instances related tests executed on FB
-    @settings-fb            settings related tests executed on FB
+    @fb-instances           remote instances related tests executed on FB
+    @fb-settings            settings related tests executed on FB
 
 
 ## Contributing

package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "lint:tests": "eslint --ext .js --fix tests/",
     "e2e": "npx codeceptjs run-multiple parallel --debug --steps --reporter mocha-multi -c pr.codecept.js --grep '(?=.*)^(?!.*@not-ui-pipeline)^(?!.*@not-pr-pipeline)'",
-    "e2e:ia": "npx codeceptjs run -c pr.codecept.js --grep '@alerting-fb'",
+    "e2e:ia": "npx codeceptjs run -c pr.codecept.js --grep '@fb-alerting'",
     "e2e:stt": "npx codeceptjs run -c pr.codecept.js --grep '@stt'",
     "e2e:dbaas": "npx codeceptjs run -c pr.codecept.js --grep '@dbaas'",
     "e2e:grafana-pr": "npx codeceptjs run -c pr.codecept.js --grep '@grafana-pr'"

tests/configuration/verifyPMMSettingsPageFunctionality_test.js

@@ -74,7 +74,7 @@ Scenario.skip(
 ).retry(2);
 
 Scenario(
-  'PMM-T532 PMM-T533 PMM-T536 - Verify user can disable/enable IA in Settings @alerting-fb @settings',
+  'PMM-T532 PMM-T533 PMM-T536 - Verify user can disable/enable IA in Settings @fb-alerting @settings',
   async ({
     I, pmmSettingsPage, settingsAPI, adminPage,
   }) => {

tests/ia/README.md

@@ -29,10 +29,10 @@ Shut down webhook server command: `docker-compose -f docker-compose-webhook.yml
 
 ### Command to execute all Integrated Alerting tests:
 
-`npx codeceptjs run -c pr.codecept.js --grep '@alerting-fb'`
+`npx codeceptjs run -c pr.codecept.js --grep '@fb-alerting'`
 
 ### Execute Integrated Alerting tests in Jenkins
 * Job name - `pmm2-ui-tests`
-* tag - `@alerting-fb`
+* tag - `@fb-alerting`
 * run tagged day - `yes`
 * clients not needed

tests/ia/alertRules_test.js

@@ -29,7 +29,7 @@ After(async () => {
 });
 
 Scenario(
-  'PMM-T1384 Verify empty alert rules list @alerting-fb @grafana-pr',
+  'PMM-T1384 Verify empty alert rules list @fb-alerting @grafana-pr',
   async ({ I, alertRulesPage }) => {
     alertRulesPage.openAlertRulesTab();
     I.waitForText(alertRulesPage.messages.noRulesFound, 10, alertRulesPage.elements.noRules);
@@ -42,7 +42,7 @@ Scenario(
 ).retry(0);
 
 Scenario(
-  'PMM-T1385 Verify alert rules elements @alerting-fb @grafana-pr',
+  'PMM-T1385 Verify alert rules elements @fb-alerting @grafana-pr',
   async ({ I, alertRulesPage, rulesAPI }) => {
     const ruleName = 'testRule';
     const ruleFolder = 'PostgreSQL';
@@ -69,7 +69,7 @@ Scenario(
 );
 
 Scenario(
-  'PMM-T1392 Verify fields dynamically change value when template is changed @alerting-fb @grafana-pr',
+  'PMM-T1392 Verify fields dynamically change value when template is changed @fb-alerting @grafana-pr',
   async ({ I, alertRulesPage }) => {
     // TODO: https://jira.percona.com/browse/PMM-10860 name doesn't change
     alertRulesPage.openAlertRulesTab();
@@ -86,7 +86,7 @@ Scenario(
 );
 
 Scenario(
-  'PMM-T1420 Verify user can create Percona templated alert @alerting-fb',
+  'PMM-T1420 Verify user can create Percona templated alert @fb-alerting',
   async ({ I, alertRulesPage, rulesAPI }) => {
     const rule = page.rules[15];
     const newRule = page.rules[0];
@@ -107,7 +107,7 @@ Scenario(
 
 // TODO: unskip in scope of https://perconadev.atlassian.net/browse/PMM-12938
 Scenario.skip(
-  'PMM-T2282 Verfied Alerting is able to monitor for "PMM Agent Down" @alerting-fb',
+  'PMM-T2282 Verfied Alerting is able to monitor for "PMM Agent Down" @fb-alerting',
   async ({ I, alertRulesPage, rulesAPI }) => {
     const rule = page.rules[29];
     const newRule = page.rules[30];
@@ -135,7 +135,7 @@ Scenario.skip(
 
 // TODO: check ovf failure
 Scenario(
-  'PMM-T1430 Verify user can edit Percona templated alert @alerting-fb @not-ovf',
+  'PMM-T1430 Verify user can edit Percona templated alert @fb-alerting @not-ovf',
   async ({
     I, alertRulesPage, rulesAPI,
   }) => {
@@ -160,7 +160,7 @@ Scenario(
 );
 
 Scenario(
-  'PMM-T1433 Verify user can delete Percona templated alert @alerting-fb',
+  'PMM-T1433 Verify user can delete Percona templated alert @fb-alerting',
   async ({
     I, alertRulesPage, rulesAPI, iaCommon,
   }) => {
@@ -189,7 +189,7 @@ Scenario(
 // nightly candidate
 // FIXME: flaky test fix and unskip
 Scenario.skip(
-  'PMM-T1434 Verify validation errors when creating new alert rule @alerting-fb @grafana-pr',
+  'PMM-T1434 Verify validation errors when creating new alert rule @fb-alerting @grafana-pr',
   async ({
     I, alertRulesPage,
   }) => {

tests/ia/alerts_test.js

@@ -124,7 +124,7 @@ Scenario(
 );
 
 Scenario.skip(
-  'PMM-T1499 Verify an alert with non-existing filter (label) does not show up in list @alerting-fb',
+  'PMM-T1499 Verify an alert with non-existing filter (label) does not show up in list @fb-alerting',
   async ({ I, alertsPage, rulesAPI }) => {
     await rulesAPI.removeAllAlertRules();
     const wrongFilterRule = {
@@ -172,7 +172,7 @@ Scenario(
 );
 
 Scenario(
-  'PMM-T1467 Verify empty Fired alerts list @alerting-fb',
+  'PMM-T1467 Verify empty Fired alerts list @fb-alerting',
   async ({ I, alertsPage, rulesAPI }) => {
     await rulesAPI.removeAllAlertRules();
     I.amOnPage(alertsPage.url);

tests/ia/common_test.js

@@ -8,7 +8,7 @@
 });
 
 Scenario(
-  'PMM-T643 Verify message about disabled IA @alerting-fb',
+  'PMM-T643 Verify message about disabled IA @fb-alerting',
   async ({
     I, pmmSettingsPage, codeceptjsConfig,
   }) => {
@@ -26,7 +26,7 @@
 Scenario(
   'PMM-T481 Verify IA tab bar, '
   + 'PMM-T620 Verify after reloading the page user is on the same IA tab, '
-  + 'PMM-T776 Verify that user is able to see valid HTML Title on alerts page @alerting-fb',
+  + 'PMM-T776 Verify that user is able to see valid HTML Title on alerts page @fb-alerting',
   async ({
     I, alertRulesPage, ruleTemplatesPage, contactPointsPage, nPoliciesPage, silencesPage, alertGroupsPage, aiAdminPage,
   }) => {
@@ -52,7 +52,7 @@
     verifyTitle('Alert rule templates');
     await iaCommon.openAndVerifyTab(iaCommon.tabNames.alertRules, alertRulesPage.buttons.newAlertRule, alertRulesPage.url);
     verifyTitle('Alert rules');
     await iaCommon.openAndVerifyTab(iaCommon.tabNames.contactPoints, contactPointsPage.buttons.newContactPoint, contactPointsPage.url);
     verifyTitle('Contact points');
     await iaCommon.openAndVerifyTab(iaCommon.tabNames.notificationPolicies, nPoliciesPage.buttons.newPolicy, nPoliciesPage.url);
     verifyTitle('Notification policies');
@@ -63,7 +63,7 @@
 
     await iaCommon.openAndVerifyTab(iaCommon.tabNames.silences, silencesPage.buttons.newSilence, silencesPage.url);
     verifyTitle('Silences');
     await iaCommon.openAndVerifyTab(iaCommon.tabNames.alertGroups, alertGroupsPage.elements.groupByContainer, alertGroupsPage.url);
     verifyTitle('Alert groups');
     await iaCommon.openAndVerifyTab(iaCommon.tabNames.admin, aiAdminPage.buttons.editConfig, aiAdminPage.url);
     verifyTitle('Settings');

tests/ia/contactPoints_test.js

@@ -14,7 +14,7 @@ Before(async ({ I }) => {
 
 // Data(contactPoints).Scenario(
 //   'PMM-T1703 Verify Slack contact point can be created, '
-//   + 'PMM-T1709 Verify Webhook contact point can be created @alerting-fb',
+//   + 'PMM-T1709 Verify Webhook contact point can be created @fb-alerting',
 //   async ({ I, current }) => {
 //     await contactPointsPage.openContactPointsTab();
 //     await contactPointsPage.createCP(current.name, current.type);
@@ -25,7 +25,7 @@ Before(async ({ I }) => {
 // );
 //
 // Data(contactPoints).Scenario(
-//   'PMM-T1707 Verify Slack contact point can be edited @alerting-fb',
+//   'PMM-T1707 Verify Slack contact point can be edited @fb-alerting',
 //   async ({ I, current }) => {
 //     await contactPointsPage.openContactPointsTab();
 //     await contactPointsPage.editCP(current.name);
@@ -37,7 +37,7 @@ Before(async ({ I }) => {
 // );
 //
 // Scenario(
-//   'PMM-T1706 Verify default contact point cannot be deleted @alerting-fb',
+//   'PMM-T1706 Verify default contact point cannot be deleted @fb-alerting',
 //   async ({ I }) => {
 //     await contactPointsPage.openContactPointsTab();
 //     await contactPointsPage.openMoreMenu('default');
@@ -47,7 +47,7 @@ Before(async ({ I }) => {
 // );
 //
 // Data(contactPoints).Scenario(
-//   'PMM-T1704 Verify Slack contact point can be deleted @alerting-fb',
+//   'PMM-T1704 Verify Slack contact point can be deleted @fb-alerting',
 //   async ({ I, current }) => {
 //     const name = current.name + editedCPName;
 //
@@ -63,7 +63,7 @@ Before(async ({ I }) => {
 
 // Scenario(
 //   'PMM-T1710 Verify saving a contact point when required info is missing, '
-//   + 'PMM-T1711 Verify contact point test @alerting-fb',
+//   + 'PMM-T1711 Verify contact point test @fb-alerting',
 //   async ({ I, iaCommon }) => {
 //     await contactPointsPage.openContactPointsTab();
 //     I.waitForVisible(contactPointsPage.buttons.newContactPoint, 10);

tests/ia/pagination_test.js

@@ -13,7 +13,7 @@ After(async ({ templatesAPI }) => {
 });
 
 // Scenario(
-//   'PMM-T632 PMM-T697 PMM-T701 PMM-T1251 Verify Pagination navigation @alerting-fb @grafana-pr',
+//   'PMM-T632 PMM-T697 PMM-T701 PMM-T1251 Verify Pagination navigation @fb-alerting @grafana-pr',
 //   async ({
 //     I, iaCommon,
 //   }) => {
@@ -144,7 +144,7 @@ After(async ({ templatesAPI }) => {
 // );
 //
 // Scenario(
-//   'PMM-T662 PMM-T698 PMM-T702 PMM-T631 PMM-T1251 Pagination rows per page persistence @alerting-fb',
+//   'PMM-T662 PMM-T698 PMM-T702 PMM-T631 PMM-T1251 Pagination rows per page persistence @fb-alerting',
 //   async ({
 //     I, iaCommon,
 //   }) => {
@@ -219,7 +219,7 @@ After(async ({ templatesAPI }) => {
 // );
 //
 // Scenario(
-//   'PMM-T631 PMM-T633 PMM-T1251 Changing rows per page resets view to 1 page @alerting-fb',
+//   'PMM-T631 PMM-T633 PMM-T1251 Changing rows per page resets view to 1 page @fb-alerting',
 //   async ({
 //     I, iaCommon, templatesAPI,
 //   }) => {

tests/ia/ruleTemplates_test.js

@@ -38,7 +38,7 @@ Before(async ({ templatesAPI }) => {
 
 // TODO: Unskip after we bring back built-in templates
 Scenario.skip(
-  'PMM-T510 Verify built-in rule templates are non-editable @alerting-fb @grafana-pr',
+  'PMM-T510 Verify built-in rule templates are non-editable @fb-alerting @grafana-pr',
   async ({ I, ruleTemplatesPage }) => {
     const editButton = ruleTemplatesPage.buttons
       .editButtonBySource(ruleTemplatesPage.templateSources.builtin);
@@ -53,7 +53,7 @@ Scenario.skip(
 );
 
 Scenario(
-  'Verify rule templates list elements @alerting-fb @grafana-pr',
+  'Verify rule templates list elements @fb-alerting @grafana-pr',
   async ({ I, ruleTemplatesPage, templatesAPI }) => {
     const path = ruleTemplatesPage.ruleTemplate.paths.yaml;
 
@@ -79,7 +79,7 @@ Scenario(
 );
 
 Scenario(
-  'Add rule template modal elements @alerting-fb @grafana-pr',
+  'Add rule template modal elements @fb-alerting @grafana-pr',
   async ({ I, ruleTemplatesPage }) => {
     ruleTemplatesPage.openRuleTemplatesTab();
     I.click(ruleTemplatesPage.buttons.openAddTemplateModal);
@@ -94,7 +94,7 @@ Scenario(
 // nightly candidate
 Data(units)
   .Scenario(
-    'PMM-T500 PMM-T595 PMM-T596 Add rule templates with different units, empty range @alerting-fb',
+    'PMM-T500 PMM-T595 PMM-T596 Add rule templates with different units, empty range @fb-alerting',
     async ({
       I, ruleTemplatesPage, templatesAPI, current,
     }) => {
@@ -130,7 +130,7 @@ Data(units)
 
 Data(templates)
   .Scenario(
-    'PMM-T482 PMM-T499 PMM-T766 PMM-T758 PMM-T766 PMM-T767 PMM-T931 Upload rule templates @alerting-fb',
+    'PMM-T482 PMM-T499 PMM-T766 PMM-T758 PMM-T766 PMM-T767 PMM-T931 Upload rule templates @fb-alerting',
     async ({ I, ruleTemplatesPage, current }) => {
       const { path } = current;
       const validFile = !current.error;
@@ -157,7 +157,7 @@ Data(templates)
   );
 
 Scenario(
-  '@PMM-T1785 Bulk rule templates upload @alerting-fb',
+  '@PMM-T1785 Bulk rule templates upload @fb-alerting',
   async ({ I, ruleTemplatesPage }) => {
     const path = 'tests/ia/templates/multiple-templates.yml';
     const templates = await ruleTemplatesPage.ruleTemplate.parseTemplates(path);
@@ -182,7 +182,7 @@ Scenario(
 );
 
 Scenario(
-  '@PMM-T1786 Edit bulk uploaded rule template @alerting-fb',
+  '@PMM-T1786 Edit bulk uploaded rule template @fb-alerting',
   async ({ I, ruleTemplatesPage, templatesAPI }) => {
     const path = 'tests/ia/templates/multiple-templates.yml';
     const templates = await ruleTemplatesPage.ruleTemplate.parseTemplates(path);
@@ -219,7 +219,7 @@ Scenario(
 );
 
 Scenario(
-  '@PMM-T1787 Delete bulk uploaded rule template @alerting-fb',
+  '@PMM-T1787 Delete bulk uploaded rule template @fb-alerting',
   async ({ I, ruleTemplatesPage, templatesAPI }) => {
     const path = 'tests/ia/templates/multiple-templates.yml';
     const templates = await ruleTemplatesPage.ruleTemplate.parseTemplates(path);
@@ -251,7 +251,7 @@ Scenario(
 );
 
 Scenario(
-  'PMM-T501 Upload duplicate rule template @alerting-fb @grafana-pr',
+  'PMM-T501 Upload duplicate rule template @fb-alerting @grafana-pr',
   async ({ I, ruleTemplatesPage, templatesAPI }) => {
     const path = ruleTemplatesPage.ruleTemplate.paths.yaml;
     const [, , id] = await ruleTemplatesPage.ruleTemplate.templateNameAndContent(path);
@@ -269,7 +269,7 @@ Scenario(
 );
 
 Scenario(
-  'PMM-T483 PMM-T699 Verify user can edit UI-created IA rule template @grafana-pr @alerting-fb',
+  'PMM-T483 PMM-T699 Verify user can edit UI-created IA rule template @grafana-pr @fb-alerting',
   async ({ I, ruleTemplatesPage, templatesAPI }) => {
     const path = ruleTemplatesPage.ruleTemplate.paths.yaml;
     const [templateName, fileContent, id] = await ruleTemplatesPage.ruleTemplate
@@ -300,7 +300,7 @@ Scenario(
 );
 
 Scenario(
-  'PMM-T562 Verify user can delete User-defined (UI) rule templates @grafana-pr @alerting-fb',
+  'PMM-T562 Verify user can delete User-defined (UI) rule templates @grafana-pr @fb-alerting',
   async ({ I, ruleTemplatesPage, templatesAPI }) => {
     const path = ruleTemplatesPage.ruleTemplate.paths.yaml;
     const [templateName] = await ruleTemplatesPage.ruleTemplate
@@ -329,7 +329,7 @@ Scenario(
 );
 
 Scenario(
-  'PMM-T884 Verify templates from Percona (SAAS) cannot be deleted or edited @alerting-fb',
+  'PMM-T884 Verify templates from Percona (SAAS) cannot be deleted or edited @fb-alerting',
   async ({ I, ruleTemplatesPage }) => {
     const saasDeleteButton = ruleTemplatesPage.buttons
       .deleteButtonBySource(ruleTemplatesPage.templateSources.saas);
@@ -344,7 +344,7 @@ Scenario(
 );
 
 Scenario(
-  'PMM-T553 Verify rule template can be deleted if there is a rule based on it @alerting-fb',
+  'PMM-T553 Verify rule template can be deleted if there is a rule based on it @fb-alerting',
   async ({
     I, ruleTemplatesPage, templatesAPI, rulesAPI,
   }) => {
@@ -367,7 +367,7 @@ Scenario(
 
 // TODO: unskip after https://perconadev.atlassian.net/browse/PMM-13542 is fixed
 Scenario.skip(
-  'PMM-T825 PMM-T821 Verify User can add Alert rule template in the file system @not-ovf @alerting-fb',
+  'PMM-T825 PMM-T821 Verify User can add Alert rule template in the file system @not-ovf @fb-alerting',
   async ({ I, ruleTemplatesPage }) => {
     const editButton = ruleTemplatesPage.buttons
       .editButtonBySource(ruleTemplatesPage.templateSources.file);
@@ -389,7 +389,7 @@ Scenario.skip(
 );
 
 Scenario(
-  'PMM-T1126 - Verify there are no Templates from Percona if Telemetry is disabled @alerting-fb',
+  'PMM-T1126 - Verify there are no Templates from Percona if Telemetry is disabled @fb-alerting',
   async ({ I, settingsAPI, ruleTemplatesPage }) => {
     const editButton = ruleTemplatesPage.buttons
       .editButtonBySource(ruleTemplatesPage.templateSources.saas);
@@ -409,7 +409,7 @@ Scenario(
 );
 
 Scenario(
-  '@PMM-T1514 Verify that alert rule templates has only 1 exit button @alerting-fb',
+  '@PMM-T1514 Verify that alert rule templates has only 1 exit button @fb-alerting',
   async ({ I, ruleTemplatesPage, alertRulesPage }) => {
     ruleTemplatesPage.openRuleTemplatesTab();
     ruleTemplatesPage.openAddDialog(await I.grabTextFrom(ruleTemplatesPage.elements.templateName));