github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.17] [Fleet] Fix agent policy mappings for space awareness (#201689) (#202240)

Browse source 
# Backport

This will backport the following commits from `main` to `8.17`:
- [[Fleet] Fix agent policy mappings for space awareness
(#201689)](https://github.com/elastic/kibana/pull/201689)

<!--- 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-11-28T22:11:10Z","message":"[Fleet]
Fix agent policy mappings for space awareness
(#201689)","sha":"721b4beb1ae7f12171a34d50ba6068b8c2d7288e","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","v8.17.0","v8.16.2"],"title":"[Fleet]
Fix agent policy mappings for space
awareness","number":201689,"url":"https://github.com/elastic/kibana/pull/201689","mergeCommit":{"message":"[Fleet]
Fix agent policy mappings for space awareness
(#201689)","sha":"721b4beb1ae7f12171a34d50ba6068b8c2d7288e"}},"sourceBranch":"main","suggestedTargetBranches":["8.17","8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/201689","number":201689,"mergeCommit":{"message":"[Fleet]
Fix agent policy mappings for space awareness
(#201689)","sha":"721b4beb1ae7f12171a34d50ba6068b8c2d7288e"}},{"branch":"8.17","label":"v8.17.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.2","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
This commit is contained in:
Kibana Machine 2024-11-29 10:56:35 +11:00 • committed by GitHub
parent b88ceaa1bb
commit ec9d831807
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 56 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/kbn-check-mappings-update-cli/current_mappings.json
View file

@ -1593,6 +1593,7 @@
}
},
"fleet-agent-policies": {
"dynamic": false,
"properties": {
"advanced_settings": {
"index": false,
@ -1956,6 +1957,7 @@
"properties": {}
},
"ingest-agent-policies": {
"dynamic": false,
"properties": {
"advanced_settings": {
"index": false,

4
src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
View file

@ -105,7 +105,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
"file": "6b65ae5899b60ebe08656fd163ea532e557d3c98",
"file-upload-usage-collection-telemetry": "06e0a8c04f991e744e09d03ab2bd7f86b2088200",
"fileShare": "5be52de1747d249a221b5241af2838264e19aaa1",
"fleet-agent-policies": "f57d3b70e4175a19a18f18ee72a379ceec82e1fc",
"fleet-agent-policies": "908765a33aab066f4ac09446686b2d884aceed00",
"fleet-fleet-server-host": "69be15f6b6f2a2875ad3c7050ddea7a87f505417",
"fleet-message-signing-keys": "93421f43fed2526b59092a4e3c65d64bc2266c0f",
"fleet-package-policies": "2f4d524adb49a5281d3af0b66bb3003ba0ff2e44",
@ -121,7 +121,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
"infra-custom-dashboards": "1a5994f2e05bb8a1609825ddbf5012f77c5c67f3",
"infrastructure-monitoring-log-view": "5f86709d3c27aed7a8379153b08ee5d3d90d77f5",
"infrastructure-ui-source": "113182d6895764378dfe7fa9fa027244f3a457c4",
"ingest-agent-policies": "5e95e539826a40ad08fd0c1d161da0a4d86ffc6d",
"ingest-agent-policies": "c1818c4119259908875b4c777ae62b11ba0585cd",
"ingest-download-sources": "279a68147e62e4d8858c09ad1cf03bd5551ce58d",
"ingest-outputs": "daafff49255ab700e07491376fe89f04fc998b91",
"ingest-package-policies": "53a94064674835fdb35e5186233bcd7052eabd22",

32
x-pack/plugins/fleet/server/saved_objects/index.test.ts Normal file
View file

@ -0,0 +1,32 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import _ from 'lodash';
import { getSavedObjectTypes } from '.';
describe('space aware models', () => {
it('should have the same mappings for space and non-space aware agent policies', () => {
const soTypes = getSavedObjectTypes();
const legacyMappings = _.omit(
soTypes['ingest-agent-policies'].mappings,
'properties.monitoring_diagnostics',
'properties.monitoring_http',
'properties.monitoring_pprof_enabled'
);
expect(legacyMappings).toEqual(soTypes['fleet-agent-policies'].mappings);
});
it('should have the same mappings for space and non-space aware package policies', () => {
const soTypes = getSavedObjectTypes();
expect(soTypes['ingest-package-policies'].mappings).toEqual(
soTypes['fleet-package-policies'].mappings
);
});
});

20
x-pack/plugins/fleet/server/saved_objects/index.ts
View file

@ -213,6 +213,7 @@ export const getSavedObjectTypes = (
importableAndExportable: false,
},
mappings: {
dynamic: false,
properties: {
name: { type: 'keyword' },
schema_version: { type: 'version' },
@ -304,6 +305,14 @@ export const getSavedObjectTypes = (
},
],
},
'5': {
changes: [
{
type: 'mappings_addition',
addedMappings: {},
},
],
},
},
},
[AGENT_POLICY_SAVED_OBJECT_TYPE]: {
@ -315,6 +324,7 @@ export const getSavedObjectTypes = (
importableAndExportable: false,
},
mappings: {
dynamic: false,
properties: {
name: { type: 'keyword' },
schema_version: { type: 'version' },
@ -349,6 +359,16 @@ export const getSavedObjectTypes = (
global_data_tags: { type: 'flattened', index: false },
},
},
modelVersions: {
'1': {
changes: [
{
type: 'mappings_addition',
addedMappings: {},
},
],
},
},
},
[OUTPUT_SAVED_OBJECT_TYPE]: {
name: OUTPUT_SAVED_OBJECT_TYPE,