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

[kube-prometheus-stack] Update mixins, switch to kube-prometheus mixin, add grafana rules and fix label aggregation in TargetDown alert #4460

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

jkroepke
Copy link
Member

@jkroepke jkroepke commented Apr 16, 2024

What this PR does / why we need it

Switch to jsonnet which generates all rules now by default (including the new grafana one)

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer

Checklist

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [prometheus-couchdb-exporter])

…n and fix label aggregation in TargetDown alert

Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
Comment on lines +115 to +116
'grafana_rules': ' .Values.defaultRules.rules.grafana',
'GrafanaAlerts': ' .Values.defaultRules.rules.grafana',
Copy link
Member

Choose a reason for hiding this comment

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

Two questions:

  • are these supposed to be the same?
  • can we rename GrafanaAlerts to grafana-alerts to make it similar with the other names and filenames?

Copy link
Member Author

Choose a reason for hiding this comment

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

can we rename GrafanaAlerts to grafana-alerts to make it similar with the other names and filenames?

I saw this, too. Currently, the file name based on the rule group name, which behave differently at Grafana. But i can add a replacement for this, like to snake case.

are these supposed to be the same?

GrafanaAlerts has an dependency against grafana_rules. And there are just 2 rules in total. I thought, its fine to group them. But I'm also open separate them.

No strong opinion here.

'git': 'https://github.com/prometheus-operator/kube-prometheus.git',
'branch': refs['ref.kube-prometheus'],
'source': 'main.libsonnet',
'cwd': 'jsonnet/kube-prometheus',
'destination': '../templates/prometheus/rules-1.14',
Copy link
Member

Choose a reason for hiding this comment

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

should we remove the -1.14 postfix?

Copy link
Member Author

Choose a reason for hiding this comment

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

It feel like it make sense, maybe it's something for an follow-up PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants