diff --git a/infra/monitoring/kube-prometheus-stack/Chart.lock b/infra/monitoring/kube-prometheus-stack/Chart.lock
index bb608b0accd154e27c9e73aa062c248bc9b4ca3e..0db67fa378a7894580ea6b159a1663e33da7239f 100644
--- a/infra/monitoring/kube-prometheus-stack/Chart.lock
+++ b/infra/monitoring/kube-prometheus-stack/Chart.lock
@@ -1,12 +1,12 @@
dependencies:
- name: kube-prometheus-stack
repository: https://prometheus-community.github.io/helm-charts
- version: 36.2.1
+ version: 39.9.0
- name: oauth2-proxy
repository: https://oauth2-proxy.github.io/manifests
- version: 6.2.1
+ version: 6.2.2
- name: oauth2-proxy
repository: https://oauth2-proxy.github.io/manifests
- version: 6.2.1
-digest: sha256:8448ad1b97f2f338e76c07d09bab4c1dd88210e51882109144ec9f115101993d
-generated: "2022-07-01T17:16:38.600462551+02:00"
+ version: 6.2.2
+digest: sha256:28af8f5292b79487fa5c603e95fa5204a1f4de8dd416e090f348d54a475d04c5
+generated: "2022-08-21T20:13:45.435634012+02:00"
diff --git a/infra/monitoring/kube-prometheus-stack/Chart.yaml b/infra/monitoring/kube-prometheus-stack/Chart.yaml
index 7cc6f3d489fa351ad4471db545a2b492d869ad21..c3da3625435f9d9d9edb1f40507efc8ee4ac34ce 100644
--- a/infra/monitoring/kube-prometheus-stack/Chart.yaml
+++ b/infra/monitoring/kube-prometheus-stack/Chart.yaml
@@ -7,15 +7,15 @@ version: 1.1.0
dependencies:
- name: kube-prometheus-stack
- version: 36.2.1
+ version: 39.9.0
repository: https://prometheus-community.github.io/helm-charts
- name: oauth2-proxy
alias: oauth2-prometheus
- version: 6.2.1
+ version: 6.2.2
repository: https://oauth2-proxy.github.io/manifests
- name: oauth2-proxy
alias: oauth2-alertmanager
- version: 6.2.1
+ version: 6.2.2
repository: https://oauth2-proxy.github.io/manifests
appVersion: "1.2.0"
diff --git a/infra/monitoring/kube-prometheus-stack/values.yaml b/infra/monitoring/kube-prometheus-stack/values.yaml
index fb47ec8cb1743b38a2f956cb5065fb474de6732d..c4aeb9eeec3bf214ecf1310ffb5a297f9eaa11e3 100644
--- a/infra/monitoring/kube-prometheus-stack/values.yaml
+++ b/infra/monitoring/kube-prometheus-stack/values.yaml
@@ -7,10 +7,13 @@ kube-prometheus-stack:
kubeProxy: false
kubeProxy:
enabled: false # Cilium does this using eBPF
+ prometheusOperator:
+ priorityClassName: "infra-monitoring"
prometheus:
prometheusSpec:
+ priorityClassName: "infra-monitoring"
initContainers:
- # Ownership has to be set on the data dir,
+ # Ownership has to be set on the data dir,
# because of some CSI Storage class
- name: init-chown-data
image: busybox:1.34.1
@@ -20,9 +23,9 @@ kube-prometheus-stack:
- 65534:65534
- /mnt
volumeMounts:
- - name: kube-prometheus-prometheus-db
- mountPath: /mnt
- subPath: prometheus-db
+ - name: kube-prometheus-prometheus-db
+ mountPath: /mnt
+ subPath: prometheus-db
securityContext:
runAsUser: 0
runAsGroup: 0
@@ -45,53 +48,54 @@ kube-prometheus-stack:
alertmanager:
alertmanagerSpec:
+ priorityClassName: "infra-monitoring"
externalUrl: https://alertmanager.k8s-02.sch.bme.hu
config:
global:
resolve_timeout: 5m
route:
- group_by: ['job']
+ group_by: ["job"]
group_wait: 30s
group_interval: 5m
repeat_interval: 12h
receiver: Default
routes:
- - match:
- alertname: Watchdog
- receiver: Watchdog
- - matchers:
- - severity=~"warning|critical"
- receiver: Mattermost
- group_wait: 10s
-# receivers: - set in values.yaml.secret
-# - name: Default
-# - name: Mattermost
-# slack_configs:
-# - api_url: https://mattermost.kszk.bme.hu/hooks/ SECRET
-# channel: "#alerts-k8s"
-# username: '{{ template "slack.default.username" . }}'
-# color: '{{ if eq .Status "firing" }}danger{{ else }}good{{ end }}'
-# title: '{{ template "slack.default.title" . }}'
-# title_link: '{{ template "slack.default.titlelink" . }}'
-# pretext: '{{ .CommonAnnotations.summary }}'
-# text: |-
-# {{ range .Alerts }}
-# *Alert:* {{ .Annotations.summary }} - `{{ .Labels.severity }}`
-# *Description:* {{ .Annotations.description }}
-# *Details:*
-# {{ range .Labels.SortedPairs }} • *{{ .Name }}:* `{{ .Value }}`
-# {{ end }}
-# {{ end }}
-# fallback: '{{ template "slack.default.fallback" . }}'
-# icon_emoji: '{{ template "slack.default.iconemoji" . }}'
-# icon_url: '{{ template "slack.default.iconurl" . }}'
-# - name: Critical
-# pagerduty_configs:
-# - service_key: SECRET
-# url: https://events.eu.pagerduty.com/generic/2010-04-15/create_event.json
-# - name: Watchdog
+ - match:
+ alertname: Watchdog
+ receiver: Watchdog
+ - matchers:
+ - severity=~"warning|critical"
+ receiver: Mattermost
+ group_wait: 10s
+ # receivers: - set in values.yaml.secret
+ # - name: Default
+ # - name: Mattermost
+ # slack_configs:
+ # - api_url: https://mattermost.kszk.bme.hu/hooks/ SECRET
+ # channel: "#alerts-k8s"
+ # username: '{{ template "slack.default.username" . }}'
+ # color: '{{ if eq .Status "firing" }}danger{{ else }}good{{ end }}'
+ # title: '{{ template "slack.default.title" . }}'
+ # title_link: '{{ template "slack.default.titlelink" . }}'
+ # pretext: '{{ .CommonAnnotations.summary }}'
+ # text: |-
+ # {{ range .Alerts }}
+ # *Alert:* {{ .Annotations.summary }} - `{{ .Labels.severity }}`
+ # *Description:* {{ .Annotations.description }}
+ # *Details:*
+ # {{ range .Labels.SortedPairs }} • *{{ .Name }}:* `{{ .Value }}`
+ # {{ end }}
+ # {{ end }}
+ # fallback: '{{ template "slack.default.fallback" . }}'
+ # icon_emoji: '{{ template "slack.default.iconemoji" . }}'
+ # icon_url: '{{ template "slack.default.iconurl" . }}'
+ # - name: Critical
+ # pagerduty_configs:
+ # - service_key: SECRET
+ # url: https://events.eu.pagerduty.com/generic/2010-04-15/create_event.json
+ # - name: Watchdog
templates:
- - '/etc/alertmanager/config/*.tmpl'
+ - "/etc/alertmanager/config/*.tmpl"
grafana:
deploymentStrategy:
@@ -102,10 +106,10 @@ kube-prometheus-stack:
storageClassName: vsphere-csi
accessModes: ["ReadWriteOnce"]
size: 1Gi
-
+
sidecar:
dashboards: # Automatically import configmaps with the specified label
- enabled: true
+ enabled: true
label: grafana_dashboard
searchNamespace: monitoring
@@ -215,11 +219,12 @@ oauth2-prometheus:
hosts:
- prometheus.k8s-02.sch.bme.hu
- resources: {}
+ resources:
+ {}
# limits:
# memory: 60Mi
- priorityClassName: ""
+ priorityClassName: "infra-monitoring"
podDisruptionBudget:
enabled: false
@@ -273,11 +278,12 @@ oauth2-alertmanager:
hosts:
- alertmanager.k8s-02.sch.bme.hu
- resources: {}
+ resources:
+ {}
# limits:
# memory: 60Mi
- priorityClassName: ""
+ priorityClassName: "infra-monitoring"
podDisruptionBudget:
enabled: false