Merge branch 'main' into files-upload-component-KS-2425

* main: [SearchBar] Allow show refresh button as an icon (elastic#141088) [Files] Added usage counters for delete, unshare and download (elastic#140091) Fix removing a single field formatter (elastic#141078) [APM] Move service metric config to kibana advanced settings (elastic#141147) Synthetics project update improvements (elastic#140990)
jloleysens · Sep 21, 2022 · e333d3b · e333d3b
2 parents 3357c16 + f64c9c9
commit e333d3b
Show file tree

Hide file tree

Showing 38 changed files with 765 additions and 433 deletions.
diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
@@ -77,9 +77,6 @@ Maximum number of child items displayed when viewing trace details. Defaults to
 `xpack.observability.annotations.index` {ess-icon}::
 Index name where Observability annotations are stored. Defaults to `observability-annotations`.
 
-`xpack.apm.searchAggregatedServiceMetrics` {ess-icon}::
- Enables Service metrics. Defaults to `false`. When set to `true`, additional configuration in APM Server is required.
-
 `xpack.apm.searchAggregatedTransactions` {ess-icon}::
 Enables Transaction histogram metrics. Defaults to `auto` so the UI will use metric indices over transaction indices for transactions if aggregated transactions are found. When set to `always`, additional configuration in APM Server is required. When set to `never` and aggregated transactions are not used.
 +

diff --git a/src/plugins/data_views/common/data_views/data_view.ts b/src/plugins/data_views/common/data_views/data_view.ts
@@ -15,7 +15,7 @@ import type {
 } from '@kbn/field-formats-plugin/common';
 import { castEsToKbnFieldTypeName, ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/field-types';
 import { CharacterNotAllowedInField } from '@kbn/kibana-utils-plugin/common';
-import _, { cloneDeep, each, reject } from 'lodash';
+import { cloneDeep, each, reject } from 'lodash';
 import type { DataViewAttributes, FieldAttrs, FieldAttrSet } from '..';
 import type { DataViewField, IIndexPatternFieldList } from '../fields';
 import { fieldList } from '../fields';
@@ -407,9 +407,6 @@ export class DataView implements DataViewBase {
    * Returns index pattern as saved object body for saving
    */
   getAsSavedObjectBody(): DataViewAttributes {
-    const fieldFormatMap = _.isEmpty(this.fieldFormatMap)
-      ? undefined
-      : JSON.stringify(this.fieldFormatMap);
     const fieldAttrs = this.getFieldAttrs();
     const runtimeFieldMap = this.runtimeFieldMap;
 
@@ -419,7 +416,7 @@ export class DataView implements DataViewBase {
       timeFieldName: this.timeFieldName,
       sourceFilters: this.sourceFilters ? JSON.stringify(this.sourceFilters) : undefined,
       fields: JSON.stringify(this.fields?.filter((field) => field.scripted) ?? []),
-      fieldFormatMap,
+      fieldFormatMap: this.fieldFormatMap ? JSON.stringify(this.fieldFormatMap) : undefined,
       type: this.type!,
       typeMeta: JSON.stringify(this.typeMeta ?? {}),
       allowNoIndex: this.allowNoIndex ? this.allowNoIndex : undefined,

diff --git a/src/plugins/data_views/common/data_views/data_views.test.ts b/src/plugins/data_views/common/data_views/data_views.test.ts
@@ -350,6 +350,26 @@ describe('IndexPatterns', () => {
     expect(async () => await indexPatterns.get(id)).toBeDefined();
   });
 
+  test('can set and remove field format', async () => {
+    const id = 'id';
+    setDocsourcePayload(id, savedObject);
+    const dataView = await indexPatterns.get(id);
+    dataView.setFieldFormat('field', { id: 'formatId' });
+    await indexPatterns.updateSavedObject(dataView);
+    let lastCall = (savedObjectsClient.update as jest.Mock).mock.calls.pop() ?? [];
+    let [, , attrs] = lastCall;
+    expect(attrs).toHaveProperty('fieldFormatMap');
+    expect(attrs.fieldFormatMap).toMatchInlineSnapshot(`"{\\"field\\":{\\"id\\":\\"formatId\\"}}"`);
+    dataView.deleteFieldFormat('field');
+    await indexPatterns.updateSavedObject(dataView);
+    lastCall = (savedObjectsClient.update as jest.Mock).mock.calls.pop() ?? [];
+    [, , attrs] = lastCall;
+
+    // https://github.com/elastic/kibana/issues/134873: must keep an empty object and not delete it
+    expect(attrs).toHaveProperty('fieldFormatMap');
+    expect(attrs.fieldFormatMap).toMatchInlineSnapshot(`"{}"`);
+  });
+
   describe('getDefaultDataView', () => {
     beforeEach(() => {
       indexPatterns.clearCache();

diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -438,6 +438,10 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
   },
+  'observability:apmEnableServiceMetrics': {
+    type: 'boolean',
+    _meta: { description: 'Non-default value of setting.' },
+  },
   'banners:placement': {
     type: 'keyword',
     _meta: { description: 'Non-default value of setting.' },

diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
@@ -42,6 +42,7 @@ export interface UsageStats {
   'observability:maxSuggestions': number;
   'observability:enableComparisonByDefault': boolean;
   'observability:enableServiceGroups': boolean;
+  'observability:apmEnableServiceMetrics': boolean;
   'observability:enableInfrastructureHostsView': boolean;
   'visualize:enableLabs': boolean;
   'visualization:heatmap:maxBuckets': number;

diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
@@ -8702,6 +8702,12 @@
             "description": "Non-default value of setting."
           }
         },
+        "observability:apmEnableServiceMetrics": {
+          "type": "boolean",
+          "_meta": {
+            "description": "Non-default value of setting."
+          }
+        },
         "banners:placement": {
           "type": "keyword",
           "_meta": {
@@ -10323,4 +10329,4 @@
       }
     }
   }
-}
+}
diff --git a/src/plugins/unified_search/public/__stories__/search_bar.stories.tsx b/src/plugins/unified_search/public/__stories__/search_bar.stories.tsx
@@ -566,4 +566,46 @@ storiesOf('SearchBar', module)
       },
       isDisabled: true,
     } as SearchBarProps)
+  )
+  .add('no submit button', () =>
+    wrapSearchBarInContext({
+      dataViewPickerComponentProps: {
+        currentDataViewId: '1234',
+        trigger: {
+          'data-test-subj': 'dataView-switch-link',
+          label: 'logstash-*',
+          title: 'logstash-*',
+        },
+        onChangeDataView: action('onChangeDataView'),
+      },
+      showSubmitButton: false,
+    } as SearchBarProps)
+  )
+  .add('submit button always as icon', () =>
+    wrapSearchBarInContext({
+      dataViewPickerComponentProps: {
+        currentDataViewId: '1234',
+        trigger: {
+          'data-test-subj': 'dataView-switch-link',
+          label: 'logstash-*',
+          title: 'logstash-*',
+        },
+        onChangeDataView: action('onChangeDataView'),
+      },
+      submitButtonStyle: 'iconOnly',
+    } as SearchBarProps)
+  )
+  .add('submit button always as a full button', () =>
+    wrapSearchBarInContext({
+      dataViewPickerComponentProps: {
+        currentDataViewId: '1234',
+        trigger: {
+          'data-test-subj': 'dataView-switch-link',
+          label: 'logstash-*',
+          title: 'logstash-*',
+        },
+        onChangeDataView: action('onChangeDataView'),
+      },
+      submitButtonStyle: 'full',
+    } as SearchBarProps)
   );
diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
@@ -208,6 +208,23 @@ describe('QueryBarTopRowTopRow', () => {
     expect(component.find(TIMEPICKER_SELECTOR).length).toBe(1);
   });
 
+  it('Should render update button as icon button', () => {
+    const component = mount(
+      wrapQueryBarTopRowInContext({
+        isDirty: false,
+        screenTitle: 'Another Screen',
+        showDatePicker: true,
+        showSubmitButton: true,
+        submitButtonStyle: 'iconOnly',
+        dateRangeFrom: 'now-7d',
+        dateRangeTo: 'now',
+        timeHistory: mockTimeHistory,
+      })
+    );
+
+    expect(component.find(REFRESH_BUTTON_SELECTOR).prop('iconOnly')).toBe(true);
+  });
+
   it('Should render the timefilter duration container for sharing', () => {
     const component = mount(
       wrapQueryBarTopRowInContext({

diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
@@ -15,6 +15,7 @@ import type { Filter, TimeRange, Query, AggregateQuery } from '@kbn/es-query';
 import { getAggregateQueryMode, isOfQueryType, isOfAggregateQueryType } from '@kbn/es-query';
 import { EMPTY } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { throttle } from 'lodash';
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -93,6 +94,13 @@ export interface QueryBarTopRowProps<QT extends Query | AggregateQuery = Query>
   filterBar?: React.ReactNode;
   showDatePickerAsBadge?: boolean;
   showSubmitButton?: boolean;
+  /**
+   * Style of the submit button
+   * `iconOnly` - use IconButton
+   * `full` - use SuperUpdateButton
+   * (default) `auto` - `iconOnly` on smaller screens, and `full` on larger screens
+   */
+  submitButtonStyle?: 'auto' | 'iconOnly' | 'full';
   suggestionsSize?: SuggestionsListSize;
   isScreenshotMode?: boolean;
   onTextLangQuerySubmit: (query?: Query | AggregateQuery) => void;
@@ -142,18 +150,23 @@ export const QueryBarTopRow = React.memo(
     const isMobile = useIsWithinBreakpoints(['xs', 's']);
     const [isXXLarge, setIsXXLarge] = useState<boolean>(false);
     const [codeEditorIsExpanded, setCodeEditorIsExpanded] = useState<boolean>(false);
+    const submitButtonStyle: QueryBarTopRowProps['submitButtonStyle'] =
+      props.submitButtonStyle ?? 'auto';
+    const submitButtonIconOnly =
+      submitButtonStyle === 'auto' ? !isXXLarge : submitButtonStyle === 'iconOnly';
 
     useEffect(() => {
-      function handleResize() {
+      if (submitButtonStyle !== 'auto') return;
+
+      const handleResize = throttle(() => {
         setIsXXLarge(window.innerWidth >= 1440);
-      }
+      }, 50);
 
-      window.removeEventListener('resize', handleResize);
       window.addEventListener('resize', handleResize);
       handleResize();
 
       return () => window.removeEventListener('resize', handleResize);
-    }, []);
+    }, [submitButtonStyle]);
 
     const {
       showQueryInput = true,
@@ -404,7 +417,7 @@ export const QueryBarTopRow = React.memo(
         <EuiFlexItem grow={false}>
           <EuiSuperUpdateButton
             iconType={props.isDirty ? iconDirty : 'refresh'}
-            iconOnly={!isXXLarge}
+            iconOnly={submitButtonIconOnly}
             aria-label={props.isLoading ? buttonLabelUpdate : buttonLabelRefresh}
             isDisabled={isDateRangeInvalid || props.isDisabled}
             isLoading={props.isLoading}

diff --git a/src/plugins/unified_search/public/search_bar/create_search_bar.tsx b/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
@@ -193,6 +193,8 @@ export function createSearchBar({
           showQueryBar={props.showQueryBar}
           showQueryInput={props.showQueryInput}
           showSaveQuery={props.showSaveQuery}
+          showSubmitButton={props.showSubmitButton}
+          submitButtonStyle={props.submitButtonStyle}
           isDisabled={props.isDisabled}
           screenTitle={props.screenTitle}
           indexPatterns={props.indexPatterns}

diff --git a/src/plugins/unified_search/public/search_bar/search_bar.tsx b/src/plugins/unified_search/public/search_bar/search_bar.tsx
@@ -26,7 +26,7 @@ import { SavedQueryMeta, SaveQueryForm } from '../saved_query_form';
 import { SavedQueryManagementList } from '../saved_query_management';
 import { QueryBarMenu, QueryBarMenuProps } from '../query_string_input/query_bar_menu';
 import type { DataViewPickerProps, OnSaveTextLanguageQueryProps } from '../dataview_picker';
-import QueryBarTopRow from '../query_string_input/query_bar_top_row';
+import QueryBarTopRow, { QueryBarTopRowProps } from '../query_string_input/query_bar_top_row';
 import { FilterBar, FilterItems } from '../filter_bar';
 import type { SuggestionsListSize } from '../typeahead/suggestions_component';
 import { searchBarStyles } from './search_bar.styles';
@@ -93,6 +93,7 @@ export interface SearchBarOwnProps<QT extends AggregateQuery | Query = Query> {
   textBasedLanguageModeErrors?: Error[];
   onTextBasedSavedAndExit?: ({ onSave }: OnSaveTextLanguageQueryProps) => void;
   showSubmitButton?: boolean;
+  submitButtonStyle?: QueryBarTopRowProps['submitButtonStyle'];
   // defines size of suggestions query popover
   suggestionsSize?: SuggestionsListSize;
   isScreenshotMode?: boolean;
@@ -544,6 +545,7 @@ class SearchBarUI<QT extends (Query | AggregateQuery) | Query = Query> extends C
             this.props.customSubmitButton ? this.props.customSubmitButton : undefined
           }
           showSubmitButton={this.props.showSubmitButton}
+          submitButtonStyle={this.props.submitButtonStyle}
           dataTestSubj={this.props.dataTestSubj}
           indicateNoData={this.props.indicateNoData}
           placeholder={this.props.placeholder}

diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
@@ -31,9 +31,6 @@ const configSchema = schema.object({
     transactionGroupBucketSize: schema.number({ defaultValue: 1000 }),
     maxTraceItems: schema.number({ defaultValue: 1000 }),
   }),
-  searchAggregatedServiceMetrics: schema.boolean({
-    defaultValue: false,
-  }),
   searchAggregatedTransactions: schema.oneOf(
     [
       schema.literal(SearchAggregatedTransactionSetting.auto),

diff --git a/x-pack/plugins/apm/server/lib/helpers/get_service_inventory_search_source.ts b/x-pack/plugins/apm/server/lib/helpers/get_service_inventory_search_source.ts
@@ -11,11 +11,13 @@ import { APMConfig } from '../..';
 
 export async function getServiceInventorySearchSource({
   config,
+  serviceMetricsEnabled,
   apmEventClient,
   start,
   end,
   kuery,
 }: {
+  serviceMetricsEnabled: boolean;
   config: APMConfig;
   apmEventClient: APMEventClient;
   start: number;
@@ -26,16 +28,18 @@ export async function getServiceInventorySearchSource({
   searchAggregatedServiceMetrics: boolean;
 }> {
   const commonProps = {
-    config,
     apmEventClient,
     kuery,
     start,
     end,
   };
   const [searchAggregatedTransactions, searchAggregatedServiceMetrics] =
     await Promise.all([
-      getSearchAggregatedTransactions(commonProps),
-      getSearchAggregatedServiceMetrics(commonProps),
+      getSearchAggregatedTransactions({ ...commonProps, config }),
+      getSearchAggregatedServiceMetrics({
+        ...commonProps,
+        serviceMetricsEnabled,
+      }),
     ]);
 
   return {