Skip to content

Commit 5346ac0

Browse files
authored
chore: support policies & dashboard switch with default false enabled (#7)
## What type of PR is this? * [ ] Feature * [ ] BUG * [x] Alerts * [x] Improvement * [ ] Documentation * [x] Test and CI ## Which issue(s) this PR related: issue # ## What this PR does / why we need it: changes: 1. default disable `mo-ruler-stack` and `mo-ob-opensource` deploy alert rules 2. default disable `mo-ruler-stack` deploy dashboards. 3. change chart as 1.0.1
1 parent f9ee4fb commit 5346ac0

File tree

8 files changed

+28
-7
lines changed

8 files changed

+28
-7
lines changed

charts/mo-ob-opensource/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: mo-ob-opensource
33
description: mo-ob-opensource's Helm chart for Kubernetes
44
type: application
5-
version: 1.0.0-alpha.16
5+
version: 1.0.1
66
appVersion: 0.9.0
77
dependencies:
88
- condition: kube-prometheus-stack.enabled

charts/mo-ob-opensource/templates/log-alert-rules.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.alertrules.enabled }}
12
## cooperate with {folder_to_char}/alert-rules/log-alert-rules/*.yaml
23
{{- $files := .Files.Glob "alert-rules/log-alert-rules/*.yaml" }}
34
{{- if $files }}
@@ -17,4 +18,5 @@ items:
1718
data:
1819
{{ printf "%s.yaml" $alertFileName }}: {{ $.Files.Get $path | toYaml | indent 2}}
1920
{{- end }}
20-
{{- end }}
21+
{{- end }}
22+
{{- end }} # end if enabled

charts/mo-ob-opensource/templates/mo-alerting-rules.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.alertrules.enabled }}
12
apiVersion: v1
23
kind: List
34
metadata:
@@ -22,4 +23,5 @@ items:
2223
heritage: Helm
2324
spec:
2425
{{ $root.Files.Get $path | nindent 6 }}
25-
{{- end }}
26+
{{- end }}
27+
{{- end }}

charts/mo-ob-opensource/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
alerting:
22
namespace: "mo-ob"
33

4+
# swith for generate alertrules which defined in `rules` folder
5+
# - cooperate with template templates/mo-alerting-rules.yaml
6+
# swith for generate alertrules which defined in `alert-rules/log-alert-rules` folder
7+
# - cooperate with template templates/log-alert-rules.yaml
8+
alertrules:
9+
enabled: false
10+
411
promtail:
512
enabled: true
613
serviceMonitor:

charts/mo-ruler-stack/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: mo-ruler-stack
33
description: mo-ruler's Helm chart for Kubernetes
44
type: application
5-
version: 1.0.0-alpha.13
5+
version: 1.0.1
66
appVersion: 0.9.0
77
dependencies:
88
- condition: alertmanager.enabled

charts/mo-ruler-stack/templates/grafana/dashboards-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.grafana.enabled }}
1+
{{- if (and .Values.grafana.enabled .Values.dashboards.enabled ) }}
22
{{- $files := .Files.Glob "grafana/dashboards/*.json" }}
33
{{- if $files }}
44
apiVersion: v1
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ if .Values.moRuler.enabled }}
1+
{{ if (and .Values.moRuler.enabled .Values.alertrules.enabled) }}
22

33
apiVersion: v1
44
data:
@@ -7,4 +7,4 @@ kind: ConfigMap
77
metadata:
88
name: rules-config-map
99

10-
{{ end }}
10+
{{ end }}

charts/mo-ruler-stack/values.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ secretSeed:
1717
## param for templates/grafana/grafana-admin-secret.yaml
1818
grafana: YXNkZl9wYXNzd29y
1919

20+
# swith for generate dashboards which defined in `grafana` folder
21+
# cooperate with template templates/grafana/dashboards-configmap.yaml
22+
dashboards:
23+
enabled: false
24+
25+
# swith for generate dashboards which defined in `rules` folder
26+
# cooperate with template templates/rules-config.yaml
27+
alertrules:
28+
enabled: false
29+
2030
moRuler:
2131
replicaCount: 1
2232
enabled: false

0 commit comments

Comments
 (0)