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

[Fleet] Add missing field type in input templates #182016

Merged
merged 5 commits into from May 2, 2024
Merged

[Fleet] Add missing field type in input templates #182016

merged 5 commits into from May 2, 2024

Conversation

criamico
Copy link
Contributor

@criamico criamico commented Apr 29, 2024 •
edited by kibanamachine

Related to #180307

Summary

In #181155 the inputs config for integrations was fixed but there was still a missing field type on the top level of the input. This PR adds that field:

Screenshot 2024-04-29 at 19 09 59

Checklist

@criamico criamico self-assigned this Apr 29, 2024
@apmmachine
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • /oblt-deploy : Deploy a Kibana instance using the Observability test environments.
  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@criamico criamico added Team:Fleet Team label for Observability Data Collection Fleet team release_note:skip Skip the PR/issue when compiling release notes v8.15.0 backport:prev-minor Backport to the previous minor version (i.e. one version back from main) labels Apr 29, 2024
@criamico criamico marked this pull request as ready for review April 29, 2024 17:14
@criamico criamico requested a review from a team as a code owner April 29, 2024 17:14
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@criamico criamico changed the title [Fleet] Add missing in input templates [Fleet] Add missing field type in input templates Apr 29, 2024
@criamico
Copy link
Contributor Author

@elasticmachine merge upstream

@criamico
Copy link
Contributor Author

@elasticmachine merge upstream

@criamico
Copy link
Contributor Author

@elasticmachine merge upstream

@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #95 / dashboard app - group 1 dashboard embeddable data grid are added when a cell filter is clicked
  • [job] [logs] FTR Configs #90 / machine learning - permissions "after all" hook in "machine learning - permissions"
  • [job] [logs] FTR Configs #90 / machine learning - permissions for user with read ML access "after all" hook: afterTestSuite.trigger in "for user with read ML access"
  • [job] [logs] FTR Configs #90 / machine learning - permissions for user with read ML access with data loaded "after all" hook: afterTestSuite.trigger in "with data loaded"
  • [job] [logs] FTR Configs #90 / machine learning - permissions for user with read ML access with data loaded (ft_ml_viewer) "after all" hook for "should display elements on Stack Management ML page correctly"
  • [job] [logs] FTR Configs #90 / machine learning - permissions for user with read ML access with data loaded (ft_ml_viewer) should display elements on Index Data Visualizer page correctly

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @criamico

@criamico criamico merged commit 13e5965 into elastic:main May 2, 2024
21 checks passed
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 2, 2024
@criamico
[Fleet] Add missing field type in input templates (elastic#182016)
2e7aad3 
Related to elastic#180307

## Summary
In elastic#181155 the inputs config for
integrations was fixed but there was still a missing field `type` on the
top level of the input. This PR adds that field:

![Screenshot 2024-04-29 at 19 09
59](https://github.com/elastic/kibana/assets/16084106/ff0ce78b-8726-416f-ad7a-8f039dd4e10a)

### Checklist
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 13e5965)
@kibanamachine kibanamachine mentioned this pull request May 2, 2024
Merged
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.14

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

Questions ?

Please refer to the Backport tool documentation

@criamico criamico deleted the 180307_add_type_in_templates branch May 2, 2024 08:10
kibanamachine added a commit that referenced this pull request May 2, 2024
@kibanamachine @criamico
[8.14] [Fleet] Add missing field type in input templates (#182016) (#…
218e18f 
…182328)

# Backport

This will backport the following commits from `main` to `8.14`:
- [[Fleet] Add missing field type in input templates
(#182016)](#182016)

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

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

<!--BACKPORT [{"author":{"name":"Cristina
Amico","email":"criamico@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-05-02T07:54:05Z","message":"[Fleet]
Add missing field type in input templates (#182016)\n\nRelated to
#180307 Summary\r\nIn
#181155 the inputs config
for\r\nintegrations was fixed but there was still a missing field `type`
on the\r\ntop level of the input. This PR adds that
field:\r\n\r\n![Screenshot 2024-04-29 at 19
09\r\n59](https://github.com/elastic/kibana/assets/16084106/ff0ce78b-8726-416f-ad7a-8f039dd4e10a)\r\n\r\n\r\n###
Checklist\r\n- [ ] [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\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"13e59658b5edeed4f2bd2ed7ee0dee829128a0da","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v8.15.0"],"title":"[Fleet]
Add missing field type in input
templates","number":182016,"url":"#182016
Add missing field type in input templates (#182016)\n\nRelated to
#180307 Summary\r\nIn
#181155 the inputs config
for\r\nintegrations was fixed but there was still a missing field `type`
on the\r\ntop level of the input. This PR adds that
field:\r\n\r\n![Screenshot 2024-04-29 at 19
09\r\n59](https://github.com/elastic/kibana/assets/16084106/ff0ce78b-8726-416f-ad7a-8f039dd4e10a)\r\n\r\n\r\n###
Checklist\r\n- [ ] [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\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"13e59658b5edeed4f2bd2ed7ee0dee829128a0da"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.15.0","branchLabelMappingKey":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"#182016
Add missing field type in input templates (#182016)\n\nRelated to
#180307 Summary\r\nIn
#181155 the inputs config
for\r\nintegrations was fixed but there was still a missing field `type`
on the\r\ntop level of the input. This PR adds that
field:\r\n\r\n![Screenshot 2024-04-29 at 19
09\r\n59](https://github.com/elastic/kibana/assets/16084106/ff0ce78b-8726-416f-ad7a-8f039dd4e10a)\r\n\r\n\r\n###
Checklist\r\n- [ ] [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\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"13e59658b5edeed4f2bd2ed7ee0dee829128a0da"}}]}]
BACKPORT-->

Co-authored-by: Cristina Amico <criamico@users.noreply.github.com>
yuliacech pushed a commit to yuliacech/kibana that referenced this pull request May 3, 2024
@criamico @kibanamachine @yuliacech
[Fleet] Add missing field type in input templates (elastic#182016)
8d922a1 
Related to elastic#180307

## Summary
In elastic#181155 the inputs config for
integrations was fixed but there was still a missing field `type` on the
top level of the input. This PR adds that field:

![Screenshot 2024-04-29 at 19 09
59](https://github.com/elastic/kibana/assets/16084106/ff0ce78b-8726-416f-ad7a-8f039dd4e10a)


### Checklist
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

---------

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

@kpollich kpollich kpollich approved these changes

Assignees

@criamico criamico

Labels
backport:prev-minor Backport to the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.14.0 v8.15.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@criamico @apmmachine @elasticmachine @kibana-ci @kibanamachine @kpollich