[Synthetics] Refactor cardinality test runs query (elastic#166608)

(cherry picked from commit 59c5eb0)
shahzad31 · Sep 28, 2023 · 1db6f98 · 1db6f98
1 parent e4b126c
commit 1db6f98
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 26 deletions.
diff --git a/...loratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.ts b/...loratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.ts
@@ -857,6 +857,7 @@ export class LensAttributes {
       dataType: 'number',
       isBucketed: false,
       label: label || 'Count of records',
+      customLabel: true,
       operationType: 'count',
       scale: 'ratio',
       sourceField: RECORDS_FIELD,

diff --git a/...blic/components/shared/exploratory_view/configurations/synthetics/kpi_over_time_config.ts b/...blic/components/shared/exploratory_view/configurations/synthetics/kpi_over_time_config.ts
@@ -14,6 +14,7 @@ import {
   PERCENTILE,
   ReportTypes,
   FORMULA_COLUMN,
+  RECORDS_FIELD,
 } from '../constants';
 import {
   CLS_LABEL,
@@ -124,8 +125,8 @@ export function getSyntheticsKPIConfig({ dataView }: ConfigProps): SeriesConfig
       },
       {
         label: 'Total runs',
-        id: 'monitor.check_group',
-        field: 'monitor.check_group',
+        id: 'total_test_runs',
+        field: RECORDS_FIELD,
         columnType: OPERATION_COLUMN,
         columnFilters: [
           {

diff --git a/...blic/components/shared/exploratory_view/configurations/synthetics/single_metric_config.ts b/...blic/components/shared/exploratory_view/configurations/synthetics/single_metric_config.ts
@@ -103,8 +103,9 @@ export function getSyntheticsSingleMetricConfig({ dataView }: ConfigProps): Seri
           titlePosition: 'bottom',
         },
         columnType: FORMULA_COLUMN,
-        formula: "unique_count(monitor.check_group, kql='summary: *')",
         format: 'number',
+        field: RECORDS_FIELD,
+        columnFilter: { language: 'kuery', query: 'summary: *' },
       },
       {
         id: 'monitor_successful',
@@ -114,9 +115,9 @@ export function getSyntheticsSingleMetricConfig({ dataView }: ConfigProps): Seri
         metricStateOptions: {
           titlePosition: 'bottom',
         },
-        columnType: FORMULA_COLUMN,
-        formula: 'unique_count(monitor.check_group, kql=\'monitor.status: "up"\')',
         format: 'number',
+        field: RECORDS_FIELD,
+        columnFilter: { language: 'kuery', query: 'summary.down: 0' },
       },
       {
         id: 'monitor_errors',

diff --git a/...ublic/components/shared/exploratory_view/configurations/test_data/sample_attribute_cwv.ts b/...ublic/components/shared/exploratory_view/configurations/test_data/sample_attribute_cwv.ts
@@ -54,6 +54,7 @@ export const sampleAttributeCoreWebVital = {
                 sourceField: 'user_agent.os.name',
               },
               'y-axis-column-1': {
+                customLabel: true,
                 dataType: 'number',
                 filter: {
                   language: 'kuery',
@@ -67,6 +68,7 @@ export const sampleAttributeCoreWebVital = {
                 sourceField: RECORDS_FIELD,
               },
               'y-axis-column-2': {
+                customLabel: true,
                 dataType: 'number',
                 filter: {
                   language: 'kuery',
@@ -79,6 +81,7 @@ export const sampleAttributeCoreWebVital = {
                 sourceField: RECORDS_FIELD,
               },
               'y-axis-column-layer0-0': {
+                customLabel: true,
                 dataType: 'number',
                 filter: {
                   language: 'kuery',

diff --git a/...ublic/components/shared/exploratory_view/configurations/test_data/sample_attribute_kpi.ts b/...ublic/components/shared/exploratory_view/configurations/test_data/sample_attribute_kpi.ts
@@ -50,6 +50,7 @@ export const sampleAttributeKpi = {
                 },
                 isBucketed: false,
                 label: 'test-series',
+                customLabel: true,
                 operationType: 'count',
                 scale: 'ratio',
                 sourceField: RECORDS_FIELD,

diff --git a/...thetics/components/monitors_page/management/monitor_stats/monitor_test_runs_sparkline.tsx b/...thetics/components/monitors_page/management/monitor_stats/monitor_test_runs_sparkline.tsx
@@ -32,11 +32,11 @@ export const MonitorTestRunsSparkline = ({ monitorIds }: { monitorIds: string[]
           'monitor.id': monitorIds.length > 0 ? monitorIds : ['false-monitor-id'], // Show no data when monitorIds is empty
         },
         dataType: 'synthetics' as const,
-        selectedMetricField: 'monitor.check_group',
+        selectedMetricField: 'total_test_runs',
         filters: [],
         name: labels.TEST_RUNS_LABEL,
         color: theme.eui.euiColorVis1,
-        operationType: 'unique_count',
+        operationType: 'count',
       },
     ];
     // eslint-disable-next-line react-hooks/exhaustive-deps

diff --git a/...e/public/legacy_uptime/components/monitor/status_details/status_bar/monitor_redirects.tsx b/...e/public/legacy_uptime/components/monitor/status_details/status_bar/monitor_redirects.tsx
@@ -7,45 +7,46 @@
 
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiPopover } from '@elastic/eui';
-import styled from 'styled-components';
+import {
+  EuiPopover,
+  EuiDescriptionListTitle,
+  EuiDescriptionListDescription,
+  EuiButtonEmpty,
+} from '@elastic/eui';
 import { Ping } from '../../../../../../common/runtime_types';
 import { PingRedirects } from '../../ping_list/ping_redirects';
-import { MonListDescription, MonListTitle } from './status_bar';
 
 interface Props {
   monitorStatus: Ping | null;
 }
 
-const RedirectBtn = styled.span`
-  cursor: pointer;
-`;
-
 export const MonitorRedirects: React.FC<Props> = ({ monitorStatus }) => {
   const list = monitorStatus?.http?.response?.redirects;
 
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 
   const button = (
-    <MonListDescription>
-      <RedirectBtn
+    <EuiDescriptionListDescription>
+      <EuiButtonEmpty
         className="euiLink euiLink--primary"
         onClick={() => setIsPopoverOpen(!isPopoverOpen)}
         data-test-subj="uptimeMonitorRedirectInfo"
+        iconType="arrowDown"
+        iconSide="right"
       >
         {i18n.translate('xpack.uptime.monitorList.redirects.title.number', {
           defaultMessage: '{number}',
           values: {
             number: list?.length ?? 0,
           },
         })}
-      </RedirectBtn>
-    </MonListDescription>
+      </EuiButtonEmpty>
+    </EuiDescriptionListDescription>
   );
 
   return list ? (
     <>
-      <MonListTitle>Redirects</MonListTitle>
+      <EuiDescriptionListTitle>Redirects</EuiDescriptionListTitle>
       <EuiPopover
         button={button}
         isOpen={isPopoverOpen}

diff --git a/x-pack/plugins/uptime/server/legacy_uptime/lib/lib.ts b/x-pack/plugins/uptime/server/legacy_uptime/lib/lib.ts
@@ -24,7 +24,6 @@ import { DYNAMIC_SETTINGS_DEFAULT_ATTRIBUTES } from '../../constants/settings';
 import { DynamicSettingsAttributes } from '../../runtime_types/settings';
 import { settingsObjectId, umDynamicSettings } from './saved_objects/uptime_settings';
 import { API_URLS } from '../../../common/constants';
-import { UptimeServerSetup } from './adapters';
 
 export type { UMServerLibs } from '../uptime_server';
 
@@ -287,7 +286,3 @@ export function debugESCall({
   }
   console.log(`\n`);
 }
-
-export const isTestUser = (server: UptimeServerSetup) => {
-  return server.config.service?.username === 'localKibanaIntegrationTestsUser';
-};
diff --git a/x-pack/plugins/uptime/server/legacy_uptime/routes/uptime_route_wrapper.ts b/x-pack/plugins/uptime/server/legacy_uptime/routes/uptime_route_wrapper.ts
@@ -7,7 +7,7 @@
 
 import { KibanaResponse } from '@kbn/core-http-router-server-internal';
 import { UMKibanaRouteWrapper } from './types';
-import { isTestUser, UptimeEsClient } from '../lib/lib';
+import { UptimeEsClient } from '../lib/lib';
 
 export const uptimeRouteWrapper: UMKibanaRouteWrapper = (uptimeRoute, server) => ({
   ...uptimeRoute,
@@ -24,7 +24,7 @@ export const uptimeRouteWrapper: UMKibanaRouteWrapper = (uptimeRoute, server) =>
       {
         request,
         uiSettings: coreContext.uiSettings,
-        isDev: Boolean(server.isDev && !isTestUser(server)),
+        isDev: Boolean(server.isDev),
       }
     );