Skip to content
This repository has been archived by the owner on Dec 4, 2024. It is now read-only.

prometheus: Enable etcd rules #938

Merged
merged 5 commits into from
Mar 5, 2021
Merged

Conversation

gracedo
Copy link
Contributor

@gracedo gracedo commented Mar 3, 2021

What type of PR is this?

bug

What this PR does/ why we need it:

When I removed mesosphere-specific etcd rules to use the default, I didn't realize the config here needed to be updated to reflect those changes. I tested adding the rule to the daily cluster and verified all the rules look good.
image
The change was made in v9.3.4, so we need to backport this to konvoy 1.7/1.6/1.5 (release/3.3, release/3.0, release/2.5)

Also, removed some unnecessary configs that have since been added to the chart values as default (mesosphere/charts#969, https://github.com/mesosphere/charts/pull/962/files#diff-4eefbe60d75fc0250847e2e4dfd675f9977d572e6f0b5615b552b8223719a6caR2324)

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

prometheus(fix): Re-enable etcd prometheus rules

Checklist

  • The commit message explains the changes and why are needed.
  • The code builds and passes lint/style checks locally.
  • The relevant subset of integration tests pass locally.
  • The core changes are covered by tests.
  • The documentation is updated where needed.

@gracedo gracedo requested review from s12chung, joejulian, alejandroEsc and a team March 3, 2021 19:33
@gracedo gracedo self-assigned this Mar 3, 2021
@gracedo gracedo requested a review from a team as a code owner March 3, 2021 19:33
@d2iq-mergebot
Copy link
Contributor

This repo has @mesosphere-mergebot integration. You can perform the following commands by submitting a comment. Submit a comment with content "@mesosphere-mergebot help" to view more detailed help text and examples. Be sure the have a look at the mergebot documentation, too.

@mesosphere-mergebot backport  

@gracedo gracedo added this to the release/4.0 milestone Mar 3, 2021
@gracedo
Copy link
Contributor Author

gracedo commented Mar 4, 2021

@mesosphere-mergebot backport release/3.3

@gracedo
Copy link
Contributor Author

gracedo commented Mar 4, 2021

@mesosphere-mergebot backport release/3.0

@d2iq-mergebot
Copy link
Contributor

Backport PR for release/3.3: #941

@gracedo
Copy link
Contributor Author

gracedo commented Mar 4, 2021

@mesosphere-mergebot backport release/3.0

@gracedo
Copy link
Contributor Author

gracedo commented Mar 4, 2021

@mesosphere-mergebot backport release/2

Copy link
Contributor

@alejandroEsc alejandroEsc left a comment

Choose a reason for hiding this comment

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

interesting, lgtm.

@alejandroEsc alejandroEsc merged commit 9b02274 into master Mar 5, 2021
@alejandroEsc alejandroEsc deleted the gracedo/prom_etcd_rules branch March 5, 2021 20:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants