Skip to content

Allow overriding ruleSelector on cloud Prometheus #1097

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

Open
methylDragon wants to merge 1 commit into from
+22 −10
Open

Allow overriding ruleSelector on cloud Prometheus #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions src/app_charts/prometheus/cloud/prometheus-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
{{- end }}


# Inject the serviceMonitorSelector and podMonitorSelector to allow users to override the universal matching default.
# Inject the serviceMonitorSelector, podMonitorSelector, and ruleSelector to allow users to override the universal matching default.
{{- $prometheusServiceMonitorSelectorMap := dict -}}
{{- if .Values.prometheus }}
{{- if .Values.prometheus.prometheusSpec }}
Expand All @@ -51,8 +51,8 @@
{{- end }}
{{- end }}
{{- if $prometheusServiceMonitorSelectorMap }}
{{- $formattedPrometheusServiceMonitorSelectorObject := toYaml $prometheusServiceMonitorSelectorMap | nindent 6 -}}
{{- $data = $data | replace "$CR_PROMETHEUS_SERVICE_MONITOR_SELECTOR_OBJECT: REMOVE_ME" (trimPrefix " " (trimPrefix "\n" $formattedPrometheusServiceMonitorSelectorObject)) -}}
{{- $formattedPrometheusServiceMonitorSelectorObject := toYaml $prometheusServiceMonitorSelectorMap | nindent 4 -}}
{{- $data = $data | replace "$CR_PROMETHEUS_SERVICE_MONITOR_SELECTOR_OBJECT: REMOVE_ME" (trimPrefix " " (trimPrefix "\n" $formattedPrometheusServiceMonitorSelectorObject)) -}}
{{- else }}
{{- $data = $data | replace "$CR_PROMETHEUS_SERVICE_MONITOR_SELECTOR_OBJECT: REMOVE_ME" "{}" -}}
{{- end }}
Expand All @@ -66,12 +66,27 @@
{{- end }}
{{- end }}
{{- if $prometheusPodMonitorSelectorMap }}
{{- $formattedPrometheusPodMonitorSelectorObject := toYaml $prometheusPodMonitorSelectorMap | nindent 6 -}}
{{- $data = $data | replace "$CR_PROMETHEUS_POD_MONITOR_SELECTOR_OBJECT: REMOVE_ME" (trimPrefix " " (trimPrefix "\n" $formattedPrometheusPodMonitorSelectorObject)) -}}
{{- $formattedPrometheusPodMonitorSelectorObject := toYaml $prometheusPodMonitorSelectorMap | nindent 4 -}}
{{- $data = $data | replace "$CR_PROMETHEUS_POD_MONITOR_SELECTOR_OBJECT: REMOVE_ME" (trimPrefix " " (trimPrefix "\n" $formattedPrometheusPodMonitorSelectorObject)) -}}
{{- else }}
{{- $data = $data | replace "$CR_PROMETHEUS_POD_MONITOR_SELECTOR_OBJECT: REMOVE_ME" "{}" -}}
{{- end }}

{{- $prometheusRuleSelectorMap := dict -}}
{{- if .Values.prometheus }}
{{- if .Values.prometheus.prometheusSpec }}
{{- if .Values.prometheus.prometheusSpec.ruleSelector }}
{{- $prometheusRuleSelectorMap = .Values.prometheus.prometheusSpec.ruleSelector -}}
{{- end }}
{{- end }}
{{- end }}
{{- if $prometheusRuleSelectorMap }}
{{- $formattedPrometheusRuleSelectorObject := toYaml $prometheusRuleSelectorMap | nindent 4 -}}
{{- $data = $data | replace "$CR_PROMETHEUS_RULE_SELECTOR_OBJECT: REMOVE_ME" (trimPrefix " " (trimPrefix "\n" $formattedPrometheusRuleSelectorObject)) -}}
{{- else }}
{{- $data = $data | replace "$CR_PROMETHEUS_RULE_SELECTOR_OBJECT: REMOVE_ME" "{}" -}}
{{- end }}

# Inject the externalLabels as a pre-formatted YAML block to allow users to define multiple labels in a dict
{{- $prometheusExternalLabelsMap := dict -}}
{{- if .Values.prometheus -}}
Expand Down
7 changes: 2 additions & 5 deletions src/app_charts/prometheus/prometheus-cloud.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,14 @@ prometheus:
podMonitorSelector:
$CR_PROMETHEUS_POD_MONITOR_SELECTOR_OBJECT: REMOVE_ME

# Pick up all rules across all namespaces.
# Pick up all rules across all namespaces by default.
ruleNamespaceSelector:
# Inverse selector selects everything
matchExpressions:
- key: "non-existent-label-for-universal-matching"
operator: "DoesNotExist"
ruleSelector:
# Inverse selector selects everything
matchExpressions:
- key: "non-existent-label-for-universal-matching"
operator: "DoesNotExist"
$CR_PROMETHEUS_RULE_SELECTOR_OBJECT: REMOVE_ME

scrapeClasses:
- name: default
Expand Down
Loading