Merge branch 'main' into implement/ftr-ccs-support

.github/CODEOWNERS

@@ -425,8 +425,8 @@ x-pack/plugins/session_view @elastic/awp-platform
 # Security Asset Management
 /x-pack/plugins/osquery @elastic/security-asset-management
 
-# Cloud Posture Security
-/x-pack/plugins/cloud_security_posture/ @elastic/cloud-posture-security
+# Cloud Security Posture
+/x-pack/plugins/cloud_security_posture/ @elastic/cloud-security-posture-control-plane
 
 # Design (at the bottom for specificity of SASS files)
 **/*.scss  @elastic/kibana-design

docs/development/core/public/kibana-plugin-core-public.savedobjectsclient.bulkupdate.md

@@ -9,7 +9,7 @@ Update multiple documents at once
 <b>Signature:</b>
 
 ```typescript
-bulkUpdate<T = unknown>(objects?: SavedObjectsBulkUpdateObject[]): Promise<SavedObjectsBatchResponse<unknown>>;
+bulkUpdate<T = unknown>(objects?: SavedObjectsBulkUpdateObject[]): Promise<SavedObjectsBatchResponse<T>>;
 ```
 
 ## Parameters
@@ -20,7 +20,7 @@ bulkUpdate<T = unknown>(objects?: SavedObjectsBulkUpdateObject[]): Promise<Saved
 
 <b>Returns:</b>
 
-Promise&lt;SavedObjectsBatchResponse&lt;unknown&gt;&gt;
+Promise&lt;SavedObjectsBatchResponse&lt;T&gt;&gt;
 
 The result of the update operation containing both failed and updated saved objects.
 

src/core/public/public.api.md

@@ -1128,7 +1128,7 @@ export class SavedObjectsClient {
     }>) => Promise<{
         resolved_objects: ResolvedSimpleSavedObject<T>[];
     }>;
-    bulkUpdate<T = unknown>(objects?: SavedObjectsBulkUpdateObject[]): Promise<SavedObjectsBatchResponse<unknown>>;
+    bulkUpdate<T = unknown>(objects?: SavedObjectsBulkUpdateObject[]): Promise<SavedObjectsBatchResponse<T>>;
     create: <T = unknown>(type: string, attributes: T, options?: SavedObjectsCreateOptions) => Promise<SimpleSavedObject<T>>;
     // Warning: (ae-forgotten-export) The symbol "SavedObjectsDeleteOptions" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "SavedObjectsClientContract" needs to be exported by the entry point index.d.ts

src/core/public/saved_objects/saved_objects_client.ts

@@ -596,7 +596,7 @@ export class SavedObjectsClient {
       return renameKeys<
         PromiseType<ReturnType<SavedObjectsApi['bulkUpdate']>>,
         SavedObjectsBatchResponse
-      >({ saved_objects: 'savedObjects' }, resp) as SavedObjectsBatchResponse;
+      >({ saved_objects: 'savedObjects' }, resp) as SavedObjectsBatchResponse<T>;
     });
   }
 

src/plugins/console/public/application/components/settings_modal.tsx

@@ -70,6 +70,7 @@ export function DevToolsSettingsModal(props: Props) {
   const [fields, setFields] = useState(props.settings.autocomplete.fields);
   const [indices, setIndices] = useState(props.settings.autocomplete.indices);
   const [templates, setTemplates] = useState(props.settings.autocomplete.templates);
+  const [dataStreams, setDataStreams] = useState(props.settings.autocomplete.dataStreams);
   const [polling, setPolling] = useState(props.settings.polling);
   const [pollInterval, setPollInterval] = useState(props.settings.pollInterval);
   const [tripleQuotes, setTripleQuotes] = useState(props.settings.tripleQuotes);
@@ -97,12 +98,20 @@ export function DevToolsSettingsModal(props: Props) {
       }),
       stateSetter: setTemplates,
     },
+    {
+      id: 'dataStreams',
+      label: i18n.translate('console.settingsPage.dataStreamsLabelText', {
+        defaultMessage: 'Data streams',
+      }),
+      stateSetter: setDataStreams,
+    },
   ];
 
   const checkboxIdToSelectedMap = {
     fields,
     indices,
     templates,
+    dataStreams,
   };
 
   const onAutocompleteChange = (optionId: AutocompleteOptions) => {
@@ -120,6 +129,7 @@ export function DevToolsSettingsModal(props: Props) {
         fields,
         indices,
         templates,
+        dataStreams,
       },
       polling,
       pollInterval,
@@ -170,6 +180,7 @@ export function DevToolsSettingsModal(props: Props) {
               fields,
               indices,
               templates,
+              dataStreams,
             });
           }}
         >

src/plugins/console/public/lib/autocomplete/components/data_stream_autocomplete_component.js

@@ -0,0 +1,20 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { getDataStreams } from '../../mappings/mappings';
+import { ListComponent } from './list_component';
+
+export class DataStreamAutocompleteComponent extends ListComponent {
+  constructor(name, parent, multiValued) {
+    super(name, getDataStreams, parent, multiValued);
+  }
+
+  getContextKey() {
+    return 'data_stream';
+  }
+}

src/plugins/console/public/lib/autocomplete/components/index.js

@@ -23,4 +23,5 @@ export { IdAutocompleteComponent } from './id_autocomplete_component';
 export { UsernameAutocompleteComponent } from './username_autocomplete_component';
 export { IndexTemplateAutocompleteComponent } from './index_template_autocomplete_component';
 export { ComponentTemplateAutocompleteComponent } from './component_template_autocomplete_component';
+export { DataStreamAutocompleteComponent } from './data_stream_autocomplete_component';
 export * from './legacy';

src/plugins/console/public/lib/kb/kb.js

@@ -16,6 +16,7 @@ import {
   UsernameAutocompleteComponent,
   IndexTemplateAutocompleteComponent,
   ComponentTemplateAutocompleteComponent,
+  DataStreamAutocompleteComponent,
 } from '../autocomplete/components';
 
 import $ from 'jquery';
@@ -94,6 +95,9 @@ const parametrizedComponentFactories = {
   component_template: function (name, parent) {
     return new ComponentTemplateAutocompleteComponent(name, parent);
   },
+  data_stream: function (name, parent) {
+    return new DataStreamAutocompleteComponent(name, parent);
+  },
 };
 
 export function getUnmatchedEndpointComponents() {

src/plugins/console/public/lib/mappings/mapping.test.js

@@ -266,4 +266,13 @@ describe('Mappings', () => {
     expect(mappings.getIndexTemplates()).toEqual(expectedResult);
     expect(mappings.getComponentTemplates()).toEqual(expectedResult);
   });
+
+  test('Data streams', function () {
+    mappings.loadDataStreams({
+      data_streams: [{ name: 'test_index1' }, { name: 'test_index2' }, { name: 'test_index3' }],
+    });
+
+    const expectedResult = ['test_index1', 'test_index2', 'test_index3'];
+    expect(mappings.getDataStreams()).toEqual(expectedResult);
+  });
 });

src/plugins/console/public/lib/mappings/mappings.js

@@ -17,6 +17,7 @@ let perAliasIndexes = [];
 let legacyTemplates = [];
 let indexTemplates = [];
 let componentTemplates = [];
+let dataStreams = [];
 
 const mappingObj = {};
 
@@ -60,6 +61,10 @@ export function getComponentTemplates() {
   return [...componentTemplates];
 }
 
+export function getDataStreams() {
+  return [...dataStreams];
+}
+
 export function getFields(indices, types) {
   // get fields for indices and types. Both can be a list, a string or null (meaning all).
   let ret = [];
@@ -128,7 +133,9 @@ export function getTypes(indices) {
 export function getIndices(includeAliases) {
   const ret = [];
   $.each(perIndexTypes, function (index) {
-    ret.push(index);
+    if (!index.startsWith('.ds')) {
+      ret.push(index);
+    }
   });
   if (typeof includeAliases === 'undefined' ? true : includeAliases) {
     $.each(perAliasIndexes, function (alias) {
@@ -204,6 +211,10 @@ export function loadComponentTemplates(data) {
   componentTemplates = (data.component_templates ?? []).map(({ name }) => name);
 }
 
+export function loadDataStreams(data) {
+  dataStreams = (data.data_streams ?? []).map(({ name }) => name);
+}
+
 export function loadMappings(mappings) {
   perIndexTypes = {};
 
@@ -265,6 +276,7 @@ function retrieveSettings(settingsKey, settingsToRetrieve) {
     legacyTemplates: '_template',
     indexTemplates: '_index_template',
     componentTemplates: '_component_template',
+    dataStreams: '_data_stream',
   };
 
   // Fetch autocomplete info if setting is set to true, and if user has made changes.
@@ -326,14 +338,16 @@ export function retrieveAutoCompleteInfo(settings, settingsToRetrieve) {
     'componentTemplates',
     templatesSettingToRetrieve
   );
+  const dataStreamsPromise = retrieveSettings('dataStreams', settingsToRetrieve);
 
   $.when(
     mappingPromise,
     aliasesPromise,
     legacyTemplatesPromise,
     indexTemplatesPromise,
-    componentTemplatesPromise
-  ).done((mappings, aliases, legacyTemplates, indexTemplates, componentTemplates) => {
+    componentTemplatesPromise,
+    dataStreamsPromise
+  ).done((mappings, aliases, legacyTemplates, indexTemplates, componentTemplates, dataStreams) => {
     let mappingsResponse;
     try {
       if (mappings && mappings.length) {
@@ -365,6 +379,10 @@ export function retrieveAutoCompleteInfo(settings, settingsToRetrieve) {
         loadComponentTemplates(JSON.parse(componentTemplates[0]));
       }
 
+      if (dataStreams) {
+        loadDataStreams(JSON.parse(dataStreams[0]));
+      }
+
       if (mappings && aliases) {
         // Trigger an update event with the mappings, aliases
         $(mappingObj).trigger('update', [mappingsResponse, aliases[0]]);

src/plugins/console/public/services/settings.ts

@@ -14,7 +14,7 @@ export const DEFAULT_SETTINGS = Object.freeze({
   pollInterval: 60000,
   tripleQuotes: true,
   wrapMode: true,
-  autocomplete: Object.freeze({ fields: true, indices: true, templates: true }),
+  autocomplete: Object.freeze({ fields: true, indices: true, templates: true, dataStreams: true }),
   historyDisabled: false,
 });
 
@@ -25,6 +25,7 @@ export interface DevToolsSettings {
     fields: boolean;
     indices: boolean;
     templates: boolean;
+    dataStreams: boolean;
   };
   polling: boolean;
   pollInterval: number;

src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_data_stream.json

@@ -13,7 +13,7 @@
       "DELETE"
     ],
     "patterns": [
-      "_data_stream/{name}"
+      "_data_stream/{data_stream}"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html"
   }

src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_data_stream.json

@@ -14,7 +14,8 @@
     ],
     "patterns": [
       "_data_stream",
-      "_data_stream/{name}"
+      "_data_stream/{name}",
+      "{data_stream}"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html"
   }

src/plugins/data_views/common/data_views/data_views.ts

@@ -424,7 +424,7 @@ export class DataViewsService {
     );
 
     if (!savedObject.version) {
-      throw new SavedObjectNotFound(DATA_VIEW_SAVED_OBJECT_TYPE, id, 'management/kibana/dataViews');
+      throw new SavedObjectNotFound('data view', id, 'management/kibana/dataViews');
     }
 
     return this.initFromSavedObject(savedObject);

src/plugins/presentation_util/public/services/create/dependency_manager.test.ts

@@ -24,6 +24,16 @@ describe('DependencyManager', () => {
     expect(DependencyManager.orderDependencies(graph)).toEqual(sortedTopology);
   });
 
+  it('should include final vertex if it has dependencies', () => {
+    const graph = {
+      A: [],
+      B: [],
+      C: ['A', 'B'],
+    };
+    const sortedTopology = ['A', 'B', 'C'];
+    expect(DependencyManager.orderDependencies(graph)).toEqual(sortedTopology);
+  });
+
   it('orderDependencies. Should return base topology if no depended vertices', () => {
     const graph = {
       N: [],
@@ -34,22 +44,34 @@ describe('DependencyManager', () => {
     expect(DependencyManager.orderDependencies(graph)).toEqual(sortedTopology);
   });
 
-  it('orderDependencies. Should detect circular dependencies and throw error with path', () => {
-    const graph = {
-      N: ['R'],
-      R: ['A'],
-      A: ['B'],
-      B: ['C'],
-      C: ['D'],
-      D: ['E'],
-      E: ['F'],
-      F: ['L'],
-      L: ['G'],
-      G: ['N'],
-    };
-    const circularPath = ['N', 'R', 'A', 'B', 'C', 'D', 'E', 'F', 'L', 'G', 'N'].join(' -> ');
-    const errorMessage = `Circular dependency detected while setting up services: ${circularPath}`;
+  describe('circular dependencies', () => {
+    it('should detect circular dependencies and throw error with path', () => {
+      const graph = {
+        N: ['R'],
+        R: ['A'],
+        A: ['B'],
+        B: ['C'],
+        C: ['D'],
+        D: ['E'],
+        E: ['F'],
+        F: ['L'],
+        L: ['G'],
+        G: ['N'],
+      };
+      const circularPath = ['G', 'L', 'F', 'E', 'D', 'C', 'B', 'A', 'R', 'N'].join(' -> ');
+      const errorMessage = `Circular dependency detected while setting up services: ${circularPath}`;
+
+      expect(() => DependencyManager.orderDependencies(graph)).toThrowError(errorMessage);
+    });
+
+    it('should detect circular dependency if circular reference is the first dependency for a vertex', () => {
+      const graph = {
+        A: ['B'],
+        B: ['A', 'C'],
+        C: [],
+      };
 
-    expect(() => DependencyManager.orderDependencies(graph)).toThrowError(errorMessage);
+      expect(() => DependencyManager.orderDependencies(graph)).toThrow();
+    });
   });
 });