Skip to content

fix templates and docs to use correct -- command line args - #42060

Merged
leehinman merged 5 commits into
elastic:mainfrom
leehinman:42038_argument_fix
Jan 3, 2025
Merged

leehinman merged 5 commits into
elastic:mainfrom
leehinman:42038_argument_fix

Conversation

@leehinman

@leehinman leehinman commented Dec 16, 2024 •

Copy link
Copy Markdown
Contributor

Proposed commit message

Change use of -environment and -system.hostfs to the correct --environment and --system.hostfs versions in templates and documentation. This is necessary to allow correct argument parsing in all environments.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

Closes #42038

@leehinman leehinman added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team bugfix labels Dec 16, 2024
@botelastic botelastic Bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Dec 16, 2024
@mergify

mergify Bot commented Dec 16, 2024

Copy link
Copy Markdown
Contributor

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @leehinman? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

@mergify

mergify Bot commented Dec 16, 2024

Copy link
Copy Markdown
Contributor

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify Bot added the backport-8.x Automated backport to the 8.x branch with mergify label Dec 16, 2024
@leehinman
leehinman force-pushed the 42038_argument_fix branch 3 times, most recently from a634cce to 63f7d70 Compare December 17, 2024 18:26
@leehinman
leehinman marked this pull request as ready for review December 17, 2024 18:45
@leehinman
leehinman requested review from a team as code owners December 17, 2024 18:45
@elasticmachine

Copy link
Copy Markdown
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@cmacknz cmacknz added the backport-8.17 Automated backport with mergify label Dec 17, 2024
Comment thread CHANGELOG.next.asciidoc Resolved
Comment thread dev-tools/mage/pkg.go Resolved
Comment thread dev-tools/packaging/package_test.go Resolved
@jlind23

jlind23 commented Dec 31, 2024

Copy link
Copy Markdown
Contributor

@cmacknz can I get your approval on this before I bypass the obs-cloudnative-monitoring review? I would like this fix to land in 8.17 asap.

Comment thread dev-tools/packaging/package_test.go Resolved
Comment thread dev-tools/packaging/package_test.go Resolved
@leehinman
leehinman enabled auto-merge (squash) January 2, 2025 19:30
@jlind23

jlind23 commented Jan 2, 2025

Copy link
Copy Markdown
Contributor

@gizas @tetianakravchenko looks like we still need on of your approval in order to move forward here.

@leehinman
leehinman merged commit 580f0f6 into elastic:main Jan 3, 2025
mergify Bot pushed a commit that referenced this pull request Jan 3, 2025
* fix templates and docs to use correct `--` command line args

Co-authored-by: Tiago Queiroz <me@tiago.life>

(cherry picked from commit 580f0f6)
mergify Bot pushed a commit that referenced this pull request Jan 3, 2025
* fix templates and docs to use correct `--` command line args

Co-authored-by: Tiago Queiroz <me@tiago.life>

(cherry picked from commit 580f0f6)
jlind23 pushed a commit that referenced this pull request Jan 6, 2025
…mand line args (#42204)

* fix templates and docs to use correct `--` command line args (#42060)

* fix templates and docs to use correct `--` command line args

Co-authored-by: Tiago Queiroz <me@tiago.life>

(cherry picked from commit 580f0f6)

* fix changelog

---------

Co-authored-by: Lee E Hinman <57081003+leehinman@users.noreply.github.com>
Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>
jlind23 pushed a commit that referenced this pull request Jan 6, 2025
…mmand line args (#42205)

* fix templates and docs to use correct `--` command line args (#42060)

* fix templates and docs to use correct `--` command line args

Co-authored-by: Tiago Queiroz <me@tiago.life>

(cherry picked from commit 580f0f6)

* fix changelog

---------

Co-authored-by: Lee E Hinman <57081003+leehinman@users.noreply.github.com>
Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>
@niklas-jansen

Copy link
Copy Markdown

Any estimate on whether and when this fix will make it into the docker.elastic.co/beats/filebeat:8.17.0 image?

If it will be timely I could avoid touching a dozen docker-compose files.

@cmacknz

cmacknz commented Jan 20, 2025

Copy link
Copy Markdown
Member

It will be in 8.17.1 which is planned to release very soon. I can't comment the current planned release date as a policy (and because sometimes the unexpected happens and the dates change) but it should be a short wait.

@niklas-jansen

niklas-jansen commented Jan 20, 2025 •

Copy link
Copy Markdown

Oh okay, so I take it that there won't be a fixed 8.17.0 container image?
i.e. one where the command in the image metadata is fixed but the metricbeat binary is still 8.17.0?

@cmacknz

cmacknz commented Jan 20, 2025

Copy link
Copy Markdown
Member

No, it'll be tagged as 8.17.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.x Automated backport to the 8.x branch with mergify backport-8.17 Automated backport with mergify bugfix Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8.17.0 docker containers not starting with default arguments

9 participants

⌂ 换网址