-
Notifications
You must be signed in to change notification settings - Fork 529
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
Conversation
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]>
This pull request does not have a backport label. Could you fix it @marclop? 🙏
NOTE: |
Seems like the system tests are failing because of GeoIP changes, which are unrelated to this PR. |
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
This pull request does not have a backport label. Could you fix it @marclop? 🙏
NOTE: |
@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 |
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. |
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)
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>
Tested with BC-2:
Then started the apm-server and running
|
PR elastic#12176 changelog should be done in 8.12, not head. elastic#12224 backport is causing conflicts.
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
- [ ] Update package changelog.yml (only if changes toapmpackage
have been made)- [ ] Documentation has been updatedHow to test these changes
name: my-apm-server
under the APM config intesting/infra/k8s/base/stack/apm-server.yaml
my-apm-server
.