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.

Sign up for GitHub

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

Jump to bottom

Bz2242346 prometheus port (backport #7613) #7614

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Bz2242346 prometheus port (backport #7613) #7614

merged 2 commits into from
Oct 16, 2024

Commits on Oct 14, 2024

  1. cephadm-adopt: custom prometheus port lost after adoption 

    If a custom Prometheus port was used before adoption, it was not
taken into account and default 9095 was set instead. Now custom
port is re-applied.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2242346

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit b41b7bf)

# Conflicts:
#	infrastructure-playbooks/cephadm-adopt.yml
    @asm0deuz @mergify
    asm0deuz authored and mergify[bot] committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    5e7ceff View commit details
    Browse the repository at this point in the history

  2. ephadm-adopt: Alertmanager placement count missing 

    Regression from #7576. Alertmanager placement count was missing
after migration to ceph_orch_apply module

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit 31be495)
    @asm0deuz
    asm0deuz committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    f8bd922 View commit details
    Browse the repository at this point in the history