Skip to content

[Observability Onboarding] Fix kustomize command#199758

Merged
flash1293 merged 8 commits intoelastic:mainfrom
flash1293:flash1293/fix-kubernetes-ea-flow
Nov 14, 2024
Merged

[Observability Onboarding] Fix kustomize command#199758
flash1293 merged 8 commits intoelastic:mainfrom
flash1293:flash1293/fix-kubernetes-ea-flow

Conversation

@flash1293
Copy link
Copy Markdown
Contributor

@flash1293 flash1293 commented Nov 12, 2024 •
edited by kibanamachine
Loading

Summary

Closes #199754 by introducing more fine-grained version getters to get the base version (to resolve to the git tag in the repo), the actual version which might include the IAR suffix and the docker version which replaces + with .

For testing, EA host and kubernetes as well as OTel host should be tested. See here: #199758 (comment)

@flash1293 flash1293 requested a review from a team as a code owner November 12, 2024 11:12
@flash1293 flash1293 requested a review from a team November 12, 2024 11:12
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 12, 2024

Pinging @elastic/obs-ux-onboarding-team (Feature: Observability Onboarding)

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 12, 2024

Pinging @elastic/obs-ux-logs-team (Team:obs-ux-logs)

@botelastic botelastic bot added the ci:project-deploy-observability Create an Observability project label Nov 12, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Nov 12, 2024

🤖 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!)

@flash1293
Copy link
Copy Markdown
Contributor Author

flash1293 commented Nov 12, 2024

It's actually a bit more complicated because the docker image name needs to be changed as well:

#199754 (comment)

@flash1293 flash1293 added v8.15.5 and removed v8.15.5 labels Nov 12, 2024
@flash1293 flash1293 requested a review from a team as a code owner November 13, 2024 14:15
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Nov 13, 2024
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 13, 2024

Pinging @elastic/fleet (Team:Fleet)

@flash1293
Copy link
Copy Markdown
Contributor Author

flash1293 commented Nov 13, 2024

@kpollich @mykolaharmash I cleaned up this fix a bit, moving the logic for calculating different flavors of the version to the fleet plugin instead of keeping it in the onboarding plugin.

You can test the IAR case by adding

    return '8.15.3+build202411051926';

to

kibana/x-pack/plugins/fleet/server/services/agents/agent_service.ts

Line 184 in 74cd958

public async getLatestAgentAvailableVersion(includeCurrentVersion?: boolean) {

@mykolaharmash Please make sure to test all flows at least superficially to make sure there are no hidden issues left.

@nchaulet
Copy link
Copy Markdown
Member

nchaulet commented Nov 13, 2024

@kpollich @flash1293 It seems docker image exist with a . instead of + (docker.elastic.co/beats/elastic-agent:8.15.3.build202411051926) should we use that and provide a getLatestDockerTag or something similar in fleet ? there is value for user to use the latest version

@flash1293
Copy link
Copy Markdown
Contributor Author

flash1293 commented Nov 13, 2024 •
edited
Loading

@nchaulet Isn't that what I did here? https://github.com/elastic/kibana/pull/199758/files#diff-80f8d98768811edfdaeb175191fd423ecebed2cd33507811cb12b4985ec1fe3eR179

Edit: Oh I see, I will update the PR description, sorry, forgot about that.

@mykolaharmash
Copy link
Copy Markdown
Contributor

mykolaharmash commented Nov 14, 2024

I've tested EA host, Otel host and EA Kubernetes flows with the replaced EA version, everything works as expected ✨

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 14, 2024

⏳ Build in-progress

  • Buildkite Build
  • Commit: aa002f1
  • Kibana Serverless Image: docker.elastic.co/kibana-ci/kibana-serverless:pr-199758-aa002f1b0f7c

History

@flash1293
Copy link
Copy Markdown
Contributor Author

flash1293 commented Nov 14, 2024

@kpollich @nchaulet could I get a review on this one? It seems like we are pulling forward an 8.16.1 release and I would like to get this in.

nchaulet
nchaulet approved these changes Nov 14, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

Fleet changes LGTM 🚀

@flash1293 flash1293 merged commit 7ef9773 into elastic:main Nov 14, 2024
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Nov 14, 2024

Starting backport for target branches: 8.16, 8.x

https://github.com/elastic/kibana/actions/runs/11838875780

kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Nov 14, 2024
@flash1293 @kibanamachine
[Observability Onboarding] Fix kustomize command (elastic#199758)
8c8e95c 
## Summary

Closes elastic#199754 by introducing
more fine-grained version getters to get the base version (to resolve to
the git tag in the repo), the actual version which might include the IAR
suffix and the docker version which replaces + with .

For testing, EA host and kubernetes as well as OTel host should be
tested. See here:
elastic#199758 (comment)

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 7ef9773)
@kibanamachine kibanamachine mentioned this pull request Nov 14, 2024
Merged
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Nov 14, 2024

💔 Some backports could not be created

Status Branch Result
❌ 8.16 Backport failed because of merge conflicts
✅ 8.x

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

Manual backport

To create the backport manually run:

node scripts/backport --pr 199758

Questions ?

Please refer to the Backport tool documentation

@flash1293 flash1293 mentioned this pull request Nov 14, 2024
Merged
@kibanamachine kibanamachine mentioned this pull request Nov 14, 2024
Merged
kibanamachine added a commit that referenced this pull request Nov 14, 2024
@kibanamachine @flash1293
[8.x] [Observability Onboarding] Fix kustomize command (#199758) (#20…
274e497 
…0191)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Observability Onboarding] Fix kustomize command
(#199758)](#199758)

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

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

<!--BACKPORT [{"author":{"name":"Joe
Reuter","email":"johannes.reuter@elastic.co"},"sourceCommit":{"committedDate":"2024-11-14T14:09:24Z","message":"[Observability
Onboarding] Fix kustomize command (#199758)\n\n## Summary\r\n\r\nCloses
#199754 by introducing\r\nmore
fine-grained version getters to get the base version (to resolve
to\r\nthe git tag in the repo), the actual version which might include
the IAR\r\nsuffix and the docker version which replaces + with
.\r\n\r\nFor testing, EA host and kubernetes as well as OTel host should
be\r\ntested. See
here:\r\nhttps://github.com//pull/199758#issuecomment-2473753175\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"7ef9773d626c21556361d85578b039773e33ffb5","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","v9.0.0","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-logs","Feature:
Observability Onboarding","v8.17.0","v8.16.1"],"title":"[Observability
Onboarding] Fix kustomize
command","number":199758,"url":"https://github.com/elastic/kibana/pull/199758","mergeCommit":{"message":"[Observability
Onboarding] Fix kustomize command (#199758)\n\n## Summary\r\n\r\nCloses
#199754 by introducing\r\nmore
fine-grained version getters to get the base version (to resolve
to\r\nthe git tag in the repo), the actual version which might include
the IAR\r\nsuffix and the docker version which replaces + with
.\r\n\r\nFor testing, EA host and kubernetes as well as OTel host should
be\r\ntested. See
here:\r\nhttps://github.com//pull/199758#issuecomment-2473753175\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"7ef9773d626c21556361d85578b039773e33ffb5"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199758","number":199758,"mergeCommit":{"message":"[Observability
Onboarding] Fix kustomize command (#199758)\n\n## Summary\r\n\r\nCloses
#199754 by introducing\r\nmore
fine-grained version getters to get the base version (to resolve
to\r\nthe git tag in the repo), the actual version which might include
the IAR\r\nsuffix and the docker version which replaces + with
.\r\n\r\nFor testing, EA host and kubernetes as well as OTel host should
be\r\ntested. See
here:\r\nhttps://github.com//pull/199758#issuecomment-2473753175\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"7ef9773d626c21556361d85578b039773e33ffb5"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

---------

Co-authored-by: Joe Reuter <johannes.reuter@elastic.co>
wayneseymour pushed a commit to wayneseymour/kibana that referenced this pull request Nov 18, 2024
@flash1293 @kibanamachine @wayneseymour
[Observability Onboarding] Fix kustomize command (elastic#199758)
46a3cbb 
## Summary

Closes elastic#199754 by introducing
more fine-grained version getters to get the base version (to resolve to
the git tag in the repo), the actual version which might include the IAR
suffix and the docker version which replaces + with .

For testing, EA host and kubernetes as well as OTel host should be
tested. See here:
elastic#199758 (comment)

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Nov 18, 2024
@flash1293 @kibanamachine @CAWilson94
[Observability Onboarding] Fix kustomize command (elastic#199758)
7c4a939 
## Summary

Closes elastic#199754 by introducing
more fine-grained version getters to get the base version (to resolve to
the git tag in the repo), the actual version which might include the IAR
suffix and the docker version which replaces + with .

For testing, EA host and kubernetes as well as OTel host should be
tested. See here:
elastic#199758 (comment)

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Nov 18, 2024
@flash1293 @kibanamachine @CAWilson94
[Observability Onboarding] Fix kustomize command (elastic#199758)
176570d 
## Summary

Closes elastic#199754 by introducing
more fine-grained version getters to get the base version (to resolve to
the git tag in the repo), the actual version which might include the IAR
suffix and the docker version which replaces + with .

For testing, EA host and kubernetes as well as OTel host should be
tested. See here:
elastic#199758 (comment)

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
flash1293 added a commit that referenced this pull request Nov 18, 2024
@flash1293
[8.16] [Observability Onboarding] Fix kustomize command (#199758) (#2…
bcf443b 
…00194)

# Backport

This will backport the following commits from `main` to `8.16`:
- [[Observability Onboarding] Fix kustomize command
(#199758)](#199758)
@kpollich kpollich mentioned this pull request Nov 11, 2025
Closed
@pierrehilbert pierrehilbert mentioned this pull request Nov 12, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mykolaharmash mykolaharmash mykolaharmash approved these changes

@nchaulet nchaulet nchaulet approved these changes

Assignees

No one assigned

Labels

ci:project-deploy-observability Create an Observability project Feature: Observability Onboarding release_note:fix Team:Fleet Team label for Observability Data Collection Fleet team Team:obs-onboarding Observability Onboarding Team v8.16.1 v8.17.0 v9.0.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Observability Onboarding] Kubernetes EA flow fails with invalid refspec

5 participants

@flash1293 @elasticmachine @nchaulet @mykolaharmash @kibanamachine