Skip to content

[9.0] [Oblt Onboarding][Auto Detect] Filter out httpjson inputs and fix accidental config backup file (#216978)#217334

Merged
kibanamachine merged 1 commit intoelastic:9.0from
kibanamachine:backport/9.0/pr-216978
Apr 7, 2025
Merged

[9.0] [Oblt Onboarding][Auto Detect] Filter out httpjson inputs and fix accidental config backup file (#216978)#217334
kibanamachine merged 1 commit intoelastic:9.0from
kibanamachine:backport/9.0/pr-216978

Conversation

@kibanamachine
Copy link
Contributor

Backport

This will backport the following commits from main to 9.0:

Questions ?

Please refer to the Backport tool documentation

…idental config backup file (elastic#216978)

Closes elastic#199744

* Adds a separate `sed` commands for Linux and macOS when replacing API
key within the Agent config. GNU and BSD versions of `sed` treat `-i`
(in-place editing) argument differently, GNU version allows `-i` without
a value while BSD version requires a backup file extension even when
it's empty 🫠
* Adds filtering of unsupported input types inside the integration
policies. For now it only filters out `httpjson`.

## How to test
1. Go through the auto-detect flow
2. Make sure there is no `'elastic-agent.yml='` file in the Agent
directory, or any other weird artifacts
3. Inspect individual integration config files, make sure they don't
have `httpjson` inputs

Co-authored-by: Joe Reuter <johannes.reuter@elastic.co>
(cherry picked from commit ec72d4a)
@kibanamachine kibanamachine merged commit 5ea5a88 into elastic:9.0 Apr 7, 2025
12 checks passed
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

cc @mykolaharmash

mykolaharmash added a commit that referenced this pull request Apr 9, 2025
…fix accidental config backup file (#216978) (#217497)

# Backport

This will backport the following commits from `main` to `8.18`:
- [[Oblt Onboarding][Auto Detect] Filter out httpjson inputs and fix
accidental config backup file
(#216978)](#216978)

<!--- Backport version: 9.6.6 -->

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

<!--BACKPORT [{"author":{"name":"Mykola
Harmash","email":"mykola.harmash@gmail.com"},"sourceCommit":{"committedDate":"2025-04-07T13:57:33Z","message":"[Oblt
Onboarding][Auto Detect] Filter out httpjson inputs and fix accidental
config backup file (#216978)\n\nCloses
https://github.com/elastic/kibana/issues/199744\n\n* Adds a separate
`sed` commands for Linux and macOS when replacing API\nkey within the
Agent config. GNU and BSD versions of `sed` treat `-i`\n(in-place
editing) argument differently, GNU version allows `-i` without\na value
while BSD version requires a backup file extension even when\nit's empty
🫠\n* Adds filtering of unsupported input types inside the
integration\npolicies. For now it only filters out `httpjson`.\n\n## How
to test\n1. Go through the auto-detect flow\n2. Make sure there is no
`'elastic-agent.yml='` file in the Agent\ndirectory, or any other weird
artifacts\n3. Inspect individual integration config files, make sure
they don't\nhave `httpjson` inputs\n\nCo-authored-by: Joe Reuter
<johannes.reuter@elastic.co>","sha":"ec72d4a880cc7c396fc0376bb33bdb2821bc6db5","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","ci:project-deploy-observability","Feature:
Observability
Onboarding","backport:version","v9.1.0","v8.18.1","v9.0.1"],"title":"[Oblt
Onboarding][Auto Detect] Filter out httpjson inputs and fix accidental
config backup
file","number":216978,"url":"https://github.com/elastic/kibana/pull/216978","mergeCommit":{"message":"[Oblt
Onboarding][Auto Detect] Filter out httpjson inputs and fix accidental
config backup file (#216978)\n\nCloses
https://github.com/elastic/kibana/issues/199744\n\n* Adds a separate
`sed` commands for Linux and macOS when replacing API\nkey within the
Agent config. GNU and BSD versions of `sed` treat `-i`\n(in-place
editing) argument differently, GNU version allows `-i` without\na value
while BSD version requires a backup file extension even when\nit's empty
🫠\n* Adds filtering of unsupported input types inside the
integration\npolicies. For now it only filters out `httpjson`.\n\n## How
to test\n1. Go through the auto-detect flow\n2. Make sure there is no
`'elastic-agent.yml='` file in the Agent\ndirectory, or any other weird
artifacts\n3. Inspect individual integration config files, make sure
they don't\nhave `httpjson` inputs\n\nCo-authored-by: Joe Reuter
<johannes.reuter@elastic.co>","sha":"ec72d4a880cc7c396fc0376bb33bdb2821bc6db5"}},"sourceBranch":"main","suggestedTargetBranches":["8.18"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/217334","number":217334,"state":"MERGED","mergeCommit":{"sha":"5ea5a88198dc9bf1a5d235764596ab3914b328e1","message":"[9.0]
[Oblt Onboarding][Auto Detect] Filter out httpjson inputs and fix
accidental config backup file (#216978) (#217334)\n\n# Backport\n\nThis
will backport the following commits from `main` to `9.0`:\n- [[Oblt
Onboarding][Auto Detect] Filter out httpjson inputs and fix\naccidental
config backup
file\n(#216978)](https://github.com/elastic/kibana/pull/216978)\n\n\n\n###
Questions ?\nPlease refer to the [Backport
tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by:
Mykola Harmash
<mykola.harmash@gmail.com>"}},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/216978","number":216978,"mergeCommit":{"message":"[Oblt
Onboarding][Auto Detect] Filter out httpjson inputs and fix accidental
config backup file (#216978)\n\nCloses
https://github.com/elastic/kibana/issues/199744\n\n* Adds a separate
`sed` commands for Linux and macOS when replacing API\nkey within the
Agent config. GNU and BSD versions of `sed` treat `-i`\n(in-place
editing) argument differently, GNU version allows `-i` without\na value
while BSD version requires a backup file extension even when\nit's empty
🫠\n* Adds filtering of unsupported input types inside the
integration\npolicies. For now it only filters out `httpjson`.\n\n## How
to test\n1. Go through the auto-detect flow\n2. Make sure there is no
`'elastic-agent.yml='` file in the Agent\ndirectory, or any other weird
artifacts\n3. Inspect individual integration config files, make sure
they don't\nhave `httpjson` inputs\n\nCo-authored-by: Joe Reuter
<johannes.reuter@elastic.co>","sha":"ec72d4a880cc7c396fc0376bb33bdb2821bc6db5"}},{"branch":"8.18","label":"v8.18.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants