Merge branch 'main' into security/feature/actions-integration

elastic · Apr 14, 2023 · 83755c5 · 83755c5
2 parents 19b26aa + 73be560
commit 83755c5
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 26 deletions.
diff --git a/x-pack/plugins/observability/server/assets/component_templates/slo_mappings_template.ts b/x-pack/plugins/observability/server/assets/component_templates/slo_mappings_template.ts
@@ -43,5 +43,7 @@ export const getSLOMappingsTemplate = (name: string) => ({
   _meta: {
     description: 'Mappings for SLO rollup data',
     version: 1,
+    managed: true,
+    managed_by: 'observability',
   },
 });
diff --git a/x-pack/plugins/observability/server/assets/component_templates/slo_settings_template.ts b/x-pack/plugins/observability/server/assets/component_templates/slo_settings_template.ts
@@ -8,10 +8,14 @@
 export const getSLOSettingsTemplate = (name: string) => ({
   name,
   template: {
-    settings: {},
+    settings: {
+      hidden: true,
+    },
   },
   _meta: {
     description: 'Settings for SLO rollup data',
     version: 1,
+    managed: true,
+    managed_by: 'observability',
   },
 });
diff --git a/x-pack/plugins/observability/server/assets/constants.ts b/x-pack/plugins/observability/server/assets/constants.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-export const SLO_COMPONENT_TEMPLATE_MAPPINGS_NAME = 'slo-observability.sli-mappings';
-export const SLO_COMPONENT_TEMPLATE_SETTINGS_NAME = 'slo-observability.sli-settings';
-export const SLO_INDEX_TEMPLATE_NAME = 'slo-observability.sli';
+export const SLO_COMPONENT_TEMPLATE_MAPPINGS_NAME = '.slo-observability.sli-mappings';
+export const SLO_COMPONENT_TEMPLATE_SETTINGS_NAME = '.slo-observability.sli-settings';
+export const SLO_INDEX_TEMPLATE_NAME = '.slo-observability.sli';
 export const SLO_RESOURCES_VERSION = 1;
 export const SLO_INGEST_PIPELINE_NAME = `${SLO_INDEX_TEMPLATE_NAME}.monthly`;
 export const SLO_DESTINATION_INDEX_NAME = `${SLO_INDEX_TEMPLATE_NAME}-v${SLO_RESOURCES_VERSION}`;

diff --git a/x-pack/plugins/observability/server/assets/index_templates/slo_index_templates.ts b/x-pack/plugins/observability/server/assets/index_templates/slo_index_templates.ts
@@ -13,5 +13,7 @@ export const getSLOIndexTemplate = (name: string, indexPattern: string, composed
   _meta: {
     description: 'Template for SLO rollup data',
     version: 1,
+    managed: true,
+    managed_by: 'observability',
   },
 });
diff --git a/x-pack/plugins/observability/server/assets/ingest_templates/slo_pipeline_template.ts b/x-pack/plugins/observability/server/assets/ingest_templates/slo_pipeline_template.ts
@@ -20,5 +20,7 @@ export const getSLOPipelineTemplate = (id: string, indexNamePrefix: string) => (
   _meta: {
     description: 'SLO ingest pipeline',
     version: 1,
+    managed: true,
+    managed_by: 'observability',
   },
 });
diff --git a/x-pack/plugins/observability/server/assets/transform_templates/slo_transform_template.ts b/x-pack/plugins/observability/server/assets/transform_templates/slo_transform_template.ts
@@ -48,5 +48,7 @@ export const getSLOTransformTemplate = (
   },
   _meta: {
     version: 1,
+    managed: true,
+    managed_by: 'observability',
   },
 });
diff --git a/...ver/services/slo/transform_generators/__snapshots__/apm_transaction_duration.test.ts.snap b/...ver/services/slo/transform_generators/__snapshots__/apm_transaction_duration.test.ts.snap
diff --git a/...r/services/slo/transform_generators/__snapshots__/apm_transaction_error_rate.test.ts.snap b/...r/services/slo/transform_generators/__snapshots__/apm_transaction_error_rate.test.ts.snap
diff --git a/...ervability/server/services/slo/transform_generators/__snapshots__/kql_custom.test.ts.snap b/...ervability/server/services/slo/transform_generators/__snapshots__/kql_custom.test.ts.snap
diff --git a/x-pack/test/fleet_api_integration/apis/index.js b/x-pack/test/fleet_api_integration/apis/index.js
@@ -14,12 +14,10 @@ export default function ({ loadTestFile, getService }) {
     });
 
     // EPM
-    // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/154739
-    // loadTestFile(require.resolve('./epm'));
+    loadTestFile(require.resolve('./epm'));
 
     // Fleet setup
-    // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/154739
-    // loadTestFile(require.resolve('./fleet_setup'));
+    loadTestFile(require.resolve('./fleet_setup'));
 
     // Agents
     loadTestFile(require.resolve('./agents'));
@@ -28,12 +26,10 @@ export default function ({ loadTestFile, getService }) {
     loadTestFile(require.resolve('./enrollment_api_keys/crud'));
 
     // Package policies
-    // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/154739
-    //
-    // loadTestFile(require.resolve('./package_policy/create'));
-    // loadTestFile(require.resolve('./package_policy/update'));
-    // loadTestFile(require.resolve('./package_policy/get'));
-    //
+    loadTestFile(require.resolve('./package_policy/create'));
+    loadTestFile(require.resolve('./package_policy/update'));
+    loadTestFile(require.resolve('./package_policy/get'));
+
     loadTestFile(require.resolve('./package_policy/delete'));
     loadTestFile(require.resolve('./package_policy/upgrade'));
     loadTestFile(require.resolve('./package_policy/input_package_create_upgrade'));