[Uptime] [Synthetics Integration] add new advanced options #112454
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,5 +25,10 @@ export const browserFormatters: BrowserFormatMap = { | |
| [ConfigKeys.SCREENSHOTS]: null, | ||
| [ConfigKeys.SYNTHETICS_ARGS]: (fields) => | ||
| arrayToJsonFormatter(fields[ConfigKeys.SYNTHETICS_ARGS]), | ||
| [ConfigKeys.JOURNEY_FILTERS_MATCH]: (fields) => | ||
| stringToJsonFormatter(fields[ConfigKeys.JOURNEY_FILTERS_MATCH]), | ||
| [ConfigKeys.JOURNEY_FILTERS_TAGS]: (fields) => | ||
| arrayToJsonFormatter(fields[ConfigKeys.JOURNEY_FILTERS_TAGS]), | ||
| [ConfigKeys.IGNORE_HTTPS_ERRORS]: null, | ||
| ...commonFormatters, | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,5 +39,12 @@ export const browserNormalizers: BrowserNormalizerMap = { | |
| [ConfigKeys.PARAMS]: getBrowserNormalizer(ConfigKeys.PARAMS), | ||
| [ConfigKeys.SCREENSHOTS]: getBrowserNormalizer(ConfigKeys.SCREENSHOTS), | ||
| [ConfigKeys.SYNTHETICS_ARGS]: getBrowserJsonToJavascriptNormalizer(ConfigKeys.SYNTHETICS_ARGS), | ||
| [ConfigKeys.JOURNEY_FILTERS_MATCH]: getBrowserJsonToJavascriptNormalizer( | ||
| ConfigKeys.JOURNEY_FILTERS_MATCH | ||
| ), | ||
| [ConfigKeys.JOURNEY_FILTERS_TAGS]: getBrowserJsonToJavascriptNormalizer( | ||
| ConfigKeys.JOURNEY_FILTERS_TAGS | ||
| ), | ||
| [ConfigKeys.IGNORE_HTTPS_ERRORS]: getBrowserNormalizer(ConfigKeys.IGNORE_HTTPS_ERRORS), | ||
| ...commonNormalizers, | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,13 +7,12 @@ | |
|
|
||
| import React, { memo, useMemo, useCallback } from 'react'; | ||
| import { FormattedMessage } from '@kbn/i18n/react'; | ||
| import { EuiFormRow } from '@elastic/eui'; | ||
| import { ConfigKeys, Validation } from '../types'; | ||
| import { useBrowserSimpleFieldsContext } from '../contexts'; | ||
| import { ScheduleField } from '../schedule_field'; | ||
| import { SourceField } from './source_field'; | ||
| import { CommonFields } from '../common/common_fields'; | ||
|
|
||
| interface Props { | ||
| validate: Validation; | ||
|
|
@@ -91,93 +90,7 @@ export const BrowserSimpleFields = memo<Props>(({ validate }) => { | |
| )} | ||
| /> | ||
| </EuiFormRow> | ||
| <CommonFields fields={fields} onChange={handleInputChange} validate={validate} /> | ||
| </> | ||
| ); | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * 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 React from 'react'; | ||
| import { FormattedMessage } from '@kbn/i18n/react'; | ||
| import { EuiFormRow, EuiFieldText, EuiFieldNumber } from '@elastic/eui'; | ||
| import { ConfigKeys, Validation, ICommonFields } from '../types'; | ||
| import { ComboBox } from '../combo_box'; | ||
| import { OptionalLabel } from '../optional_label'; | ||
|
|
||
| interface Props { | ||
| validate: Validation; | ||
| fields: ICommonFields; | ||
| onChange: ({ value, configKey }: { value: string | string[]; configKey: ConfigKeys }) => void; | ||
| } | ||
|
|
||
| export function CommonFields({ fields, onChange, validate }: Props) { | ||
| return ( | ||
| <> | ||
| <EuiFormRow | ||
| label={ | ||
| <FormattedMessage | ||
| id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.APMServiceName.label" | ||
| defaultMessage="APM service name" | ||
| /> | ||
| } | ||
| labelAppend={<OptionalLabel />} | ||
| helpText={ | ||
| <FormattedMessage | ||
| id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.APMServiceName.helpText" | ||
| defaultMessage="APM service name for this monitor. Corresponds to the service.name ECS field. Set this when monitoring an app that is also using APM to enable integrations between Uptime and APM data in Kibana." | ||
| /> | ||
| } | ||
| > | ||
| <EuiFieldText | ||
| value={fields[ConfigKeys.APM_SERVICE_NAME]} | ||
| onChange={(event) => | ||
| onChange({ | ||
| value: event.target.value, | ||
| configKey: ConfigKeys.APM_SERVICE_NAME, | ||
| }) | ||
| } | ||
| data-test-subj="syntheticsAPMServiceName" | ||
| /> | ||
| </EuiFormRow> | ||
| <EuiFormRow | ||
| label={ | ||
| <FormattedMessage | ||
| id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.label" | ||
| defaultMessage="Timeout in seconds" | ||
| /> | ||
| } | ||
| isInvalid={!!validate[ConfigKeys.TIMEOUT]?.(fields)} | ||
| error={ | ||
| parseInt(fields[ConfigKeys.TIMEOUT], 10) < 0 ? ( | ||
| <FormattedMessage | ||
| id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.moreThanZeroError" | ||
| defaultMessage="Timeout must be greater than or equal to 0" | ||
| /> | ||
| ) : ( | ||
| <FormattedMessage | ||
| id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.lessThanIntervalError" | ||
| defaultMessage="Timeout must be less than the monitor interval" | ||
| /> | ||
| ) | ||
| } | ||
| helpText={ | ||
| <FormattedMessage | ||
| id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.timeout.helpText" | ||
| defaultMessage="The total time allowed for testing the connection and exchanging data." | ||
| /> | ||
| } | ||
| > | ||
| <EuiFieldNumber | ||
| min={0} | ||
| value={fields[ConfigKeys.TIMEOUT]} | ||
| onChange={(event) => | ||
| onChange({ | ||
| value: event.target.value, | ||
| configKey: ConfigKeys.TIMEOUT, | ||
| }) | ||
| } | ||
| step={'any'} | ||
| /> | ||
| </EuiFormRow> | ||
| <EuiFormRow | ||
| label={ | ||
| <FormattedMessage | ||
| id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.tags.label" | ||
| defaultMessage="Tags" | ||
| /> | ||
| } | ||
| labelAppend={<OptionalLabel />} | ||
| helpText={ | ||
| <FormattedMessage | ||
| id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.tags.helpText" | ||
| defaultMessage="A list of tags that will be sent with the monitor event. Press enter to add a new tag. Displayed in Uptime and enables searching by tag." | ||
| /> | ||
| } | ||
| > | ||
| <ComboBox | ||
| selectedOptions={fields[ConfigKeys.TAGS]} | ||
| onChange={(value) => onChange({ value, configKey: ConfigKeys.TAGS })} | ||
| data-test-subj="syntheticsTags" | ||
| /> | ||
| </EuiFormRow> | ||
| </> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,9 @@ interface IBrowserAdvancedFieldsContextProvider { | |
| export const initialValues: IBrowserAdvancedFields = { | ||
| [ConfigKeys.SCREENSHOTS]: ScreenshotOption.ON, | ||
| [ConfigKeys.SYNTHETICS_ARGS]: [], | ||
| [ConfigKeys.JOURNEY_FILTERS_MATCH]: '', | ||
| [ConfigKeys.JOURNEY_FILTERS_TAGS]: [], | ||
| [ConfigKeys.IGNORE_HTTPS_ERRORS]: false, | ||
| }; | ||
|
|
||
| const defaultContext: IBrowserAdvancedFieldsContext = { | ||
|
|
||
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ export { | |
| HTTPAdvancedFieldsContextProvider, | ||
| initialValues as defaultHTTPAdvancedFields, | ||
| useHTTPAdvancedFieldsContext, | ||
| } from './http_context_advanced'; | ||
| export { | ||
| TCPSimpleFieldsContext, | ||
| TCPSimpleFieldsContextProvider, | ||
|
|
@@ -39,7 +39,7 @@ export { | |
| TCPAdvancedFieldsContextProvider, | ||
| initialValues as defaultTCPAdvancedFields, | ||
| useTCPAdvancedFieldsContext, | ||
| } from './tcp_context_advanced'; | ||
| export { | ||
| BrowserSimpleFieldsContext, | ||
| BrowserSimpleFieldsContextProvider, | ||
|
|
||
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should clarify somewhere that this is for when you're running a suite of tests vs using the recorder of inline. I was a bit confused. I also think perhaps we should look at a different word than filter. Something about "Selective Tests" "Use this option to apply these monitor settings to a subset of the tests in your suite". (or something along those lines)
As I understand this, you're not really filtering per-se, you more choosing a subset to apply an action to (in this case, the monitor frequency, name etc that you set above) WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@drewpost That makes sense. I can hide these settings when inline or recorder is selected.
I think the statement about "not really filtering" is generally correct, though it will filter in the sense that only that subset will be run. Maybe add an additional sentence: "Only the configured subset will be run by this monitor."