Skip to content

Commit

Permalink
[8.x] Support global_data_tags in the policy update request (#194421) (
Browse files Browse the repository at this point in the history
…#194471)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Support global_data_tags in the policy update request
(#194421)](#194421)

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

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

<!--BACKPORT [{"author":{"name":"Toby
Brain","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-30T18:14:11Z","message":"Support
global_data_tags in the policy update request (#194421)\n\n##
Summary\r\n\r\nhttps://github.com//pull/183563 adds
support for\r\n`global_data_tags` however the field is not added to the
update request\r\ndefinition in the OpenAPI spec. This PR defines the
field within the API\r\nspec.\r\nRelated
to\r\nhttps://github.com/elastic/terraform-provider-elasticstack/pull/730\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[x]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [x] [Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed\r\n- [x] Any UI touched in this PR is
usable by keyboard only (learn more\r\nabout [keyboard
accessibility](https://webaim.org/techniques/keyboard/))\r\n- [x] Any UI
touched in this PR does not create any new axe failures\r\n(run axe in
browser:\r\n[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),\r\n[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))\r\n-
[x] If a plugin configuration key changed, check if it needs to
be\r\nallowlisted in the cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[x] This renders correctly on smaller devices using a
responsive\r\nlayout. (You can test this [in
your\r\nbrowser](https://www.browserstack.com/guide/responsive-testing-on-local-server))\r\n-
[x] This was checked for
[cross-browser\r\ncompatibility](https://www.elastic.co/support/matrix#matrix_browsers)\r\n\r\n###
For maintainers\r\n\r\n- [ ] This was checked for breaking API changes
and was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"d922ee1f8c1051633d58b34b5f272619687786de","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-minor"],"title":"Support
global_data_tags in the policy update
request","number":194421,"url":"https://github.com/elastic/kibana/pull/194421","mergeCommit":{"message":"Support
global_data_tags in the policy update request (#194421)\n\n##
Summary\r\n\r\nhttps://github.com//pull/183563 adds
support for\r\n`global_data_tags` however the field is not added to the
update request\r\ndefinition in the OpenAPI spec. This PR defines the
field within the API\r\nspec.\r\nRelated
to\r\nhttps://github.com/elastic/terraform-provider-elasticstack/pull/730\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[x]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [x] [Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed\r\n- [x] Any UI touched in this PR is
usable by keyboard only (learn more\r\nabout [keyboard
accessibility](https://webaim.org/techniques/keyboard/))\r\n- [x] Any UI
touched in this PR does not create any new axe failures\r\n(run axe in
browser:\r\n[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),\r\n[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))\r\n-
[x] If a plugin configuration key changed, check if it needs to
be\r\nallowlisted in the cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[x] This renders correctly on smaller devices using a
responsive\r\nlayout. (You can test this [in
your\r\nbrowser](https://www.browserstack.com/guide/responsive-testing-on-local-server))\r\n-
[x] This was checked for
[cross-browser\r\ncompatibility](https://www.elastic.co/support/matrix#matrix_browsers)\r\n\r\n###
For maintainers\r\n\r\n- [ ] This was checked for breaking API changes
and was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"d922ee1f8c1051633d58b34b5f272619687786de"}},"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/194421","number":194421,"mergeCommit":{"message":"Support
global_data_tags in the policy update request (#194421)\n\n##
Summary\r\n\r\nhttps://github.com//pull/183563 adds
support for\r\n`global_data_tags` however the field is not added to the
update request\r\ndefinition in the OpenAPI spec. This PR defines the
field within the API\r\nspec.\r\nRelated
to\r\nhttps://github.com/elastic/terraform-provider-elasticstack/pull/730\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n- [x] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[x]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [x] [Flaky
Test\r\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\r\nused on any tests changed\r\n- [x] Any UI touched in this PR is
usable by keyboard only (learn more\r\nabout [keyboard
accessibility](https://webaim.org/techniques/keyboard/))\r\n- [x] Any UI
touched in this PR does not create any new axe failures\r\n(run axe in
browser:\r\n[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),\r\n[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))\r\n-
[x] If a plugin configuration key changed, check if it needs to
be\r\nallowlisted in the cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[x] This renders correctly on smaller devices using a
responsive\r\nlayout. (You can test this [in
your\r\nbrowser](https://www.browserstack.com/guide/responsive-testing-on-local-server))\r\n-
[x] This was checked for
[cross-browser\r\ncompatibility](https://www.elastic.co/support/matrix#matrix_browsers)\r\n\r\n###
For maintainers\r\n\r\n- [ ] This was checked for breaking API changes
and was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"d922ee1f8c1051633d58b34b5f272619687786de"}}]}]
BACKPORT-->

Co-authored-by: Toby Brain <[email protected]>
  • Loading branch information
kibanamachine and tobio authored Sep 30, 2024
1 parent 4c6f2e9 commit 137c48e
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 1 deletion.
11 changes: 11 additions & 0 deletions oas_docs/output/kibana.serverless.staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19857,6 +19857,17 @@ components:
force:
description: Force agent policy creation even if packages are not verified.
type: boolean
global_data_tags:
items:
additionalProperties:
oneOf:
- type: string
- type: number
description: >-
User defined data tags that are added to all of the inputs. The
values can be strings or numbers.
type: object
type: array
inactivity_timeout:
type: integer
is_protected:
Expand Down
11 changes: 11 additions & 0 deletions oas_docs/output/kibana.serverless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12821,6 +12821,17 @@ components:
force:
description: Force agent policy creation even if packages are not verified.
type: boolean
global_data_tags:
items:
additionalProperties:
oneOf:
- type: string
- type: number
description: >-
User defined data tags that are added to all of the inputs. The
values can be strings or numbers.
type: object
type: array
inactivity_timeout:
type: integer
is_protected:
Expand Down
11 changes: 11 additions & 0 deletions oas_docs/output/kibana.staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27633,6 +27633,17 @@ components:
force:
description: Force agent policy creation even if packages are not verified.
type: boolean
global_data_tags:
items:
additionalProperties:
oneOf:
- type: string
- type: number
description: >-
User defined data tags that are added to all of the inputs. The
values can be strings or numbers.
type: object
type: array
inactivity_timeout:
type: integer
is_protected:
Expand Down
11 changes: 11 additions & 0 deletions oas_docs/output/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19780,6 +19780,17 @@ components:
force:
description: Force agent policy creation even if packages are not verified.
type: boolean
global_data_tags:
items:
additionalProperties:
oneOf:
- type: string
- type: number
description: >-
User defined data tags that are added to all of the inputs. The
values can be strings or numbers.
type: object
type: array
inactivity_timeout:
type: integer
is_protected:
Expand Down
19 changes: 18 additions & 1 deletion x-pack/plugins/fleet/common/openapi/bundled.json
Original file line number Diff line number Diff line change
Expand Up @@ -7812,6 +7812,23 @@
"force": {
"type": "boolean",
"description": "Force agent policy creation even if packages are not verified."
},
"global_data_tags": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": {
"oneOf": [
{
"type": "string"
},
{
"type": "number"
}
]
},
"description": "User defined data tags that are added to all of the inputs. The values can be strings or numbers."
}
}
},
"required": [
Expand Down Expand Up @@ -9563,4 +9580,4 @@
"basicAuth": []
}
]
}
}
11 changes: 11 additions & 0 deletions x-pack/plugins/fleet/common/openapi/bundled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5011,6 +5011,17 @@ components:
force:
type: boolean
description: Force agent policy creation even if packages are not verified.
global_data_tags:
type: array
items:
type: object
additionalProperties:
oneOf:
- type: string
- type: number
description: >-
User defined data tags that are added to all of the inputs. The
values can be strings or numbers.
required:
- name
- namespace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ properties:
force:
type: boolean
description: Force agent policy creation even if packages are not verified.
global_data_tags:
type: array
items:
type: object
additionalProperties:
oneOf:
- type: string
- type: number
description: User defined data tags that are added to all of the inputs. The values can be strings or numbers.
required:
- name
- namespace

0 comments on commit 137c48e

Please sign in to comment.