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

changelog for APM Server monitoring fixes #15561

Merged
merged 8 commits into from
Feb 10, 2025
Merged

Conversation

endorama
Copy link
Member

@endorama endorama commented Feb 5, 2025

Motivation/summary

Changes have been backported to 8.16.4 and 8.17.2 that require a changelog entry.

See #14247 (comment).

Checklist

How to test these changes

Related issues

#14247

@endorama endorama requested a review from a team as a code owner February 5, 2025 14:08
@endorama endorama added backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify labels Feb 5, 2025
Copy link
Member

@carsonip carsonip left a comment

Choose a reason for hiding this comment

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

As discussed - this PR should work as intended to update the changelog on the website, but is there a reason to not backport the PR to 8.18 and 8.x branch? (and possibly 9.0?) They also have 8.16.asciidoc and 8.17.asciidoc and they should be consistent (and identical) across branches.

Copy link
Member

@carsonip carsonip left a comment

Choose a reason for hiding this comment

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

Also, backporting a 8.17.asciidoc change to 8.16 branch will cause a merge conflict but that can be resolved easily. It should be fine. Alternatively, the 8.16.asciidoc and 8.17.asciidoc change can be separated into 2 PRs.

@1pkg 1pkg disabled auto-merge February 5, 2025 20:17
@1pkg 1pkg enabled auto-merge (squash) February 10, 2025 18:33
@1pkg 1pkg added backport-8.18 Automated backport to the 8.18 branch backport-8.x Automated backport to the 8.x branch with mergify backport-9.0 Automated backport to the 9.0 branch labels Feb 10, 2025
@1pkg 1pkg merged commit 6c9108b into main Feb 10, 2025
8 checks passed
@1pkg 1pkg deleted the changelog-monitoring-fixes branch February 10, 2025 18:56
mergify bot pushed a commit that referenced this pull request Feb 10, 2025
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)
mergify bot pushed a commit that referenced this pull request Feb 10, 2025
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)

# Conflicts:
#	changelogs/8.17.asciidoc
mergify bot pushed a commit that referenced this pull request Feb 10, 2025
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)

# Conflicts:
#	changelogs/8.16.asciidoc
mergify bot pushed a commit that referenced this pull request Feb 10, 2025
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)
mergify bot pushed a commit that referenced this pull request Feb 10, 2025
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)
1pkg pushed a commit that referenced this pull request Feb 10, 2025
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)

Co-authored-by: Edoardo Tenani <[email protected]>
1pkg pushed a commit that referenced this pull request Feb 10, 2025
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)
mergify bot added a commit that referenced this pull request Feb 10, 2025
…15650)

* changelog for APM Server monitoring fixes (#15561)

* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)

# Conflicts:
#	changelogs/8.17.asciidoc

* changelog: remove 8.17 log entry

---------

Co-authored-by: Edoardo Tenani <[email protected]>
Co-authored-by: Kostiantyn Masliuk <[email protected]>
mergify bot added a commit that referenced this pull request Feb 10, 2025
…15651)

* changelog for APM Server monitoring fixes (#15561)

* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)

# Conflicts:
#	changelogs/8.16.asciidoc

* changelog: revert 8.16 log

---------

Co-authored-by: Edoardo Tenani <[email protected]>
Co-authored-by: Kostiantyn Masliuk <[email protected]>
1pkg pushed a commit that referenced this pull request Feb 10, 2025
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)

Co-authored-by: Edoardo Tenani <[email protected]>
mergify bot added a commit that referenced this pull request Feb 10, 2025
* backport change to 8.17.2 changelog

* backport change to 8.16.4 changelog

* Update 8.16.asciidoc

---------

Co-authored-by: Kostiantyn Masliuk <[email protected]>
(cherry picked from commit 6c9108b)

Co-authored-by: Edoardo Tenani <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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.16 Automated backport with mergify backport-8.17 Automated backport with mergify backport-8.18 Automated backport to the 8.18 branch backport-9.0 Automated backport to the 9.0 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants