added retry on failure

elastic · Sep 20, 2023 · 8da466f · 8da466f
1 parent aa36fe6
commit 8da466f
Show file tree

Hide file tree

Showing 40 changed files with 337 additions and 80 deletions.
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
@@ -70,7 +70,10 @@ export function getSyntheticsSingleMetricConfig({ dataView }: ConfigProps): Seri
           },
           titlePosition: 'bottom',
         },
-        columnFilter: { language: 'kuery', query: 'summary.up: *' },
+        columnFilter: {
+          language: 'kuery',
+          query: 'summary.final_attempt: true or ( not summary.final_attempt: * and summary:*)',
+        },
       },
       {
         id: 'monitor_duration',
@@ -142,7 +145,10 @@ export function getSyntheticsSingleMetricConfig({ dataView }: ConfigProps): Seri
         },
         field: RECORDS_FIELD,
         format: 'number',
-        columnFilter: { language: 'kuery', query: 'summary.down > 0' },
+        columnFilter: {
+          language: 'kuery',
+          query: 'summary.status: down and summary.final_attempt: true',
+        },
       },
     ],
     labels: FieldLabels,

diff --git a/...ponents/shared/exploratory_view/configurations/test_data/test_formula_metric_attribute.ts b/...ponents/shared/exploratory_view/configurations/test_data/test_formula_metric_attribute.ts
@@ -40,7 +40,8 @@ export const sampleMetricFormulaAttribute = {
                 dataType: 'number',
                 filter: {
                   language: 'kuery',
-                  query: 'summary.up: *',
+                  query:
+                    'summary.final_attempt: true or ( not summary.final_attempt: * and summary:*)',
                 },
                 isBucketed: false,
                 label: 'Availability',
@@ -62,7 +63,8 @@ export const sampleMetricFormulaAttribute = {
                 dataType: 'number',
                 filter: {
                   language: 'kuery',
-                  query: '(summary.up: *) AND (summary.down > 0)',
+                  query:
+                    '(summary.final_attempt: true or ( not summary.final_attempt: * and summary:*)) AND (summary.down > 0)',
                 },
                 isBucketed: false,
                 label: 'Part of Availability',
@@ -78,7 +80,8 @@ export const sampleMetricFormulaAttribute = {
                 dataType: 'number',
                 filter: {
                   language: 'kuery',
-                  query: 'summary.up: *',
+                  query:
+                    'summary.final_attempt: true or ( not summary.final_attempt: * and summary:*)',
                 },
                 isBucketed: false,
                 label: 'Part of Availability',

diff --git a/x-pack/plugins/synthetics/common/constants/client_defaults.ts b/x-pack/plugins/synthetics/common/constants/client_defaults.ts
@@ -45,9 +45,9 @@ export const CLIENT_DEFAULTS = {
 };
 
 export const EXCLUDE_RUN_ONCE_FILTER = { bool: { must_not: { exists: { field: 'run_once' } } } };
-export const SUMMARY_FILTER = {
-  exists: {
-    field: 'summary',
+export const FINAL_SUMMARY_FILTER = {
+  term: {
+    'summary.final_attempt': true,
   },
 };
 

diff --git a/x-pack/plugins/synthetics/common/constants/monitor_defaults.ts b/x-pack/plugins/synthetics/common/constants/monitor_defaults.ts
@@ -149,6 +149,7 @@ export const DEFAULT_COMMON_FIELDS: CommonFields = {
   [ConfigKey.CONFIG_HASH]: '',
   [ConfigKey.MONITOR_QUERY_ID]: '',
   [ConfigKey.PARAMS]: '',
+  [ConfigKey.MAX_ATTEMPTS]: 2,
 };
 
 export const DEFAULT_BROWSER_ADVANCED_FIELDS: BrowserAdvancedFields = {

diff --git a/x-pack/plugins/synthetics/common/constants/monitor_management.ts b/x-pack/plugins/synthetics/common/constants/monitor_management.ts
@@ -76,6 +76,7 @@ export enum ConfigKey {
   USERNAME = 'username',
   WAIT = 'wait',
   MONITOR_QUERY_ID = 'id',
+  MAX_ATTEMPTS = 'max_attempts',
 }
 
 export const secretKeys = [

diff --git a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts
@@ -63,6 +63,7 @@ export const CommonFieldsCodec = t.intersection([
     [ConfigKey.LOCATIONS]: MonitorLocationsCodec,
     [ConfigKey.MONITOR_QUERY_ID]: t.string,
     [ConfigKey.CONFIG_ID]: t.string,
+    [ConfigKey.MAX_ATTEMPTS]: t.number,
   }),
   t.partial({
     [ConfigKey.FORM_MONITOR_TYPE]: FormMonitorTypeCodec,

diff --git a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types_project.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types_project.ts
@@ -47,6 +47,7 @@ export const ProjectMonitorCodec = t.intersection([
     wait: t.string,
     hash: t.string,
     namespace: t.string,
+    retestOnFailure: t.boolean,
   }),
 ]);
 

diff --git a/x-pack/plugins/synthetics/common/runtime_types/ping/ping.ts b/x-pack/plugins/synthetics/common/runtime_types/ping/ping.ts
@@ -143,6 +143,18 @@ export const UrlType = t.partial({
   path: t.string,
 });
 
+const SummaryCodec = t.type({
+  down: t.number,
+  up: t.number,
+  status: t.union([t.literal('up'), t.literal('down')]),
+  attempt: t.number,
+  max_attempts: t.number,
+  final_attempt: t.boolean,
+  retry_group: t.string,
+});
+
+export type TestSummary = t.TypeOf<typeof SummaryCodec>;
+
 export const PingType = t.intersection([
   t.type({
     timestamp: t.string,
@@ -205,10 +217,7 @@ export const PingType = t.intersection([
         us: t.number,
       }),
     }),
-    summary: t.partial({
-      down: t.number,
-      up: t.number,
-    }),
+    summary: SummaryCodec,
     synthetics: SyntheticsDataType,
     tags: t.array(t.string),
     tcp: t.partial({
@@ -292,6 +301,7 @@ export const GetPingsParamsType = t.intersection([
     monitorId: t.string,
     sort: t.string,
     status: t.string,
+    finalAttempt: t.boolean,
   }),
 ]);
 

diff --git a/x-pack/plugins/synthetics/e2e/helpers/synthetics_runner.ts b/x-pack/plugins/synthetics/e2e/helpers/synthetics_runner.ts
@@ -107,13 +107,14 @@ export class SyntheticsRunner {
     }
     const { headless, match, pauseOnError } = this.params;
     const noOfRuns = process.env.NO_OF_RUNS ? Number(process.env.NO_OF_RUNS) : 1;
+    const CI = process.env.CI === 'true';
     console.log(`Running ${noOfRuns} times`);
     let results: PromiseType<ReturnType<typeof syntheticsRun>> = {};
     for (let i = 0; i < noOfRuns; i++) {
       results = await syntheticsRun({
         params: { kibanaUrl: this.kibanaUrl, getService: this.getService },
         playwrightOptions: {
-          headless,
+          headless: headless ?? !CI,
           chromiumSandbox: false,
           timeout: 60 * 1000,
           viewport: {
@@ -125,7 +126,7 @@ export class SyntheticsRunner {
           },
         },
         match: match === 'undefined' ? '' : match,
-        pauseOnError,
+        pauseOnError: pauseOnError ?? !CI,
         screenshots: 'only-on-failure',
         reporter: TestReporter,
       });

diff --git a/...s/synthetics/public/apps/synthetics/components/common/components/filter_status_button.tsx b/...s/synthetics/public/apps/synthetics/components/common/components/filter_status_button.tsx
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFilterButton, EuiButtonColor } from '@elastic/eui';
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { selectStatusFilter, setStatusFilter } from '../../../state';
+
+export interface FilterStatusButtonProps {
+  content: string | JSX.Element;
+  dataTestSubj: string;
+  isDisabled?: boolean;
+  value?: 'up' | 'down';
+  withNext: boolean;
+}
+
+export const FilterStatusButton = ({
+  content,
+  dataTestSubj,
+  isDisabled,
+  value,
+  withNext,
+}: FilterStatusButtonProps) => {
+  const statusFilter = useSelector(selectStatusFilter);
+  const dispatch = useDispatch();
+
+  const isActive = statusFilter === value;
+  let color: EuiButtonColor = 'text';
+  if (isActive) {
+    color = value === 'up' ? 'success' : value === 'down' ? 'danger' : 'text';
+  }
+  return (
+    <EuiFilterButton
+      data-test-subj={dataTestSubj}
+      hasActiveFilters={isActive}
+      isDisabled={isDisabled}
+      onClick={() => {
+        dispatch(setStatusFilter(statusFilter === value ? undefined : value));
+      }}
+      withNext={withNext}
+      color={color}
+    >
+      {content}
+    </EuiFilterButton>
+  );
+};
diff --git a/...nthetics/public/apps/synthetics/components/error_details/hooks/use_error_failed_tests.tsx b/...nthetics/public/apps/synthetics/components/error_details/hooks/use_error_failed_tests.tsx
@@ -11,7 +11,7 @@ import { useMemo } from 'react';
 import { Ping } from '../../../../../../common/runtime_types';
 import {
   EXCLUDE_RUN_ONCE_FILTER,
-  SUMMARY_FILTER,
+  FINAL_SUMMARY_FILTER,
 } from '../../../../../../common/constants/client_defaults';
 import { SYNTHETICS_INDEX_PATTERN } from '../../../../../../common/constants';
 import { useSyntheticsRefreshContext } from '../../../contexts';
@@ -32,7 +32,7 @@ export function useErrorFailedTests() {
         query: {
           bool: {
             filter: [
-              SUMMARY_FILTER,
+              FINAL_SUMMARY_FILTER,
               EXCLUDE_RUN_ONCE_FILTER,
               {
                 term: {

diff --git a/...thetics/public/apps/synthetics/components/error_details/hooks/use_find_my_killer_state.ts b/...thetics/public/apps/synthetics/components/error_details/hooks/use_find_my_killer_state.ts
@@ -11,7 +11,7 @@ import { useReduxEsSearch } from '../../../hooks/use_redux_es_search';
 import { Ping } from '../../../../../../common/runtime_types';
 import {
   EXCLUDE_RUN_ONCE_FILTER,
-  SUMMARY_FILTER,
+  FINAL_SUMMARY_FILTER,
 } from '../../../../../../common/constants/client_defaults';
 import { SYNTHETICS_INDEX_PATTERN } from '../../../../../../common/constants';
 import { useSyntheticsRefreshContext } from '../../../contexts';
@@ -39,7 +39,7 @@ export function useFindMyKillerState() {
         query: {
           bool: {
             filter: [
-              SUMMARY_FILTER,
+              FINAL_SUMMARY_FILTER,
               EXCLUDE_RUN_ONCE_FILTER,
               {
                 term: {

diff --git a/...synthetics/public/apps/synthetics/components/error_details/hooks/use_last_error_state.tsx b/...synthetics/public/apps/synthetics/components/error_details/hooks/use_last_error_state.tsx
@@ -11,7 +11,7 @@ import { useReduxEsSearch } from '../../../hooks/use_redux_es_search';
 import { Ping } from '../../../../../../common/runtime_types';
 import {
   EXCLUDE_RUN_ONCE_FILTER,
-  SUMMARY_FILTER,
+  FINAL_SUMMARY_FILTER,
 } from '../../../../../../common/constants/client_defaults';
 import { SYNTHETICS_INDEX_PATTERN } from '../../../../../../common/constants';
 import { useSyntheticsRefreshContext } from '../../../contexts';
@@ -32,7 +32,7 @@ export function useErrorFailedTests() {
         query: {
           bool: {
             filter: [
-              SUMMARY_FILTER,
+              FINAL_SUMMARY_FILTER,
               EXCLUDE_RUN_ONCE_FILTER,
               {
                 term: {

diff --git a/...ugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx b/...ugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx
@@ -1589,4 +1589,22 @@ export const FIELD = (readOnly?: boolean): FieldMap => ({
       },
     }),
   },
+  [ConfigKey.MAX_ATTEMPTS]: {
+    fieldKey: ConfigKey.MAX_ATTEMPTS,
+    component: Switch,
+    controlled: true,
+    props: ({ setValue, field, trigger }): EuiSwitchProps => ({
+      id: 'syntheticsMonitorConfigMaxAttempts',
+      label: i18n.translate('xpack.synthetics.monitorConfig.retest.label', {
+        defaultMessage: 'Enable retest on failure',
+      }),
+      checked: field?.value === 2,
+      onChange: async (event) => {
+        const isChecked = !!event.target.checked;
+        setValue(ConfigKey.MAX_ATTEMPTS, isChecked ? 2 : 1);
+        await trigger(ConfigKey.MAX_ATTEMPTS);
+      },
+      'data-test-subj': 'syntheticsEnableAttemptSwitch',
+    }),
+  },
 });
diff --git a/...lugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/form_config.tsx b/...lugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/form_config.tsx
@@ -198,6 +198,7 @@ export const FORM_CONFIG = (readOnly: boolean): FieldConfig => ({
       FIELD(readOnly)[ConfigKey.MAX_REDIRECTS],
       FIELD(readOnly)[ConfigKey.TIMEOUT],
       FIELD(readOnly)[ConfigKey.ENABLED],
+      FIELD(readOnly)[ConfigKey.MAX_ATTEMPTS],
       FIELD(readOnly)[AlertConfigKey.STATUS_ENABLED],
       FIELD(readOnly)[AlertConfigKey.TLS_ENABLED],
     ],
@@ -218,6 +219,7 @@ export const FORM_CONFIG = (readOnly: boolean): FieldConfig => ({
       FIELD(readOnly)[`${ConfigKey.SCHEDULE}.number`],
       FIELD(readOnly)[ConfigKey.TIMEOUT],
       FIELD(readOnly)[ConfigKey.ENABLED],
+      FIELD(readOnly)[ConfigKey.MAX_ATTEMPTS],
       FIELD(readOnly)[AlertConfigKey.STATUS_ENABLED],
       FIELD(readOnly)[AlertConfigKey.TLS_ENABLED],
     ],
@@ -235,6 +237,7 @@ export const FORM_CONFIG = (readOnly: boolean): FieldConfig => ({
       FIELD(readOnly)[ConfigKey.LOCATIONS],
       FIELD(readOnly)[`${ConfigKey.SCHEDULE}.number`],
       FIELD(readOnly)[ConfigKey.ENABLED],
+      FIELD(readOnly)[ConfigKey.MAX_ATTEMPTS],
       FIELD(readOnly)[AlertConfigKey.STATUS_ENABLED],
     ],
     step3: [FIELD(readOnly)['source.inline'], FIELD(readOnly)[ConfigKey.PARAMS]],
@@ -261,6 +264,7 @@ export const FORM_CONFIG = (readOnly: boolean): FieldConfig => ({
       FIELD(readOnly)[ConfigKey.LOCATIONS],
       FIELD(readOnly)[`${ConfigKey.SCHEDULE}.number`],
       FIELD(readOnly)[ConfigKey.ENABLED],
+      FIELD(readOnly)[ConfigKey.MAX_ATTEMPTS],
       FIELD(readOnly)[AlertConfigKey.STATUS_ENABLED],
     ],
     advanced: [
@@ -286,6 +290,7 @@ export const FORM_CONFIG = (readOnly: boolean): FieldConfig => ({
       FIELD(readOnly)[ConfigKey.WAIT],
       FIELD(readOnly)[ConfigKey.TIMEOUT],
       FIELD(readOnly)[ConfigKey.ENABLED],
+      FIELD(readOnly)[ConfigKey.MAX_ATTEMPTS],
       FIELD(readOnly)[AlertConfigKey.STATUS_ENABLED],
     ],
     advanced: [DEFAULT_DATA_OPTIONS(readOnly), ICMP_ADVANCED(readOnly).requestConfig],

diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/types.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/types.ts
@@ -163,4 +163,5 @@ export interface FieldMap {
   [ConfigKey.IGNORE_HTTPS_ERRORS]: FieldMeta<ConfigKey.IGNORE_HTTPS_ERRORS>;
   [ConfigKey.MODE]: FieldMeta<ConfigKey.MODE>;
   [ConfigKey.IPV4]: FieldMeta<ConfigKey.IPV4>;
+  [ConfigKey.MAX_ATTEMPTS]: FieldMeta<ConfigKey.MAX_ATTEMPTS>;
 }
diff --git a/...synthetics/public/apps/synthetics/components/monitor_details/hooks/use_monitor_errors.tsx b/...synthetics/public/apps/synthetics/components/monitor_details/hooks/use_monitor_errors.tsx
@@ -11,7 +11,7 @@ import { useSelectedLocation } from './use_selected_location';
 import { Ping, PingState } from '../../../../../../common/runtime_types';
 import {
   EXCLUDE_RUN_ONCE_FILTER,
-  SUMMARY_FILTER,
+  FINAL_SUMMARY_FILTER,
 } from '../../../../../../common/constants/client_defaults';
 import { SYNTHETICS_INDEX_PATTERN } from '../../../../../../common/constants';
 import { useSyntheticsRefreshContext } from '../../../contexts';
@@ -37,7 +37,7 @@ export function useMonitorErrors(monitorIdArg?: string) {
         query: {
           bool: {
             filter: [
-              SUMMARY_FILTER,
+              FINAL_SUMMARY_FILTER,
               EXCLUDE_RUN_ONCE_FILTER,
               {
                 range: {

diff --git a/.../synthetics/public/apps/synthetics/components/monitor_details/hooks/use_monitor_pings.tsx b/.../synthetics/public/apps/synthetics/components/monitor_details/hooks/use_monitor_pings.tsx
@@ -10,7 +10,12 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import { useSelectedMonitor } from './use_selected_monitor';
 import { useSelectedLocation } from './use_selected_location';
-import { getMonitorRecentPingsAction, selectMonitorPingsMetadata } from '../../../state';
+import {
+  getMonitorRecentPingsAction,
+  selectMonitorPingsMetadata,
+  selectShowOnlyFinalAttempts,
+  selectStatusFilter,
+} from '../../../state';
 
 interface UseMonitorPingsProps {
   lastRefresh?: number;
@@ -29,6 +34,10 @@ export const useMonitorPings = (props?: UseMonitorPingsProps) => {
   const monitorId = monitor?.id;
   const locationLabel = location?.label;
 
+  const showOnlyFinalAttempts = useSelector(selectShowOnlyFinalAttempts);
+
+  const statusFilter = useSelector(selectStatusFilter);
+
   useEffect(() => {
     if (monitorId && locationLabel) {
       dispatch(
@@ -39,6 +48,8 @@ export const useMonitorPings = (props?: UseMonitorPingsProps) => {
           pageIndex: props?.pageIndex,
           from: props?.from,
           to: props?.to,
+          finalAttempt: showOnlyFinalAttempts,
+          statusFilter,
         })
       );
     }
@@ -51,6 +62,8 @@ export const useMonitorPings = (props?: UseMonitorPingsProps) => {
     props?.pageIndex,
     props?.from,
     props?.to,
+    showOnlyFinalAttempts,
+    statusFilter,
   ]);
 
   const { total, data: pings, loading } = useSelector(selectMonitorPingsMetadata);