chore: merged main into branch, resolved merge conflict

.helmignore

@@ -0,0 +1,2 @@
+.pre-commit-config.yaml
+.github/*

Chart.yaml

@@ -9,42 +9,38 @@ version: "0.0.9"
 appVersion: "58.4.0"
 icon: https://raw.githubusercontent.com/caas-team/caas-project-monitoring/main/logo.png
 keywords:
-  - monitoring
+- monitoring
 dependencies:
-  - name: kube-prometheus-stack
-    version: "58.4.0"
-    repository: "https://prometheus-community.github.io/helm-charts"
-  - condition: rkeEtcd.enabled
-    name: rkeEtcd
-    version: 0.1.6
-    repository: file://./charts/rkeEtcd
-  - condition: rkeControllerManager.enabled
-    name: rkeControllerManager
-    repository: file://./charts/rkeControllerManager
-    version: 0.1.6
-  - condition: rkeScheduler.enabled
-    name: rkeScheduler
-    repository: file://./charts/rkeScheduler
-    version: 0.1.6
-  - condition: rkeIngressNginx.enabled
-    name: rkeIngressNginx
-    repository: file://./charts/rkeIngressNginx
-    version: 0.1.6
-  - condition: rkeProxy.enabled
-    name: rkeProxy
-    repository: file://./charts/rkeProxy
-    version: 0.1.6
-  - condition: hardenedKubelet.enabled
-    name: hardenedKubelet
-    repository: file//.charts/hardenedKubelet
-    version: 0.2.0
+- name: kube-prometheus-stack
+  version: "58.4.0"
+  repository: "https://prometheus-community.github.io/helm-charts"
+- condition: rkeEtcd.enabled
+  name: rkeEtcd
+  version: 0.1.6
+  repository: file://./charts/rkeEtcd
+- condition: rkeControllerManager.enabled
+  name: rkeControllerManager
+  repository: file://./charts/rkeControllerManager
+  version: 0.1.6
+- condition: rkeScheduler.enabled
+  name: rkeScheduler
+  repository: file://./charts/rkeScheduler
+  version: 0.1.6
+- condition: rkeIngressNginx.enabled
+  name: rkeIngressNginx
+  repository: file://./charts/rkeIngressNginx
+  version: 0.1.6
+- condition: rkeProxy.enabled
+  name: rkeProxy
+  repository: file://./charts/rkeProxy
+  version: 0.1.6
 sources:
-  - https://github.com/caas-team/caas-cluster-monitoring
-  - https://github.com/prometheus-community/helm-charts
+- https://github.com/caas-team/caas-cluster-monitoring
+- https://github.com/prometheus-community/helm-charts
 maintainers:
-  - name: eumel8
-    email: [email protected]
-    url: https://www.telekom.com
-  - name: puffitos
-    email: [email protected]
-    url: https://www.telekom.com
+- name: eumel8
+  email: [email protected]
+  url: https://www.telekom.com
+- name: puffitos
+  email: [email protected]
+  url: https://www.telekom.com

README.md

@@ -83,7 +83,7 @@ available config parameters:
 | `kube-prometheus-stack.alertmanager.alertmanagerSpec.forceEnableClusterMode` | bool | `false` |  |
 | `kube-prometheus-stack.alertmanager.alertmanagerSpec.image.registry` | string | `"mtr.devops.telekom.de"` |  |
 | `kube-prometheus-stack.alertmanager.alertmanagerSpec.image.repository` | string | `"kubeprometheusstack/alertmanager"` |  |
-| `kube-prometheus-stack.alertmanager.alertmanagerSpec.image.tag` | string | `"v0.26.0"` |  |
+| `kube-prometheus-stack.alertmanager.alertmanagerSpec.image.tag` | string | `"v0.27.0"` |  |
 | `kube-prometheus-stack.alertmanager.alertmanagerSpec.listenLocal` | bool | `false` |  |
 | `kube-prometheus-stack.alertmanager.alertmanagerSpec.logFormat` | string | `"logfmt"` |  |
 | `kube-prometheus-stack.alertmanager.alertmanagerSpec.logLevel` | string | `"info"` |  |
@@ -137,7 +137,7 @@ available config parameters:
 | `kube-prometheus-stack.alertmanager.serviceMonitor.interval` | string | `"30s"` |  |
 | `kube-prometheus-stack.alertmanager.serviceMonitor.selfMonitor` | bool | `true` |  |
 | `kube-prometheus-stack.alertmanager.servicePerReplica.enabled` | bool | `false` |  |
-| `kube-prometheus-stack.alertmanager.templateFiles."rancher_defaults.tmpl"` | string | `"{{- define \"slack.rancher.text\" -}}\n{{ template \"rancher.text_multiple\" . }}\n{{- end -}}\n{{- define \"webex.text_multiple\" -}}\n{{- range .Alerts }}\n{{ template \"webex.text_single\" . }}\n{{- end }}\n{{- if .ExternalURL }}\nAlertManager: <{{ .ExternalURL }}>\n  \n{{- end }}\n{{- end -}}\n{{- define \"webex.text_single\" -}}\n{{- if .Labels.alertname }}\n## [ALERT - {{ .Labels.alertname }}]\n{{- else }}\n## [ALERT]\n{{- end }}\n{{- if .Labels.severity }}\n### Severity: `{{ .Labels.severity }}`\n{{- end }}\n{{- if .Labels.cluster }}\n### Cluster:  {{ .Labels.cluster }}\n{{- end }}\n{{- if .Annotations.summary }}\n### Summary: {{ .Annotations.summary }}\n{{- end }}\n{{- if .Annotations.message }}\nMessage:  {{ .Annotations.message }}\n{{- end }}\n{{- if .Annotations.description }}\nDescription:  {{ .Annotations.description }}\n{{- end }}\n{{- if .Annotations.runbook_url }}\nRunbook URL: <{{ .Annotations.runbook_url }}|:spiral_note_pad:>\n{{- end }}\n{{- with .Labels }}\n{{- with .Remove (stringSlice \"alertname\" \"severity\" \"cluster\") }}\n{{- if gt (len .) 0 }}\nAdditional Labels:\n  {{- range .SortedPairs }}\n  • {{ .Name }}: `{{ .Value }}`\n  {{- end }}\n{{- end }}\n{{- end }}\n{{- end }}\n{{- with .Annotations }}\n{{- with .Remove (stringSlice \"summary\" \"message\" \"description\" \"runbook_url\") }}\n{{- if gt (len .) 0 }}\n## Additional Annotations:*\n  {{- range .SortedPairs }}\n  • {{ .Name }}: `{{ .Value }}`\n  {{- end }}\n{{- end }}\n{{- end }}\n{{- end }}\n\n{{- end -}}\n{{- define \"rancher.text_multiple\" -}}\n*[GROUP - Details]* \nOne or more alarms in this group have triggered a notification.\n\n{{- if gt (len .GroupLabels.Values) 0 }}\n*Group Labels:*\n  {{- range .GroupLabels.SortedPairs }}\n  • *{{ .Name }}:* `{{ .Value }}`\n  {{- end }}\n{{- end }}\n{{- if .ExternalURL }}\n*Link to AlertManager:* {{ .ExternalURL }}\n{{- end }}\n\n{{- range .Alerts }}\n{{ template \"rancher.text_single\" . }}\n{{- end }}\n{{- end -}}\n\n{{- define \"rancher.text_single\" -}}\n{{- if .Labels.alertname }}\n*[ALERT - {{ .Labels.alertname }}]*\n{{- else }}\n*[ALERT]*\n{{- end }}\n{{- if .Labels.severity }}\n*Severity:* `{{ .Labels.severity }}`\n{{- end }}\n{{- if .Labels.cluster }}\n*Cluster:*  {{ .Labels.cluster }}\n{{- end }}\n{{- if .Annotations.summary }}\n*Summary:* {{ .Annotations.summary }}\n{{- end }}\n{{- if .Annotations.message }}\n*Message:* {{ .Annotations.message }}\n{{- end }}\n{{- if .Annotations.description }}\n*Description:* {{ .Annotations.description }}\n{{- end }}\n{{- if .Annotations.runbook_url }}\n*Runbook URL:* <{{ .Annotations.runbook_url }}|:spiral_note_pad:>\n{{- end }}\n{{- with .Labels }}\n{{- with .Remove (stringSlice \"alertname\" \"severity\" \"cluster\") }}\n{{- if gt (len .) 0 }}\n*Additional Labels:*\n  {{- range .SortedPairs }}\n  • *{{ .Name }}:* `{{ .Value }}`\n  {{- end }}\n{{- end }}\n{{- end }}\n{{- end }}\n{{- with .Annotations }}\n{{- with .Remove (stringSlice \"summary\" \"message\" \"description\" \"runbook_url\") }}\n{{- if gt (len .) 0 }}\n*Additional Annotations:*\n  {{- range .SortedPairs }}\n  • *{{ .Name }}:* `{{ .Value }}`\n  {{- end }}\n{{- end }}\n{{- end }}\n{{- end }}\n{{- end -}}"` |  |
+| `kube-prometheus-stack.alertmanager.templateFiles."rancher_defaults.tmpl"` | string | `"{{- define \"slack.rancher.text\" -}} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{ template \"rancher.text_multiple\" . }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end -}} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- define \"webex.text_multiple\" -}} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- range .Alerts }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{ template \"webex.text_single\" . }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .ExternalURL }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line AlertManager: <{{ .ExternalURL }}> #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end -}} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- define \"webex.text_single\" -}} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Labels.alertname }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line ## [ALERT - {{ .Labels.alertname }}] #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- else }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line ## [ALERT] #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Labels.severity }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line ### Severity: `{{ .Labels.severity }}` #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Labels.cluster }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line ### Cluster:  {{ .Labels.cluster }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Annotations.summary }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line ### Summary: {{ .Annotations.summary }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Annotations.message }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line Message:  {{ .Annotations.message }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Annotations.description }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line Description:  {{ .Annotations.description }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Annotations.runbook_url }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line Runbook URL: <{{ .Annotations.runbook_url }}|:spiral_note_pad:> #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- with .Labels }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- with .Remove (stringSlice \"alertname\" \"severity\" \"cluster\") }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if gt (len .) 0 }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line Additional Labels: #magic___^_^___line   {{- range .SortedPairs }} #magic___^_^___line   • {{ .Name }}: `{{ .Value }}` #magic___^_^___line   {{- end }} #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- with .Annotations }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- with .Remove (stringSlice \"summary\" \"message\" \"description\" \"runbook_url\") }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if gt (len .) 0 }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line ## Additional Annotations:* #magic___^_^___line   {{- range .SortedPairs }} #magic___^_^___line   • {{ .Name }}: `{{ .Value }}` #magic___^_^___line   {{- end }} #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end -}} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- define \"rancher.text_multiple\" -}} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *[GROUP - Details]*  #magic___^_^___line       #magic___^_^___line #magic___^_^___line One or more alarms in this group have triggered a notification. #magic___^_^___line       #magic___^_^___line #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if gt (len .GroupLabels.Values) 0 }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Group Labels:* #magic___^_^___line   {{- range .GroupLabels.SortedPairs }} #magic___^_^___line   • *{{ .Name }}:* `{{ .Value }}` #magic___^_^___line   {{- end }} #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .ExternalURL }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Link to AlertManager:* {{ .ExternalURL }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- range .Alerts }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{ template \"rancher.text_single\" . }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end -}} #magic___^_^___line       #magic___^_^___line #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- define \"rancher.text_single\" -}} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Labels.alertname }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *[ALERT - {{ .Labels.alertname }}]* #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- else }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *[ALERT]* #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Labels.severity }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Severity:* `{{ .Labels.severity }}` #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Labels.cluster }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Cluster:*  {{ .Labels.cluster }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Annotations.summary }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Summary:* {{ .Annotations.summary }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Annotations.message }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Message:* {{ .Annotations.message }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Annotations.description }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Description:* {{ .Annotations.description }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if .Annotations.runbook_url }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Runbook URL:* <{{ .Annotations.runbook_url }}|:spiral_note_pad:> #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- with .Labels }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- with .Remove (stringSlice \"alertname\" \"severity\" \"cluster\") }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if gt (len .) 0 }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Additional Labels:* #magic___^_^___line   {{- range .SortedPairs }} #magic___^_^___line   • *{{ .Name }}:* `{{ .Value }}` #magic___^_^___line   {{- end }} #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- with .Annotations }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- with .Remove (stringSlice \"summary\" \"message\" \"description\" \"runbook_url\") }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- if gt (len .) 0 }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line *Additional Annotations:* #magic___^_^___line   {{- range .SortedPairs }} #magic___^_^___line   • *{{ .Name }}:* `{{ .Value }}` #magic___^_^___line   {{- end }} #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end }} #magic___^_^___line       #magic___^_^___line #magic___^_^___line {{- end -}}"` |  |
 | `kube-prometheus-stack.coreDns.enabled` | bool | `true` |  |
 | `kube-prometheus-stack.crds.enabled` | bool | `false` |  |
 | `kube-prometheus-stack.defaultRules.appNamespacesTarget` | string | `".*"` |  |
@@ -209,8 +209,8 @@ available config parameters:
 | `kube-prometheus-stack.grafana.forceDeployDashboards` | bool | `true` |  |
 | `kube-prometheus-stack.grafana.forceDeployDatasources` | bool | `true` |  |
 | `kube-prometheus-stack.grafana.fullnameOverride` | string | `"rancher-monitoring-grafana"` |  |
-| `kube-prometheus-stack.grafana.image.repository` | string | `"mtr.devops.telekom.de/kubeprometheusstack/grafana"` |  |
-| `kube-prometheus-stack.grafana.image.tag` | string | `"10.1.4"` |  |
+| `kube-prometheus-stack.grafana.image.repository` | string | `"kubeprometheusstack/grafana"` |  |
+| `kube-prometheus-stack.grafana.image.tag` | string | `"10.4.1"` |  |
 | `kube-prometheus-stack.grafana.initChownData.enabled` | bool | `false` |  |
 | `kube-prometheus-stack.grafana.nameOverride` | string | `"rancher-monitoring-grafana"` |  |
 | `kube-prometheus-stack.grafana.namespaceOverride` | string | `""` |  |
@@ -249,7 +249,7 @@ available config parameters:
 | `kube-prometheus-stack.grafana.sidecar.datasources.label` | string | `"grafana_datasource"` |  |
 | `kube-prometheus-stack.grafana.sidecar.datasources.labelValue` | string | `"1"` |  |
 | `kube-prometheus-stack.grafana.sidecar.datasources.searchNamespace` | string | `""` |  |
-| `kube-prometheus-stack.grafana.sidecar.image.repository` | string | `"mtr.devops.telekom.de/kubeprometheusstack/k8s-sidecar"` |  |
+| `kube-prometheus-stack.grafana.sidecar.image.repository` | string | `"kubeprometheusstack/k8s-sidecar"` |  |
 | `kube-prometheus-stack.grafana.sidecar.image.tag` | string | `"1.24.6"` |  |
 | `kube-prometheus-stack.grafana.sidecar.plugins.searchNamespace` | string | `""` |  |
 | `kube-prometheus-stack.grafana.sidecar.resources.limits.cpu` | string | `"100m"` |  |
@@ -369,7 +369,7 @@ available config parameters:
 | `kube-prometheus-stack.prometheus.prometheusSpec.ignoreNamespaceSelectors` | bool | `false` |  |
 | `kube-prometheus-stack.prometheus.prometheusSpec.image.registry` | string | `"mtr.devops.telekom.de"` |  |
 | `kube-prometheus-stack.prometheus.prometheusSpec.image.repository` | string | `"kubeprometheusstack/prometheus"` |  |
-| `kube-prometheus-stack.prometheus.prometheusSpec.image.tag` | string | `"v2.46.0"` |  |
+| `kube-prometheus-stack.prometheus.prometheusSpec.image.tag` | string | `"v2.51.2"` |  |
 | `kube-prometheus-stack.prometheus.prometheusSpec.listenLocal` | bool | `false` |  |
 | `kube-prometheus-stack.prometheus.prometheusSpec.logFormat` | string | `"logfmt"` |  |
 | `kube-prometheus-stack.prometheus.prometheusSpec.logLevel` | string | `"info"` |  |