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

AlertingNG: Upgrade Prometheus Alertmanager and small fixes #32280

Merged
merged 1 commit into from
Mar 25, 2021

Conversation

codesome
Copy link
Member

What this PR does / why we need it:

  • Fix the metrics for retry stage, no more panics
  • Fix a sorting logic
  • Make ApplyConfig safe to call concurrently (either with itself or the auto sync)

@codesome codesome requested a review from a team as a code owner March 24, 2021 11:09
@codesome codesome requested review from aknuds1 and wbrowne and removed request for a team March 24, 2021 11:09
@codesome codesome requested review from gotjosh and removed request for aknuds1 and wbrowne March 24, 2021 11:09
@gotjosh
Copy link
Contributor

gotjosh commented Mar 24, 2021

You can rebase now and let me know for a review.

@codesome
Copy link
Member Author

@gotjosh rebased and ready for review

@codesome codesome enabled auto-merge (squash) March 25, 2021 10:36
@codesome codesome merged commit 093e594 into master Mar 25, 2021
@codesome codesome deleted the small-fixes branch March 25, 2021 11:51
xlson added a commit to joanlopez/grafana that referenced this pull request Mar 29, 2021
* origin/master: (38 commits)
  GraphNG: Fix tooltip displaying wrong or no data (grafana#32312)
  Render new email template and fix the title (grafana#32314)
  revert changes (grafana#32335)
  Add documentation page for how to install Grafana and GE on K8s (grafana#32008)
  Chore: use uppercase names in manual entry scenario (grafana#32334)
  live: fix writing headers in hijacked connection with gzip enabled (grafana#32310)
  ReleaseNotes: Updated changelog and release notes for 7.5.0 (grafana#32318)
  Release: Updates latest.json (grafana#32319)
  GraphNG: updates story from knobs to controls (grafana#32294)
  Library Panels: Improve unsaved changes handling (grafana#32026)
  Upgrade Prometheus Alertmanager and small fixes (grafana#32280)
  Chore: eslint react hook fix for public folder (grafana#31174)
  DashboardSettings: Migrates history diff view from angular to react (grafana#31997)
  chore(deps): bump visx/tooltip to 1.7.2 (grafana#32248)
  Loki: Fix text search in Label browser (grafana#32293)
  Docs: Adjust sizes of images in Loki documentation (grafana#32301)
  PanelEdit: v8 Panel Edit UX  (grafana#32124)
  Timeseries: add UI to control the span nulls threshold (grafana#32222)
  Alerting: add state tracker to alerting evaluation (grafana#32298)
  Alerting: Add StartAt and FiredAt to the alert evaluation result (grafana#32302)
  ...
ryantxu pushed a commit that referenced this pull request Mar 30, 2021
ryantxu pushed a commit to dejapong/grafana that referenced this pull request Mar 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants