From 68d97f5fb9ff68900cfd15ff28399fbf28b34d75 Mon Sep 17 00:00:00 2001
From: Gerard Soldevila <gerard.soldevila@elastic.co>
Date: Thu, 21 Nov 2024 12:37:02 +0100
Subject: [PATCH] Untangle osquery-plugin deps issues

---
 .eslintrc.js                                                  | 3 ---
 packages/kbn-osquery-io-ts-types/kibana.jsonc                 | 4 +++-
 .../observability/public/components/custom_threshold/types.ts | 2 --
 .../observability_solution/observability/tsconfig.json        | 1 -
 x-pack/plugins/osquery/kibana.jsonc                           | 2 ++
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index e2d02c33288a7..d4b07269a66f8 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2000,9 +2000,6 @@ module.exports = {
         'src/cli_setup/**', // is importing "@kbn/interactive-setup-plugin" (platform/private)
         'src/dev/build/tasks/install_chromium.ts', // is importing "@kbn/screenshotting-plugin" (platform/private)
 
-        // @kbn/osquery-plugin could be categorised as Security, but @kbn/infra-plugin (observability) depends on it!
-        'x-pack/plugins/osquery/**',
-
         // For now, we keep the exception to let tests depend on anythying.
         // Ideally, we need to classify the solution specific ones to reduce CI times
         'test/**',
diff --git a/packages/kbn-osquery-io-ts-types/kibana.jsonc b/packages/kbn-osquery-io-ts-types/kibana.jsonc
index d989501855da2..fa8c5020b0815 100644
--- a/packages/kbn-osquery-io-ts-types/kibana.jsonc
+++ b/packages/kbn-osquery-io-ts-types/kibana.jsonc
@@ -1,5 +1,7 @@
 {
   "type": "shared-common",
   "id": "@kbn/osquery-io-ts-types",
-  "owner": "@elastic/security-asset-management"
+  "owner": "@elastic/security-asset-management",
+  "group": "security",
+  "visibility": "private"
 }
diff --git a/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/types.ts b/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/types.ts
index 2c04cdf8f0767..7d5086323e90b 100644
--- a/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/types.ts
+++ b/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/types.ts
@@ -15,7 +15,6 @@ import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import type { LensPublicStart } from '@kbn/lens-plugin/public';
 import type { ObservabilitySharedPluginStart } from '@kbn/observability-shared-plugin/public';
-import type { OsqueryPluginStart } from '@kbn/osquery-plugin/public';
 import { ALERT_GROUP, ALERT_RULE_PARAMETERS } from '@kbn/rule-data-utils';
 import type { SharePluginStart } from '@kbn/share-plugin/public';
 import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
@@ -72,7 +71,6 @@ export interface InfraClientStartDeps {
   lens: LensPublicStart;
   observability: ObservabilityPublicStart;
   observabilityShared: ObservabilitySharedPluginStart;
-  osquery?: OsqueryPluginStart;
   share: SharePluginStart;
   spaces: SpacesPluginStart;
   storage: IStorageWrapper;
diff --git a/x-pack/plugins/observability_solution/observability/tsconfig.json b/x-pack/plugins/observability_solution/observability/tsconfig.json
index 83c14047131b6..84a691f1033af 100644
--- a/x-pack/plugins/observability_solution/observability/tsconfig.json
+++ b/x-pack/plugins/observability_solution/observability/tsconfig.json
@@ -66,7 +66,6 @@
     "@kbn/discover-plugin",
     "@kbn/embeddable-plugin",
     "@kbn/lens-plugin",
-    "@kbn/osquery-plugin",
     "@kbn/ui-actions-plugin",
     "@kbn/unified-search-plugin",
     "@kbn/lens-embeddable-utils",
diff --git a/x-pack/plugins/osquery/kibana.jsonc b/x-pack/plugins/osquery/kibana.jsonc
index cd8e929da43d9..c2deb366bee9e 100644
--- a/x-pack/plugins/osquery/kibana.jsonc
+++ b/x-pack/plugins/osquery/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/osquery-plugin",
   "owner": "@elastic/security-defend-workflows",
+  "group": "security",
+  "visibility": "private",
   "plugin": {
     "id": "osquery",
     "server": true,