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.

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

Beat: Allow setting beat name in configuration #12176

Merged
merged 3 commits into from
Dec 7, 2023

Conversation

marclop
Copy link
Contributor

@marclop marclop commented Dec 7, 2023

Motivation/summary

Uses the beat name if set in the configuration file. Restores what used to work on 7.x and perhaps prior to #9149 being introduced.

Checklist

How to test these changes

  1. Set name: my-apm-server under the APM config in testing/infra/k8s/base/stack/apm-server.yaml
  2. Tilt up
  3. Navigate to Stack Monitoring -> Verify that APM Server instance is named my-apm-server.

Uses the beat name if set in the configuration file. Restores what
used to work on 7.x and perhaps prior to elastic#9149 being introduced.

This undoes an unwanted breaking change that caused beat.name to be
ignored.

Signed-off-by: Marc Lopez Rubio <[email protected]>
@marclop marclop added the v8.12.0 label Dec 7, 2023
@marclop marclop requested a review from a team as a code owner December 7, 2023 03:54
Copy link
Contributor

mergify bot commented Dec 7, 2023

This pull request does not have a backport label. Could you fix it @marclop? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

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

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Dec 7, 2023
@marclop marclop added the backport-8.11 Automated backport with mergify label Dec 7, 2023
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Dec 7, 2023
@marclop
Copy link
Contributor Author

marclop commented Dec 7, 2023

Seems like the system tests are failing because of GeoIP changes, which are unrelated to this PR.

@kruskall kruskall enabled auto-merge (squash) December 7, 2023 11:44
@kruskall kruskall merged commit a56c605 into elastic:main Dec 7, 2023
11 checks passed
mergify bot pushed a commit that referenced this pull request Dec 7, 2023
Uses the beat name if set in the configuration file. Restores what
used to work on 7.x and perhaps prior to #9149 being introduced.

This undoes an unwanted breaking change that caused beat.name to be
ignored.

Signed-off-by: Marc Lopez Rubio <[email protected]>
Co-authored-by: kruskall <[email protected]>
(cherry picked from commit a56c605)

# Conflicts:
#	changelogs/head.asciidoc
@marclop marclop removed the backport-8.11 Automated backport with mergify label Dec 11, 2023
Copy link
Contributor

mergify bot commented Dec 11, 2023

This pull request does not have a backport label. Could you fix it @marclop? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

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

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Dec 11, 2023
@marclop marclop deleted the b/allow-setting-beat.name branch December 11, 2023 07:38
@carsonip
Copy link
Member

carsonip commented Dec 13, 2023

@marclop this is currently not in 8.12 branch. We'll have to either remove the v8.12.0 tag on this PR or backport this fix to 8.12 and update changelogs.

Alternatively, backport to 8.12.1

@marclop marclop added the backport-8.12 Automated backport with mergify label Dec 14, 2023
@marclop
Copy link
Contributor Author

marclop commented Dec 14, 2023

Thanks for the ping. I think it'd be good to ship this on 8.12.0. I'll add the backport labels. They weren't available a few days ago.

@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Dec 14, 2023
mergify bot pushed a commit that referenced this pull request Dec 14, 2023
Uses the beat name if set in the configuration file. Restores what
used to work on 7.x and perhaps prior to #9149 being introduced.

This undoes an unwanted breaking change that caused beat.name to be
ignored.

Signed-off-by: Marc Lopez Rubio <[email protected]>
Co-authored-by: kruskall <[email protected]>
(cherry picked from commit a56c605)
mergify bot added a commit that referenced this pull request Dec 14, 2023
Uses the beat name if set in the configuration file. Restores what
used to work on 7.x and perhaps prior to #9149 being introduced.

This undoes an unwanted breaking change that caused beat.name to be
ignored.

Signed-off-by: Marc Lopez Rubio <[email protected]>
Co-authored-by: kruskall <[email protected]>
(cherry picked from commit a56c605)

Co-authored-by: Marc Lopez Rubio <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@simitt
Copy link
Contributor

simitt commented Dec 19, 2023

Tested with BC-2:
changed following in apm-server.yml

name: mytest-apm-server
http.enabled: true

Then started the apm-server and running curl -i -k localhost:5066 returns

{ .. "name":"mytest-apm-server" .. }

@simitt simitt self-assigned this Dec 19, 2023
carsonip added a commit to carsonip/apm-server that referenced this pull request Feb 5, 2024
PR elastic#12176 changelog should be done in 8.12, not head. elastic#12224 backport is
causing conflicts.
carsonip added a commit that referenced this pull request Feb 5, 2024
PR #12176 changelog should be done in 8.12, not head. #12224 backport is
causing conflicts.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants