Skip to content

[Obs AI Assistant] Disable in Logs Essentials mode #223236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sorenlouv merged 9 commits into from
Jun 20, 2025
Merged

[Obs AI Assistant] Disable in Logs Essentials mode #223236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d0926a4
[Obs AI Assistant] Disable in Logs Essentials mode
sorenlouv Jun 10, 2025
2e7ba00
WIP
sorenlouv Jun 11, 2025
733b740
Register project settings from within Obs AI Assistant plugin
sorenlouv Jun 16, 2025
091e076
[CI] Auto-commit changed files from 'ts-node .buildkite/pipeline-reso…
kibanamachine Jun 16, 2025
1b31df8
Revert "Register project settings from within Obs AI Assistant plugin"
sorenlouv Jun 17, 2025
57941dc
Merge branch 'main' of github.com:elastic/kibana into disable-obs-ai-…
sorenlouv Jun 17, 2025
522be09
Apply Rudolfs suggestion
sorenlouv Jun 17, 2025
6b9d9d8
[CI] Auto-commit changed files from 'node scripts/styled_components_m…
kibanamachine Jun 17, 2025
30cba0f
Merge branch 'main' into disable-obs-ai-assistant-in-logs-essential
sorenlouv Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/serverless.oblt.logs_essentials.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@

## Disable xpack plugins
xpack.infra.enabled: false
xpack.slo.enabled: false
xpack.slo.enabled: false
xpack.observabilityAIAssistant.enabled: false
7 changes: 5 additions & 2 deletions src/platform/packages/shared/serverless/settings/observability_project/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ export const OBSERVABILITY_PROJECT_SETTINGS = [
settings.OBSERVABILITY_APM_ENABLE_TABLE_SEARCH_BAR,
settings.OBSERVABILITY_APM_ENABLE_SERVICE_INVENTORY_TABLE_SEARCH_BAR,
settings.OBSERVABILITY_ENTITY_CENTRIC_EXPERIENCE,
settings.OBSERVABILITY_AI_ASSISTANT_SIMULATED_FUNCTION_CALLING,
settings.OBSERVABILITY_AI_ASSISTANT_SEARCH_CONNECTOR_INDEX_PATTERN,
settings.OBSERVABILITY_LOGS_DATA_ACCESS_LOG_SOURCES_ID,
settings.OBSERVABILITY_ENABLE_STREAMS_UI,
];

export const OBSERVABILITY_AI_ASSISTANT_PROJECT_SETTINGS = [
settings.OBSERVABILITY_AI_ASSISTANT_SIMULATED_FUNCTION_CALLING,
settings.OBSERVABILITY_AI_ASSISTANT_SEARCH_CONNECTOR_INDEX_PATTERN,
];
4 changes: 1 addition & 3 deletions x-pack/platform/plugins/shared/observability_ai_assistant/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,5 @@
"@kbn/i18n-react",
"@kbn/inference-tracing"
],
"exclude": [
"target/**/*"
]
"exclude": ["target/**/*"]
}
14 changes: 3 additions & 11 deletions x-pack/solutions/observability/plugins/serverless_observability/kibana.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
{
"type": "plugin",
"id": "@kbn/serverless-observability",
"owner": [
"@elastic/obs-ux-management-team"
],
"owner": ["@elastic/obs-ux-management-team"],
"group": "observability",
"visibility": "private",
"description": "Serverless customizations for observability.",
"plugin": {
"id": "serverlessObservability",
"browser": true,
"server": true,
"configPath": [
"xpack",
"serverless",
"observability"
],
"configPath": ["xpack", "serverless", "observability"],
"requiredPlugins": [
"serverless",
"observability",
Expand All @@ -24,9 +18,7 @@
"discover",
"security"
],
"optionalPlugins": [
"streams"
],
"optionalPlugins": ["streams", "observabilityAIAssistant"],
"requiredBundles": []
}
}
11 changes: 9 additions & 2 deletions x-pack/solutions/observability/plugins/serverless_observability/server/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@

import type { PluginInitializerContext, Plugin, CoreSetup } from '@kbn/core/server';

import { OBSERVABILITY_PROJECT_SETTINGS } from '@kbn/serverless-observability-settings';
import {
OBSERVABILITY_PROJECT_SETTINGS,
OBSERVABILITY_AI_ASSISTANT_PROJECT_SETTINGS,
} from '@kbn/serverless-observability-settings';
import type {
ServerlessObservabilityPluginSetup,
ServerlessObservabilityPluginStart,
Expand All @@ -27,7 +30,11 @@ export class ServerlessObservabilityPlugin
constructor(_initializerContext: PluginInitializerContext) {}

public setup(_coreSetup: CoreSetup, pluginsSetup: SetupDependencies) {
pluginsSetup.serverless.setupProjectSettings(OBSERVABILITY_PROJECT_SETTINGS);
pluginsSetup.serverless.setupProjectSettings([
...OBSERVABILITY_PROJECT_SETTINGS,
...(pluginsSetup.observabilityAIAssistant ? OBSERVABILITY_AI_ASSISTANT_PROJECT_SETTINGS : []),
]);

return {};
}

Expand Down
2 changes: 2 additions & 0 deletions x-pack/solutions/observability/plugins/serverless_observability/server/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import { ObservabilityAIAssistantServerSetup } from '@kbn/observability-ai-assistant-plugin/server';
import { ServerlessPluginSetup } from '@kbn/serverless/server';

// eslint-disable-next-line @typescript-eslint/no-empty-interface
Expand All @@ -17,4 +18,5 @@ export interface StartDependencies {}

export interface SetupDependencies {
serverless: ServerlessPluginSetup;
observabilityAIAssistant?: ObservabilityAIAssistantServerSetup;
}
1 change: 1 addition & 0 deletions x-pack/solutions/observability/plugins/serverless_observability/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"@kbn/discover-plugin",
"@kbn/security-plugin",
"@kbn/streams-plugin",
"@kbn/observability-ai-assistant-plugin",
]
}