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

Alerting: Update imported prometheus alertmanager version. #56228

Merged
merged 1 commit into from
Oct 4, 2022

Conversation

joeblubaugh
Copy link
Contributor

Version 0.24.0 has a few bugs that cause panics. We update here to the latest commit on github.com/prometheus/alertmanager's main branch.

Panic Bugs:
prometheus/alertmanager#2936
prometheus/alertmanager#3064

Version 0.24.0 has a few bugs that cause panics. We update here to the
latest commit on github.com/prometheus/alertmanager's main branch.

Panic Bugs:
prometheus/alertmanager#2936
prometheus/alertmanager#3064
@joeblubaugh joeblubaugh added area/alerting Grafana Alerting add to changelog backport v9.1.x Bot will automatically open backport PR backport v9.2.x Mark PR for automatic backport to v9.2.x labels Oct 4, 2022
@joeblubaugh joeblubaugh added this to the 9.2.0 milestone Oct 4, 2022
@joeblubaugh joeblubaugh requested a review from a team October 4, 2022 06:55
@joeblubaugh joeblubaugh requested a review from a team as a code owner October 4, 2022 06:55
@joeblubaugh joeblubaugh requested review from papagian, yangkb09 and ying-jeanne and removed request for a team October 4, 2022 06:55
@joeblubaugh joeblubaugh merged commit ce89624 into main Oct 4, 2022
@joeblubaugh joeblubaugh deleted the joe/alerting-238/upgrade-prometheus-am-import branch October 4, 2022 09:41
@grafanabot
Copy link
Contributor

The backport to v9.1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-56228-to-v9.1.x origin/v9.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ce89624ca215b85ea0c65cb4f4adbe33e35dd42c
# Push it to GitHub
git push --set-upstream origin backport-56228-to-v9.1.x
git switch main
# Remove the local backport branch
git branch -D backport-56228-to-v9.1.x

Then, create a pull request where the base branch is v9.1.x and the compare/head branch is backport-56228-to-v9.1.x.

@grafanabot
Copy link
Contributor

The backport to v9.2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-56228-to-v9.2.x origin/v9.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ce89624ca215b85ea0c65cb4f4adbe33e35dd42c
# Push it to GitHub
git push --set-upstream origin backport-56228-to-v9.2.x
git switch main
# Remove the local backport branch
git branch -D backport-56228-to-v9.2.x

Then, create a pull request where the base branch is v9.2.x and the compare/head branch is backport-56228-to-v9.2.x.

joeblubaugh added a commit that referenced this pull request Oct 6, 2022
Version 0.24.0 has a few bugs that cause panics. We update here to the
latest commit on github.com/prometheus/alertmanager's main branch.

Panic Bugs:
prometheus/alertmanager#2936
prometheus/alertmanager#3064

(cherry picked from commit ce89624)
joeblubaugh added a commit that referenced this pull request Oct 6, 2022
Version 0.24.0 has a few bugs that cause panics. We update here to the
latest commit on github.com/prometheus/alertmanager's main branch.

Panic Bugs:
prometheus/alertmanager#2936
prometheus/alertmanager#3064

(cherry picked from commit ce89624)
joeblubaugh added a commit that referenced this pull request Oct 7, 2022
…56228) (#56430)

Version 0.24.0 has a few bugs that cause panics. We update here to the
latest commit on github.com/prometheus/alertmanager's main branch.

Panic Bugs:
prometheus/alertmanager#2936
prometheus/alertmanager#3064

(cherry picked from commit ce89624)
joeblubaugh added a commit that referenced this pull request Oct 7, 2022
…56228) (#56429)

* Alerting: Update imported prometheus alertmanager version. (#56228)

Version 0.24.0 has a few bugs that cause panics. We update here to the
latest commit on github.com/prometheus/alertmanager's main branch.

Panic Bugs:
prometheus/alertmanager#2936
prometheus/alertmanager#3064

(cherry picked from commit ce89624)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/alerting Grafana Alerting area/backend backport v9.1.x Bot will automatically open backport PR backport v9.2.x Mark PR for automatic backport to v9.2.x enterprise-ok
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants