Merge branch 'main' into oaia-show-error-on-failure

elastic · Mar 25, 2024 · d6ade35 · d6ade35
2 parents 42c8a9c + a49b7c1
commit d6ade35
Show file tree

Hide file tree

Showing 119 changed files with 1,021 additions and 12,101 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -11,7 +11,6 @@ x-pack/plugins/actions @elastic/response-ops
 x-pack/test/alerting_api_integration/common/plugins/actions_simulators @elastic/response-ops
 packages/kbn-actions-types @elastic/response-ops
 src/plugins/advanced_settings @elastic/appex-sharedux @elastic/kibana-management
-src/plugins/ai_assistant_management/observability @elastic/obs-knowledge-team
 src/plugins/ai_assistant_management/selection @elastic/obs-knowledge-team
 x-pack/packages/ml/aiops_components @elastic/ml-ui
 x-pack/plugins/aiops @elastic/ml-ui
@@ -583,6 +582,7 @@ src/plugins/no_data_page @elastic/appex-sharedux
 x-pack/plugins/notifications @elastic/appex-sharedux
 packages/kbn-object-versioning @elastic/appex-sharedux
 x-pack/plugins/observability_solution/observability_ai_assistant_app @elastic/obs-knowledge-team
+x-pack/plugins/observability_solution/observability_ai_assistant_management @elastic/obs-knowledge-team
 x-pack/plugins/observability_solution/observability_ai_assistant @elastic/obs-knowledge-team
 x-pack/packages/observability/alert_details @elastic/obs-ux-management-team
 x-pack/packages/observability/alerting_test_data @elastic/obs-ux-management-team

diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
@@ -23,8 +23,7 @@
 - 'Team:obs-ux-management':
     - 'x-pack/plugins/observability_solution/observability/**/*.*'
 - 'Team:obs-knowledge':
-    - 'src/plugins/ai_assistant_management/observability/**/*.*'
     - 'x-pack/plugins/observability_solution/observability_ai_assistant/**/*.*'
-    - 'x-pack/plugins/observability_solution/observability_ai_assistant_app/**/*.*'
+    - 'x-pack/plugins/observability_solution/observability_ai_assistant_*/**/*.*'
     - 'x-pack/test/observability_ai_assistant_api_integration/**/*.*'
     - 'x-pack/test/observability_ai_assistant_functional/**/*.*'
diff --git a/.i18nrc.json b/.i18nrc.json
@@ -2,7 +2,6 @@
   "paths": {
     "advancedSettings": "src/plugins/advanced_settings",
     "aiAssistantManagementSelection": "src/plugins/ai_assistant_management/selection",
-    "aiAssistantManagementObservability": "src/plugins/ai_assistant_management/observability",
     "alerts": "packages/kbn-alerts/src",
     "alertsUIShared": "packages/kbn-alerts-ui-shared/src",
     "alertingTypes": "packages/kbn-alerting-types",
@@ -89,10 +88,7 @@
       "packages/kbn-management"
     ],
     "monaco": "packages/kbn-monaco/src",
-    "navigation": [
-      "src/plugins/navigation",
-      "packages/solution-nav"
-    ],
+    "navigation": ["src/plugins/navigation", "packages/solution-nav"],
     "links": "src/plugins/links",
     "newsfeed": "src/plugins/newsfeed",
     "presentationUtil": "src/plugins/presentation_util",

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -28,10 +28,6 @@ allowing users to configure their advanced settings, also known
 as uiSettings within the code.
 
 
-|{kib-repo}blob/{branch}/src/plugins/ai_assistant_management/observability/README.md[aiAssistantManagementObservability]
-|The aiAssistantManagementObservability plugin manages the Ai Assistant for Observability management section.
-
-
 |{kib-repo}blob/{branch}/src/plugins/ai_assistant_management/selection/README.md[aiAssistantManagementSelection]
 |The aiAssistantManagementSelection plugin manages the Ai Assistant management section.
 
@@ -696,6 +692,10 @@ Elastic.
 |This app registers defaults functions. It exists as a separate plugin to avoid cyclical dependencies.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/observability_ai_assistant_management/README.md[observabilityAiAssistantManagement]
+|The observabilityAiAssistantManagement plugin manages the Ai Assistant for Observability management section.
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/observability_logs_explorer/README.md[observabilityLogsExplorer]
 |This plugin provides an app based on the LogsExplorer component from the logs_explorer plugin, but adds observability-specific affordances.
 

diff --git a/package.json b/package.json
@@ -139,7 +139,6 @@
     "@kbn/actions-simulators-plugin": "link:x-pack/test/alerting_api_integration/common/plugins/actions_simulators",
     "@kbn/actions-types": "link:packages/kbn-actions-types",
     "@kbn/advanced-settings-plugin": "link:src/plugins/advanced_settings",
-    "@kbn/ai-assistant-management-observability-plugin": "link:src/plugins/ai_assistant_management/observability",
     "@kbn/ai-assistant-management-plugin": "link:src/plugins/ai_assistant_management/selection",
     "@kbn/aiops-components": "link:x-pack/packages/ml/aiops_components",
     "@kbn/aiops-plugin": "link:x-pack/plugins/aiops",
@@ -602,6 +601,7 @@
     "@kbn/notifications-plugin": "link:x-pack/plugins/notifications",
     "@kbn/object-versioning": "link:packages/kbn-object-versioning",
     "@kbn/observability-ai-assistant-app-plugin": "link:x-pack/plugins/observability_solution/observability_ai_assistant_app",
+    "@kbn/observability-ai-assistant-management-plugin": "link:x-pack/plugins/observability_solution/observability_ai_assistant_management",
     "@kbn/observability-ai-assistant-plugin": "link:x-pack/plugins/observability_solution/observability_ai_assistant",
     "@kbn/observability-alert-details": "link:x-pack/packages/observability/alert_details",
     "@kbn/observability-alerting-test-data": "link:x-pack/packages/observability/alerting_test_data",
@@ -1102,7 +1102,6 @@
     "redux": "^4.2.1",
     "redux-actions": "^2.6.5",
     "redux-devtools-extension": "^2.13.8",
-    "redux-logger": "^3.0.6",
     "redux-saga": "^1.1.3",
     "redux-thunk": "^2.4.2",
     "redux-thunks": "^1.0.0",
@@ -1487,7 +1486,6 @@
     "@types/react-virtualized": "^9.21.22",
     "@types/react-window": "^1.8.5",
     "@types/redux-actions": "^2.6.1",
-    "@types/redux-logger": "^3.0.8",
     "@types/resolve": "^1.20.1",
     "@types/seedrandom": ">=2.0.0 <4.0.0",
     "@types/selenium-webdriver": "^4.1.21",

diff --git a/packages/deeplinks/management/deep_links.ts b/packages/deeplinks/management/deep_links.ts
@@ -28,7 +28,7 @@ export type IntegrationsDeepLinkId = IntegrationsAppId | FleetAppId | OsQueryApp
 export type ManagementAppId = typeof MANAGEMENT_APP_ID;
 export type ManagementId =
   | 'aiAssistantManagementSelection'
-  | 'aiAssistantManagementObservability'
+  | 'observabilityAiAssistantManagement'
   | 'api_keys'
   | 'cases'
   | 'cross_cluster_replication'

diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
@@ -1,7 +1,6 @@
 pageLoadAssetSize:
   actions: 20000
   advancedSettings: 27596
-  aiAssistantManagementObservability: 19279
   aiAssistantManagementSelection: 19146
   aiops: 10000
   alerting: 106936
@@ -106,6 +105,7 @@ pageLoadAssetSize:
   observability: 167673
   observabilityAIAssistant: 58230
   observabilityAIAssistantApp: 27680
+  observabilityAiAssistantManagement: 19279
   observabilityLogsExplorer: 46650
   observabilityOnboarding: 19573
   observabilityShared: 72039

diff --git a/packages/kbn-search-connectors/types/native_connectors.ts b/packages/kbn-search-connectors/types/native_connectors.ts
@@ -93,6 +93,10 @@ const PORT_LABEL = i18n.translate('searchConnectors.nativeConnectors.portLabel',
   defaultMessage: 'Port',
 });
 
+const PERSONAL_ACCESS_TOKEN = 'personal_access_token';
+
+const GITHUB_APP = 'github_app';
+
 export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | undefined> = {
   azure_blob_storage: {
     configuration: {
@@ -710,7 +714,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         depends_on: [],
         display: DisplayType.DROPDOWN,
         label: i18n.translate('searchConnectors.nativeConnectors.github.label', {
-          defaultMessage: 'GitHub data source',
+          defaultMessage: 'Data source',
         }),
         options: [
           {
@@ -745,7 +749,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         ],
         display: DisplayType.TEXTBOX,
         label: i18n.translate('searchConnectors.nativeConnectors.github.url.label', {
-          defaultMessage: 'GitHub URL',
+          defaultMessage: 'Server URL',
         }),
         options: [],
         order: 2,
@@ -757,15 +761,53 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         validations: [],
         value: '',
       },
-      token: {
+      auth_method: {
         default_value: null,
         depends_on: [],
+        display: DisplayType.DROPDOWN,
+        label: i18n.translate('searchConnectors.nativeConnectors.github.authMethod.label', {
+          defaultMessage: 'Authentication method',
+        }),
+        options: [
+          {
+            label: i18n.translate(
+              'searchConnectors.nativeConnectors.github.options.personalAccessToken',
+              {
+                defaultMessage: 'Personal access token',
+              }
+            ),
+            value: PERSONAL_ACCESS_TOKEN,
+          },
+          {
+            label: i18n.translate('searchConnectors.nativeConnectors.github.options.githubApp', {
+              defaultMessage: 'GitHub App',
+            }),
+            value: GITHUB_APP,
+          },
+        ],
+        order: 3,
+        required: true,
+        sensitive: false,
+        tooltip: null,
+        type: FieldType.STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: PERSONAL_ACCESS_TOKEN,
+      },
+      token: {
+        default_value: null,
+        depends_on: [
+          {
+            field: 'auth_method',
+            value: PERSONAL_ACCESS_TOKEN,
+          },
+        ],
         display: DisplayType.TEXTBOX,
         label: i18n.translate('searchConnectors.nativeConnectors.github.token.label', {
-          defaultMessage: 'GitHub Token',
+          defaultMessage: 'Token',
         }),
         options: [],
-        order: 3,
+        order: 4,
         required: true,
         sensitive: true,
         tooltip: null,
@@ -795,7 +837,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'other',
           },
         ],
-        order: 4,
+        order: 5,
         required: true,
         sensitive: false,
         tooltip: i18n.translate('searchConnectors.nativeConnectors.github.repo_type', {
@@ -810,6 +852,10 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       org_name: {
         default_value: null,
         depends_on: [
+          {
+            field: 'auth_method',
+            value: PERSONAL_ACCESS_TOKEN,
+          },
           {
             field: 'repo_type',
             value: 'organization',
@@ -820,10 +866,54 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           defaultMessage: 'Organization Name',
         }),
         options: [],
-        order: 5,
+        order: 6,
+        required: true,
+        sensitive: false,
+        tooltip: null,
+        type: FieldType.STRING,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
+      app_id: {
+        default_value: null,
+        depends_on: [
+          {
+            field: 'auth_method',
+            value: GITHUB_APP,
+          },
+        ],
+        display: DisplayType.NUMERIC,
+        label: i18n.translate('searchConnectors.nativeConnectors.github.appID.label', {
+          defaultMessage: 'App ID',
+        }),
+        options: [],
+        order: 7,
         required: true,
         sensitive: false,
         tooltip: null,
+        type: FieldType.INTEGER,
+        ui_restrictions: [],
+        validations: [],
+        value: '',
+      },
+      private_key: {
+        default_value: null,
+        depends_on: [
+          {
+            field: 'auth_method',
+            value: GITHUB_APP,
+          },
+        ],
+        display: DisplayType.TEXTAREA,
+        label: i18n.translate('searchConnectors.nativeConnectors.github.privateKey.label', {
+          defaultMessage: 'App private key',
+        }),
+        options: [],
+        order: 8,
+        required: true,
+        sensitive: true,
+        tooltip: null,
         type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
@@ -837,7 +927,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
           defaultMessage: 'List of repositories',
         }),
         options: [],
-        order: 6,
+        order: 9,
         required: true,
         sensitive: false,
         tooltip: i18n.translate('searchConnectors.nativeConnectors.github.listOfRepos.tooltip', {
@@ -854,7 +944,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         display: DisplayType.TOGGLE,
         label: ENABLE_SSL_LABEL,
         options: [],
-        order: 7,
+        order: 10,
         required: true,
         sensitive: false,
         tooltip: null,
@@ -874,7 +964,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         display: DisplayType.TEXTBOX,
         label: SSL_CERTIFICATE_LABEL,
         options: [],
-        order: 8,
+        order: 11,
         required: true,
         sensitive: false,
         tooltip: null,
@@ -889,7 +979,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         display: DisplayType.NUMERIC,
         label: RETRIES_PER_REQUEST_LABEL,
         options: [],
-        order: 9,
+        order: 12,
         required: false,
         sensitive: false,
         tooltip: null,
@@ -904,7 +994,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         display: DisplayType.TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
-        order: 10,
+        order: 13,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
@@ -924,7 +1014,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         display: DisplayType.TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
-        order: 11,
+        order: 14,
         required: true,
         sensitive: false,
         tooltip: i18n.translate(

diff --git a/src/plugins/ai_assistant_management/observability/README.md b/src/plugins/ai_assistant_management/observability/README.md
diff --git a/src/plugins/ai_assistant_management/observability/jest.config.js b/src/plugins/ai_assistant_management/observability/jest.config.js
diff --git a/...i_assistant_management/selection/public/routes/components/ai_assistant_selection_page.tsx b/...i_assistant_management/selection/public/routes/components/ai_assistant_selection_page.tsx
@@ -109,7 +109,7 @@ export function AiAssistantSelectionPage() {
             )}
             titleSize="xs"
             onClick={() =>
-              navigateToApp('management', { path: 'kibana/aiAssistantManagementObservability' })
+              navigateToApp('management', { path: 'kibana/observabilityAiAssistantManagement' })
             }
           />
         </EuiFlexItem>