Add support for allow_routing data stream option

elastic · Oct 11, 2022 · d67bef4 · d67bef4
1 parent 782e5de
commit d67bef4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/x-pack/plugins/fleet/common/services/package_to_package_policy.ts b/x-pack/plugins/fleet/common/services/package_to_package_policy.ts
@@ -25,7 +25,7 @@ import {
 } from './policy_template';
 
 type PackagePolicyStream = RegistryStream & { release?: 'beta' | 'experimental' | 'ga' } & {
-  data_stream: { type: string; dataset: string };
+  data_stream: { type: string; dataset: string; allow_routing?: boolean };
 };
 
 export const getStreamsForInputType = (
@@ -47,6 +47,7 @@ export const getStreamsForInputType = (
           data_stream: {
             type: dataStream.type,
             dataset: dataStream.dataset,
+            allow_routing: dataStream.allow_routing,
           },
           release: dataStream.release,
         });

diff --git a/x-pack/plugins/fleet/common/types/models/data_stream.ts b/x-pack/plugins/fleet/common/types/models/data_stream.ts
@@ -10,6 +10,7 @@ export interface DataStream {
   dataset: string;
   namespace: string;
   type: string;
+  allow_routing: boolean;
   package: string;
   package_version: string;
   last_activity_ms: number;

diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -328,10 +328,11 @@ export enum RegistryDataStreamKeys {
   ingest_pipeline = 'ingest_pipeline',
   elasticsearch = 'elasticsearch',
   dataset_is_prefix = 'dataset_is_prefix',
+  allow_routing = 'allow_routing',
 }
 
 export interface RegistryDataStream {
-  [key: string]: any;
+  [key: string]: unknown;
   [RegistryDataStreamKeys.type]: string;
   [RegistryDataStreamKeys.ilm_policy]?: string;
   [RegistryDataStreamKeys.hidden]?: boolean;
@@ -344,6 +345,7 @@ export interface RegistryDataStream {
   [RegistryDataStreamKeys.ingest_pipeline]?: string;
   [RegistryDataStreamKeys.elasticsearch]?: RegistryElasticsearch;
   [RegistryDataStreamKeys.dataset_is_prefix]?: boolean;
+  [RegistryDataStreamKeys.allow_routing]?: boolean;
 }
 
 export interface RegistryElasticsearch {

diff --git a/x-pack/plugins/fleet/common/types/models/package_policy.ts b/x-pack/plugins/fleet/common/types/models/package_policy.ts
@@ -29,6 +29,7 @@ export interface NewPackagePolicyInputStream {
   data_stream: {
     dataset: string;
     type: string;
+    allow_routing?: boolean;
     elasticsearch?: {
       privileges?: {
         indices?: string[];

diff --git a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.ts b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.ts
@@ -99,6 +99,7 @@ export async function storedPackagePoliciesToAgentPermissions(
                     type: stream.data_stream.type,
                     dataset:
                       stream.compiled_stream?.data_stream?.dataset ?? stream.data_stream.dataset,
+                    allow_routing: stream.data_stream.allow_routing,
                   };
 
                   if (stream.data_stream.elasticsearch) {
@@ -140,6 +141,7 @@ interface DataStreamMeta {
   dataset: string;
   dataset_is_prefix?: boolean;
   hidden?: boolean;
+  allow_routing?: boolean;
   elasticsearch?: {
     privileges?: RegistryDataStreamPrivileges;
   };
@@ -158,6 +160,10 @@ export function getDataStreamPrivileges(dataStream: DataStreamMeta, namespace: s
 
   index += `-${namespace}`;
 
+  if (dataStream.allow_routing) {
+    index = `${dataStream.type}-*-*`;
+  }
+
   const privileges = dataStream?.elasticsearch?.privileges?.indices?.length
     ? dataStream.elasticsearch.privileges.indices
     : PACKAGE_POLICY_DEFAULT_INDEX_PRIVILEGES;

diff --git a/...egration/apis/fixtures/test_packages/datastreams/0.2.0/data_stream/test_logs/manifest.yml b/...egration/apis/fixtures/test_packages/datastreams/0.2.0/data_stream/test_logs/manifest.yml
@@ -2,6 +2,8 @@ title: Test Dataset
 
 type: logs
 
+allow_routing: true
+
 elasticsearch:
   index_template.mappings:
     dynamic: true