Merge pull request #516 from etmurasaki/fix-metrics

NO-JIRA: automation - regression testing for metrics - changes

Author: openshift-merge-bot[bot]

web/cypress/e2e/monitoring/regression/02.reg_metrics.cy.ts

@@ -146,6 +146,9 @@ describe('Regression: Monitoring - Metrics', () => {
     metricsPage.graphAxisXAssertion(GraphTimespan.THIRTY_MINUTES);
 
     cy.log('4.2 Graph Timespan Dropdown');
+    metricsPage.clickActionsDeleteAllQueries();
+    metricsPage.enterQueryInput(0, MetricsPageQueryInput.VECTOR_QUERY);
+    metricsPage.clickRunQueriesButton();
     metricsPage.graphTimespanDropdownAssertion();
 
     cy.log('4.3 Select and Assert each timespan');
@@ -156,7 +159,8 @@ describe('Regression: Monitoring - Metrics', () => {
 
     cy.log('4.4 Enter Graph Timespan');
     metricsPage.clickActionsDeleteAllQueries();
-    metricsPage.clickInsertExampleQuery();
+    metricsPage.enterQueryInput(0, MetricsPageQueryInput.VECTOR_QUERY);
+    metricsPage.clickRunQueriesButton();
     Object.values(GraphTimespan).forEach((timespan) => {
       metricsPage.enterGraphTimespan(timespan);
       metricsPage.graphAxisXAssertion(timespan);
@@ -185,7 +189,7 @@ describe('Regression: Monitoring - Metrics', () => {
     cy.byTestID(DataTestIDs.MetricStackedCheckbox).should('not.exist');
 
     cy.log('4.10 Disconnected Checkbox');
-    cy.byTestID(DataTestIDs.MetricDisconnectedCheckbox).should('have.attr', 'disabled');
+    cy.byTestID(DataTestIDs.MetricDisconnectedCheckbox).should('be.visible');
 
     cy.log('4.11 Prepare to test Stacked Checkbox');
     metricsPage.clickActionsDeleteAllQueries();
@@ -229,7 +233,8 @@ describe('Regression: Monitoring - Metrics', () => {
     cy.get(Classes.MetricsPageQueryInput).eq(1).should('contain', MetricsPageQueryInput.INSERT_EXAMPLE_QUERY);
 
     cy.log('6.3 Preparation to test Run Queries button');
-    metricsPage.enterQueryInput(0, MetricsPageQueryInput.VECTOR_QUERY);
+    cy.get(Classes.MetricsPageQueryInput).eq(0).should('be.visible').clear();
+    cy.get(Classes.MetricsPageQueryInput).eq(0).type(MetricsPageQueryInput.VECTOR_QUERY);
     cy.byTestID(DataTestIDs.MetricsPageSelectAllUnselectAllButton).should('have.length', 1);
 
     cy.log('6.4 Run Queries button');
@@ -492,9 +497,15 @@ describe('Regression: Monitoring - Metrics', () => {
     cy.get(Classes.MetricsPageQueryAutocomplete).should('be.visible');
     cy.get(Classes.MetricsPageQueryAutocomplete).should('contain', 'abs');
 
-  
   });
 
-
+  it('10. Admin perspective - Metrics > No Datapoints with alert', () => {
+    cy.log('10.1 No Datapoints with alert');
+    cy.visit('/monitoring/query-browser');
+    metricsPage.enterQueryInput(0, MetricsPageQueryInput.QUERY_WITH_ALERT);
+    metricsPage.clickRunQueriesButton();
+    cy.byOUIAID(DataTestIDs.MetricsGraphAlertDanger).should('be.visible');
+  });
+   
 });
 

web/cypress/fixtures/monitoring/constants.ts

@@ -95,6 +95,7 @@ export enum MetricsPageQueryInput {
   RATE_OF_TRANSMITTED_PACKETS = 'OpenShift_Metrics_QueryTable_sum(irate(container_network_transmit_packets_total[2h])) by (pod).csv',
   RATE_OF_RECEIVED_PACKETS_DROPPED = 'OpenShift_Metrics_QueryTable_sum(irate(container_network_receive_packets_dropped_total[2h])) by (pod).csv',
   RATE_OF_TRANSMITTED_PACKETS_DROPPED = 'OpenShift_Metrics_QueryTable_sum(irate(container_network_transmit_packets_dropped_total[2h])) by (pod).csv',
+  QUERY_WITH_ALERT = 'vector1)',
   API_REQUEST_DURATION_BY_VERB_99TH_PERCENTILE_QUERY = 'histogram_quantile(0.99, sum(resource_verb:apiserver_request_duration_seconds_bucket:rate:5m{apiserver="kube-apiserver"}) by (verb, le))',
 }
 

web/cypress/views/metrics.ts

@@ -281,15 +281,21 @@ export const metricsPage = {
     cy.log('metricsPage.clickGraphTimespanDropdown');
     cy.byTestID(DataTestIDs.MetricGraphTimespanDropdown).should('be.visible').click();
     cy.get(Classes.MenuItem).contains(timespan).should('be.visible').click();
+    cy.byPFRole('progressbar').should('be.visible');
+    cy.byPFRole('progressbar').should('not.exist');
     cy.get('[id^="' + IDs.ChartAxis0ChartLabel + '"]').should('be.visible');
+    cy.byTestID(DataTestIDs.MetricGraph).find('[data-ouia-component-id^="' + DataTestIDs.MetricsGraphAlertDanger + '"]').should('not.exist');
   },
 
   enterGraphTimespan: (timespan: GraphTimespan) => {
     cy.log('metricsPage.enterGraphTimespan');
     cy.byTestID(DataTestIDs.MetricGraphTimespanInput).type('{selectall}{backspace}', {delay: 1000});
     cy.byTestID(DataTestIDs.MetricGraphTimespanInput).type(timespan);
     cy.byTestID(DataTestIDs.MetricGraphTimespanInput).should('have.attr', 'value', timespan);
+    cy.byPFRole('progressbar').should('be.visible');
+    cy.byPFRole('progressbar').should('not.exist');
     cy.get('[id^="' + IDs.ChartAxis0ChartLabel + '"]').should('be.visible');
+    cy.byTestID(DataTestIDs.MetricGraph).find('[data-ouia-component-id^="' + DataTestIDs.MetricsGraphAlertDanger + '"]').should('not.exist');
   },
 
   graphTimespanDropdownAssertion: () => {

web/src/components/data-test.ts

@@ -80,6 +80,7 @@ export const DataTestIDs = {
   },
   TypeaheadSelectInput: 'query-select-typeahead-input',
   Table: 'OUIA-Generated-Table', //table ouiaid - ID to be used with byOUIAID(DataTestIDs.Table)
+  MetricsGraphAlertDanger: 'OUIA-Generated-Alert-danger', //ID to be used with byOUIAID(DataTestIDs.MetricsGraphAlertDanger)
 };
 
 export const LegacyDashboardPageTestIDs = {