From ab8f4670ef5a5cba6cc7330552867c0c045c147b Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Thu, 10 Oct 2024 03:55:56 +1100
Subject: [PATCH] [8.x] [Security Solution][Detection Engine] removes
 unsupported adv settings options for Serverless (#194108) (#195620)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Security Solution][Detection Engine] removes unsupported adv
settings options for Serverless
(#194108)](https://github.com/elastic/kibana/pull/194108)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Vitalii
Dmyterko","email":"92328789+vitaliidm@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-10-09T14:34:32Z","message":"[Security
Solution][Detection Engine] removes unsupported adv settings options for
Serverless (#194108)\n\n## Summary\r\n\r\n - addresses
https://github.com/elastic/kibana/issues/188051\r\n - removes adv
settings options:\r\n - CCS rule privileges warning\r\n - Exclude cold
and frozen tiers in
Analyzer","sha":"f72ab5ef7e072636c87acdbb86da080bcb158a27","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:
SecuritySolution","backport:prev-minor","Team:Detection Engine","8.16
candidate","v8.16.0"],"title":"[Security Solution][Detection Engine]
removes unsupported adv settings options for
Serverless","number":194108,"url":"https://github.com/elastic/kibana/pull/194108","mergeCommit":{"message":"[Security
Solution][Detection Engine] removes unsupported adv settings options for
Serverless (#194108)\n\n## Summary\r\n\r\n - addresses
https://github.com/elastic/kibana/issues/188051\r\n - removes adv
settings options:\r\n - CCS rule privileges warning\r\n - Exclude cold
and frozen tiers in
Analyzer","sha":"f72ab5ef7e072636c87acdbb86da080bcb158a27"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/194108","number":194108,"mergeCommit":{"message":"[Security
Solution][Detection Engine] removes unsupported adv settings options for
Serverless (#194108)\n\n## Summary\r\n\r\n - addresses
https://github.com/elastic/kibana/issues/188051\r\n - removes adv
settings options:\r\n - CCS rule privileges warning\r\n - Exclude cold
and frozen tiers in
Analyzer","sha":"f72ab5ef7e072636c87acdbb86da080bcb158a27"}},{"branch":"8.x","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Vitalii Dmyterko <92328789+vitaliidm@users.noreply.github.com>
---
 packages/kbn-management/settings/setting_ids/index.ts  | 4 ----
 packages/serverless/settings/security_project/index.ts | 2 --
 2 files changed, 6 deletions(-)

diff --git a/packages/kbn-management/settings/setting_ids/index.ts b/packages/kbn-management/settings/setting_ids/index.ts
index a7051804289bd..2b8c5de0b71df 100644
--- a/packages/kbn-management/settings/setting_ids/index.ts
+++ b/packages/kbn-management/settings/setting_ids/index.ts
@@ -178,13 +178,9 @@ export const SECURITY_SOLUTION_RULES_TABLE_REFRESH_ID = 'securitySolution:rulesT
 export const SECURITY_SOLUTION_ENABLE_NEWS_FEED_ID = 'securitySolution:enableNewsFeed';
 export const SECURITY_SOLUTION_NEWS_FEED_URL_ID = 'securitySolution:newsFeedUrl';
 export const SECURITY_SOLUTION_IP_REPUTATION_LINKS_ID = 'securitySolution:ipReputationLinks';
-export const SECURITY_SOLUTION_ENABLE_CCS_WARNING_ID = 'securitySolution:enableCcsWarning';
 export const SECURITY_SOLUTION_SHOW_RELATED_INTEGRATIONS_ID =
   'securitySolution:showRelatedIntegrations';
 export const SECURITY_SOLUTION_DEFAULT_ALERT_TAGS_KEY = 'securitySolution:alertTags' as const;
-/** This Kibana Advanced Setting allows users to enable/disable querying cold and frozen data tiers in analyzer */
-export const SECURITY_SOLUTION_EXCLUDE_COLD_AND_FROZEN_TIERS_IN_ANALYZER =
-  'securitySolution:excludeColdAndFrozenTiersInAnalyzer' as const;
 /** This Kibana Advanced Setting allows users to enable/disable the Asset Criticality feature */
 export const SECURITY_SOLUTION_ENABLE_ASSET_CRITICALITY_SETTING =
   'securitySolution:enableAssetCriticality' as const;
diff --git a/packages/serverless/settings/security_project/index.ts b/packages/serverless/settings/security_project/index.ts
index 3932f924ea94d..dbbf6e506eda8 100644
--- a/packages/serverless/settings/security_project/index.ts
+++ b/packages/serverless/settings/security_project/index.ts
@@ -19,11 +19,9 @@ export const SECURITY_PROJECT_SETTINGS = [
   settings.SECURITY_SOLUTION_DEFAULT_ANOMALY_SCORE_ID,
   settings.SECURITY_SOLUTION_RULES_TABLE_REFRESH_ID,
   settings.SECURITY_SOLUTION_IP_REPUTATION_LINKS_ID,
-  settings.SECURITY_SOLUTION_ENABLE_CCS_WARNING_ID,
   settings.SECURITY_SOLUTION_SHOW_RELATED_INTEGRATIONS_ID,
   settings.SECURITY_SOLUTION_NEWS_FEED_URL_ID,
   settings.SECURITY_SOLUTION_ENABLE_NEWS_FEED_ID,
   settings.SECURITY_SOLUTION_DEFAULT_ALERT_TAGS_KEY,
   settings.SECURITY_SOLUTION_ENABLE_ASSET_CRITICALITY_SETTING,
-  settings.SECURITY_SOLUTION_EXCLUDE_COLD_AND_FROZEN_TIERS_IN_ANALYZER,
 ];