github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.x] [Fleet] Allow to enable global logs and metrics dataview creation with config enableManagedLogsAndMetricsDataviews (#205268) (#205330)

Browse source 
# Backport

This will backport the following commits from `main` to `8.x`:
- [[Fleet] Allow to enable global logs and metrics dataview creation
with config enableManagedLogsAndMetricsDataviews
(#205268)](https://github.com/elastic/kibana/pull/205268)

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

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

<!--BACKPORT [{"author":{"name":"Nicolas
Chaulet","email":"nicolas.chaulet@elastic.co"},"sourceCommit":{"committedDate":"2024-12-31T15:02:10Z","message":"[Fleet]
Allow to enable global logs and metrics dataview creation with config
enableManagedLogsAndMetricsDataviews
(#205268)","sha":"dd31e406be605f8db329a9d3bf36164c1425a43c","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor"],"title":"[Fleet]
Allow to enable global logs and metrics dataview creation with config
enableManagedLogsAndMetricsDataviews","number":205268,"url":"https://github.com/elastic/kibana/pull/205268","mergeCommit":{"message":"[Fleet]
Allow to enable global logs and metrics dataview creation with config
enableManagedLogsAndMetricsDataviews
(#205268)","sha":"dd31e406be605f8db329a9d3bf36164c1425a43c"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205268","number":205268,"mergeCommit":{"message":"[Fleet]
Allow to enable global logs and metrics dataview creation with config
enableManagedLogsAndMetricsDataviews
(#205268)","sha":"dd31e406be605f8db329a9d3bf36164c1425a43c"}}]}]
BACKPORT-->

Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
This commit is contained in:
Kibana Machine 2025-01-01 03:51:01 +11:00 • committed by GitHub
parent 02fe437134
commit 6ecf198869
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/settings/fleet-settings.asciidoc
View file

@ -318,3 +318,6 @@ The features in this section are experimental and may be changed or removed comp
Elastic will make a best effort to fix any issues, but experimental features are not supported to the same level as generally available (GA) features.
====
`xpack.fleet.enableManagedLogsAndMetricsDataviews`::
Set to `true` (default), to enable the automatic creation of global `logs-*` and `metrics-*` data views.

1
x-pack/platform/plugins/shared/fleet/common/types/index.ts
View file

@ -50,6 +50,7 @@ export interface FleetConfigType {
outputs?: PreconfiguredOutput[];
agentIdVerificationEnabled?: boolean;
enableExperimental?: string[];
enableManagedLogsAndMetricsDataviews?: boolean;
packageVerification?: {
gpgKeyPath?: string;
};

1
x-pack/platform/plugins/shared/fleet/server/config.ts
View file

@ -131,6 +131,7 @@ export const config: PluginConfigDescriptor = {
{
isAirGapped: schema.maybe(schema.boolean({ defaultValue: false })),
enableDeleteUnenrolledAgents: schema.maybe(schema.boolean({ defaultValue: false })),
enableManagedLogsAndMetricsDataviews: schema.boolean({ defaultValue: true }),
registryUrl: schema.maybe(schema.uri({ scheme: ['http', 'https'] })),
registryProxyUrl: schema.maybe(schema.uri({ scheme: ['http', 'https'] })),
agents: schema.object({

20
x-pack/platform/plugins/shared/fleet/server/services/epm/kibana/assets/install.ts
View file

@ -35,6 +35,7 @@ import { withPackageSpan } from '../../packages/utils';
import { tagKibanaAssets } from './tag_assets';
import { getSpaceAwareSaveobjectsClients } from './saved_objects';
import { appContextService } from '../../..';
const MAX_ASSETS_TO_INSTALL_IN_PARALLEL = 1000;
@ -133,8 +134,10 @@ export async function installKibanaAssets(options: {
return [];
}
await createDefaultIndexPatterns(savedObjectsImporter);
await makeManagedIndexPatternsGlobal(savedObjectsClient);
await installManagedIndexPattern({
savedObjectsClient,
savedObjectsImporter,
});
return await installKibanaSavedObjects({
logger,
@ -144,6 +147,19 @@ export async function installKibanaAssets(options: {
});
}
export async function installManagedIndexPattern({
savedObjectsClient,
savedObjectsImporter,
}: {
savedObjectsClient: SavedObjectsClientContract;
savedObjectsImporter: SavedObjectsImporterContract;
}) {
if (appContextService.getConfig()?.enableManagedLogsAndMetricsDataviews === true) {
await createDefaultIndexPatterns(savedObjectsImporter);
await makeManagedIndexPatternsGlobal(savedObjectsClient);
}
}
export async function createDefaultIndexPatterns(
savedObjectsImporter: SavedObjectsImporterContract
) {

10
x-pack/platform/plugins/shared/fleet/server/services/epm/kibana/assets/install_with_streaming.ts
View file

@ -13,13 +13,11 @@ import { getPathParts } from '../../archive';
import { saveKibanaAssetsRefs } from '../../packages/install';
import { makeManagedIndexPatternsGlobal } from '../index_pattern/install';
import type { ArchiveAsset } from './install';
import {
KibanaSavedObjectTypeMapping,
createDefaultIndexPatterns,
createSavedObjectKibanaAsset,
installManagedIndexPattern,
isKibanaAssetType,
toAssetReference,
} from './install';
@ -45,8 +43,10 @@ export async function installKibanaAssetsWithStreaming({
const { savedObjectClientWithSpace, savedObjectsImporter } =
getSpaceAwareSaveobjectsClients(spaceId);
await createDefaultIndexPatterns(savedObjectsImporter);
await makeManagedIndexPatternsGlobal(savedObjectsClient);
await installManagedIndexPattern({
savedObjectsImporter,
savedObjectsClient,
});
const assetRefs: KibanaAssetReference[] = [];
let batch: ArchiveAsset[] = [];