Skip to content
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

Jump to bottom

[integration automatic-import] Missing input config fix #188695

Merged
merged 2 commits into from
Jul 19, 2024
Merged

[integration automatic-import] Missing input config fix #188695

merged 2 commits into from
Jul 19, 2024
+22 −22

Conversation

kgeller
Copy link
Contributor

@kgeller kgeller commented Jul 18, 2024 •
edited by kibanamachine
Loading

Summary

  • Fixing missing configuration options by correcting input names from _ to -
  • Prefixing ECS version with v in build file
Screenshot 2024-07-18 at 3 48 42 PM

@kgeller kgeller added release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. v8.15.0 v8.16.0 labels Jul 18, 2024
@kgeller kgeller self-assigned this Jul 18, 2024
@kgeller kgeller requested a review from a team as a code owner July 18, 2024 20:29
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-solution (Team: SecuritySolution)

@ebeahan
Copy link
Member

ebeahan commented Jul 18, 2024

Do the input template files need their names changed?

One example - looking at the manifest template for the AWS Cloudwatch input type, it's referencing template_path: aws-cloudwatch.yml.hbs but the template's filename is using an underscore, aws_cloudwatch.yml.hbs.

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Jest Tests #12 / CustomFields renders correctly

Metrics [docs]

✅ unchanged

cc @kgeller

bhapas
bhapas approved these changes Jul 19, 2024
View reviewed changes
Copy link
Contributor

@bhapas bhapas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kgeller
Copy link
Contributor Author

kgeller commented Jul 19, 2024

Do the input template files need their names changed?

One example - looking at the manifest template for the AWS Cloudwatch input type, it's referencing template_path: aws-cloudwatch.yml.hbs but the template's filename is using an underscore, aws_cloudwatch.yml.hbs.

@ebeahan I left the template file names alone because the _ is the file naming convention used, and we already account for that when we go to build the files https://github.com/elastic/kibana/blob/main/x-pack/plugins/integration_assistant/server/integration_builder/agent.ts#L24

@kgeller kgeller merged commit 9faf2f6 into elastic:main Jul 19, 2024
30 checks passed
@kgeller kgeller deleted the ai-small-fixes branch July 19, 2024 13:34
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jul 19, 2024
@kgeller
[integration automatic-import] Missing input config fix (elastic#188695)
7d39aee 
## Summary

- Fixing missing configuration options by correcting input names from _
to -
- Prefixing ECS version with v in build file

<img width="982" alt="Screenshot 2024-07-18 at 3 48 42 PM"
src="https://github.com/user-attachments/assets/ba7476e8-6ebd-4177-9465-bd91d85f8aca">

(cherry picked from commit 9faf2f6)
@kibanamachine kibanamachine mentioned this pull request Jul 19, 2024
Merged
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.15

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Jul 19, 2024
@kibanamachine @kgeller
[8.15] [integration automatic-import] Missing input config fix (#188695…
7e1018e 
…) (#188751)

# Backport

This will backport the following commits from `main` to `8.15`:
- [[integration automatic-import] Missing input config fix
(#188695)](#188695)

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

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

<!--BACKPORT [{"author":{"name":"Kylie
Meli","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-07-19T13:34:47Z","message":"[integration
automatic-import] Missing input config fix (#188695)\n\n##
Summary\r\n\r\n- Fixing missing configuration options by correcting
input names from _\r\nto -\r\n- Prefixing ECS version with v in build
file\r\n\r\n<img width=\"982\" alt=\"Screenshot 2024-07-18 at 3 48
42 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/ba7476e8-6ebd-4177-9465-bd91d85f8aca\">","sha":"9faf2f6ebf06941445a05e2a9b63ea374cbcb7f8","branchLabelMapping":{"^v8.16.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:
SecuritySolution","v8.15.0","v8.16.0"],"title":"[integration
automatic-import] Missing input config
fix","number":188695,"url":"https://github.com/elastic/kibana/pull/188695","mergeCommit":{"message":"[integration
automatic-import] Missing input config fix (#188695)\n\n##
Summary\r\n\r\n- Fixing missing configuration options by correcting
input names from _\r\nto -\r\n- Prefixing ECS version with v in build
file\r\n\r\n<img width=\"982\" alt=\"Screenshot 2024-07-18 at 3 48
42 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/ba7476e8-6ebd-4177-9465-bd91d85f8aca\">","sha":"9faf2f6ebf06941445a05e2a9b63ea374cbcb7f8"}},"sourceBranch":"main","suggestedTargetBranches":["8.15"],"targetPullRequestStates":[{"branch":"8.15","label":"v8.15.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/188695","number":188695,"mergeCommit":{"message":"[integration
automatic-import] Missing input config fix (#188695)\n\n##
Summary\r\n\r\n- Fixing missing configuration options by correcting
input names from _\r\nto -\r\n- Prefixing ECS version with v in build
file\r\n\r\n<img width=\"982\" alt=\"Screenshot 2024-07-18 at 3 48
42 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/ba7476e8-6ebd-4177-9465-bd91d85f8aca\">","sha":"9faf2f6ebf06941445a05e2a9b63ea374cbcb7f8"}}]}]
BACKPORT-->

Co-authored-by: Kylie Meli <[email protected]>
P1llus referenced this pull request Sep 3, 2024
@P1llus
[Automatic Import] Resolve http_endpoint config not loading correctly (…
21f8c2f 
…#191964)

## Summary

This resolves a regression from
`https://github.com/elastic/kibana/pull/188695` where the http_endpoint
input was also modified together with the rest of the inputs with
multiple words, however `http_endpoint` uses `_` rather than `-` in its
actual name.

While this modifies the API, it is an internal API and under tech
preview. The only consumer of this API is our own UI, which is also
modified in this PR to pass the correct parameter.

### For maintainers

- [x] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
kibanamachine referenced this pull request in kibanamachine/kibana Sep 10, 2024
@P1llus
[Automatic Import] Resolve http_endpoint config not loading correctly (…
b9ab298 
…elastic#191964)

## Summary

This resolves a regression from
`https://github.com/elastic/kibana/pull/188695` where the http_endpoint
input was also modified together with the rest of the inputs with
multiple words, however `http_endpoint` uses `_` rather than `-` in its
actual name.

While this modifies the API, it is an internal API and under tech
preview. The only consumer of this API is our own UI, which is also
modified in this PR to pass the correct parameter.

### For maintainers

- [x] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)

(cherry picked from commit 21f8c2f)
kibanamachine referenced this pull request Sep 10, 2024
@kibanamachine @P1llus
[8.15] [Automatic Import] Resolve http_endpoint config not loading co…
f1cb738 
…rrectly (#191964) (#192502)

# Backport

This will backport the following commits from `main` to `8.15`:
- [[Automatic Import] Resolve http_endpoint config not loading correctly
(#191964)](#191964)

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

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

<!--BACKPORT [{"author":{"name":"Marius
Iversen","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-03T12:38:57Z","message":"[Automatic
Import] Resolve http_endpoint config not loading correctly
(#191964)\n\n## Summary\n\nThis resolves a regression
from\n`https://github.com/elastic/kibana/pull/188695` where the
http_endpoint\ninput was also modified together with the rest of the
inputs with\nmultiple words, however `http_endpoint` uses `_` rather
than `-` in its\nactual name.\n\nWhile this modifies the API, it is an
internal API and under tech\npreview. The only consumer of this API is
our own UI, which is also\nmodified in this PR to pass the correct
parameter.\n\n### For maintainers\n\n- [x] This was checked for breaking
API changes and was
[labeled\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"21f8c2f705523514a9e90d84d968bc2818b87324","branchLabelMapping":{"^v8.16.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:fix","backport:prev-minor","v8.16.0"],"title":"[Automatic
Import] Resolve http_endpoint config not loading
correctly","number":191964,"url":"https://github.com/elastic/kibana/pull/191964","mergeCommit":{"message":"[Automatic
Import] Resolve http_endpoint config not loading correctly
(#191964)\n\n## Summary\n\nThis resolves a regression
from\n`https://github.com/elastic/kibana/pull/188695` where the
http_endpoint\ninput was also modified together with the rest of the
inputs with\nmultiple words, however `http_endpoint` uses `_` rather
than `-` in its\nactual name.\n\nWhile this modifies the API, it is an
internal API and under tech\npreview. The only consumer of this API is
our own UI, which is also\nmodified in this PR to pass the correct
parameter.\n\n### For maintainers\n\n- [x] This was checked for breaking
API changes and was
[labeled\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"21f8c2f705523514a9e90d84d968bc2818b87324"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/191964","number":191964,"mergeCommit":{"message":"[Automatic
Import] Resolve http_endpoint config not loading correctly
(#191964)\n\n## Summary\n\nThis resolves a regression
from\n`https://github.com/elastic/kibana/pull/188695` where the
http_endpoint\ninput was also modified together with the rest of the
inputs with\nmultiple words, however `http_endpoint` uses `_` rather
than `-` in its\nactual name.\n\nWhile this modifies the API, it is an
internal API and under tech\npreview. The only consumer of this API is
our own UI, which is also\nmodified in this PR to pass the correct
parameter.\n\n### For maintainers\n\n- [x] This was checked for breaking
API changes and was
[labeled\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"21f8c2f705523514a9e90d84d968bc2818b87324"}}]}]
BACKPORT-->

Co-authored-by: Marius Iversen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bhapas bhapas bhapas approved these changes

Assignees

@kgeller kgeller

Labels
release_note:skip Skip the PR/issue when compiling release notes Team: SecuritySolution Security Solutions Team working on SIEM, Endpoint, Timeline, Resolver, etc. v8.15.0 v8.16.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@kgeller @elasticmachine @ebeahan @kibanamachine @bhapas