diff --git a/Chart.yaml b/Chart.yaml index 10c78bd..403a2e9 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -3,7 +3,7 @@ annotations: catalog.cattle.io/display-name: CaaS Cluster Monitoring V3 name: caas-cluster-monitoring description: A Helm chart for Rancher Cluster Monitoring V3 -version: "0.0.11" +version: "0.0.12" appVersion: "58.4.0" icon: https://raw.githubusercontent.com/caas-team/caas-project-monitoring/main/logo.png keywords: diff --git a/README.md b/README.md index fd806d7..18b9952 100644 --- a/README.md +++ b/README.md @@ -231,6 +231,7 @@ available config parameters: | `kube-prometheus-stack.grafana.serviceAccount.name` | string | `"rancher-monitoring"` | | | `kube-prometheus-stack.grafana.serviceMonitor.enabled` | bool | `true` | | | `kube-prometheus-stack.grafana.serviceMonitor.interval` | string | `"30s"` | | +| `kube-prometheus-stack.grafana.serviceMonitor.labels.release` | string | `"rancher-monitoring"` | | | `kube-prometheus-stack.grafana.serviceMonitor.path` | string | `"/metrics"` | | | `kube-prometheus-stack.grafana.serviceMonitor.scheme` | string | `"http"` | | | `kube-prometheus-stack.grafana.serviceMonitor.scrapeTimeout` | string | `"30s"` | | @@ -480,6 +481,9 @@ available config parameters: | `rkeControllerManager.kubeVersionOverrides[0].values.clients.https.useServiceAccountCredentials` | bool | `false` | | | `rkeControllerManager.kubeVersionOverrides[0].values.metricsPort` | int | `10252` | | | `rkeControllerManager.metricsPort` | int | `10257` | | +| `rkeControllerManager.serviceMonitor.endpoints[0].honorLabels` | bool | `true` | | +| `rkeControllerManager.serviceMonitor.endpoints[0].metricRelabelings` | list | `[{"action":"keep","regex":"process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|storage_operation_duration_seconds_(bucket|count)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|up|go_goroutines","sourceLabels":["__name__"]}]` | are needed, they should be added to this regex. | +| `rkeControllerManager.serviceMonitor.endpoints[0].port` | string | `"metrics"` | | ### rkeEtcd @@ -535,6 +539,9 @@ available config parameters: | `rkeProxy.component` | string | `"kube-proxy"` | | | `rkeProxy.enabled` | bool | `true` | | | `rkeProxy.metricsPort` | int | `10249` | | +| `rkeProxy.serviceMonitor.endpoints[0].honorLabels` | bool | `true` | | +| `rkeProxy.serviceMonitor.endpoints[0].metricRelabelings` | list | `[{"action":"keep","regex":"process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|up|go_goroutines","sourceLabels":["__name__"]}]` | are needed, they should be added to this regex. | +| `rkeProxy.serviceMonitor.endpoints[0].port` | string | `"metrics"` | | ### rkeScheduler @@ -561,6 +568,9 @@ available config parameters: | `rkeScheduler.kubeVersionOverrides[0].values.clients.https.useServiceAccountCredentials` | bool | `false` | | | `rkeScheduler.kubeVersionOverrides[0].values.metricsPort` | int | `10251` | | | `rkeScheduler.metricsPort` | int | `10259` | | +| `rkeScheduler.serviceMonitor.endpoints[0].honorLabels` | bool | `true` | | +| `rkeScheduler.serviceMonitor.endpoints[0].metricRelabelings` | list | `[{"action":"keep","regex":"process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|up|go_goroutines","sourceLabels":["__name__"]}]` | are needed, they should be added to this regex. | +| `rkeScheduler.serviceMonitor.endpoints[0].port` | string | `"metrics"` | | ### hardenedKubelet diff --git a/charts/hardenedKubelet/README.md b/charts/hardenedKubelet/README.md index 76c4a28..b15f8a9 100644 --- a/charts/hardenedKubelet/README.md +++ b/charts/hardenedKubelet/README.md @@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients. | serviceMonitor.endpoints[0].port | string | `"metrics"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/kube-prometheus-stack-58.4.0.tgz b/charts/kube-prometheus-stack-58.4.0.tgz index 75aae51..247bb57 100644 Binary files a/charts/kube-prometheus-stack-58.4.0.tgz and b/charts/kube-prometheus-stack-58.4.0.tgz differ diff --git a/charts/rkeControllerManager/README.md b/charts/rkeControllerManager/README.md index 715e5ed..17d1e7e 100644 --- a/charts/rkeControllerManager/README.md +++ b/charts/rkeControllerManager/README.md @@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients. | serviceMonitor.endpoints[0].port | string | `"metrics"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/rkeEtcd/README.md b/charts/rkeEtcd/README.md index b752f0b..5f31b2b 100644 --- a/charts/rkeEtcd/README.md +++ b/charts/rkeEtcd/README.md @@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients. | serviceMonitor.endpoints[0].port | string | `"metrics"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/rkeIngressNginx/README.md b/charts/rkeIngressNginx/README.md index 3abb7f6..00e5b03 100644 --- a/charts/rkeIngressNginx/README.md +++ b/charts/rkeIngressNginx/README.md @@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients. | serviceMonitor.endpoints[0].port | string | `"metrics"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/rkeProxy/README.md b/charts/rkeProxy/README.md index 80c4ce4..44304ae 100644 --- a/charts/rkeProxy/README.md +++ b/charts/rkeProxy/README.md @@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients. | serviceMonitor.endpoints[0].port | string | `"metrics"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/rkeScheduler/README.md b/charts/rkeScheduler/README.md index 8ddbcc8..26158c9 100644 --- a/charts/rkeScheduler/README.md +++ b/charts/rkeScheduler/README.md @@ -61,4 +61,4 @@ Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients. | serviceMonitor.endpoints[0].port | string | `"metrics"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/values.yaml b/values.yaml index 46d9ffd..f5f794e 100644 --- a/values.yaml +++ b/values.yaml @@ -146,7 +146,7 @@ kube-prometheus-stack: servicePerReplica: enabled: false templateFiles: - rancher_defaults.tmpl: "{{- 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 -}}" + rancher_defaults.tmpl: '{{- 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 -}}' coreDns: enabled: true @@ -310,9 +310,12 @@ kube-prometheus-stack: serviceMonitor: enabled: true interval: "30s" + labels: + release: rancher-monitoring path: "/metrics" scheme: http scrapeTimeout: 30s + sidecar: dashboards: annotations: {} @@ -695,6 +698,18 @@ rkeControllerManager: useServiceAccountCredentials: false metricsPort: 10252 # default to insecure port in k8s < 1.22 metricsPort: 10257 # default to secure port as of k8s >= 1.22 + serviceMonitor: + endpoints: + - port: metrics + honorLabels: true + # -- Relabeling to keep only the needed metrics + # -- for the grafana dashboards. If additional metrics + # -- are needed, they should be added to this regex. + metricRelabelings: + - action: keep + regex: "process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|storage_operation_duration_seconds_(bucket|count)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|up|go_goroutines" + sourceLabels: + - __name__ rkeEtcd: enabled: true @@ -735,7 +750,7 @@ rkeEtcd: # -- are needed, they should be added to this regex. metricRelabelings: - action: keep - regex: 'grpc_server_(handled_total|started_total)|up|process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|go_goroutines|etcd_disk_(backend_commit_duration_seconds_bucket|wal_fsync_duration_seconds_bucket)|etcd_server_proposals_(pending|failed_total|applied_total|committed_total)|etcd_network_client_grpc_(sent_bytes_total|received_bytes_total)|etcd_mvcc_db_total_size_in_bytes' + regex: "grpc_server_(handled_total|started_total)|up|process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|go_goroutines|etcd_disk_(backend_commit_duration_seconds_bucket|wal_fsync_duration_seconds_bucket)|etcd_server_proposals_(pending|failed_total|applied_total|committed_total)|etcd_network_client_grpc_(sent_bytes_total|received_bytes_total)|etcd_mvcc_db_total_size_in_bytes" sourceLabels: - __name__ @@ -766,6 +781,18 @@ rkeProxy: operator: "Exists" - effect: "NoSchedule" operator: "Exists" + serviceMonitor: + endpoints: + - port: metrics + honorLabels: true + # -- Relabeling to keep only the needed metrics + # -- for the grafana dashboards. If additional metrics + # -- are needed, they should be added to this regex. + metricRelabelings: + - action: keep + regex: "process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|up|go_goroutines" + sourceLabels: + - __name__ rkeScheduler: clients: @@ -802,6 +829,18 @@ rkeScheduler: useServiceAccountCredentials: false metricsPort: 10251 # default to insecure port in k8s < 1.23 metricsPort: 10259 + serviceMonitor: + endpoints: + - port: metrics + honorLabels: true + # -- Relabeling to keep only the needed metrics + # -- for the grafana dashboards. If additional metrics + # -- are needed, they should be added to this regex. + metricRelabelings: + - action: keep + regex: "process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|up|go_goroutines" + sourceLabels: + - __name__ hardenedKubelet: enabled: true @@ -843,7 +882,7 @@ hardenedKubelet: targetLabel: metrics_path metricRelabelings: - action: keep - regex: 'up|go_goroutines|storage_operation_(duration_seconds_bucket|duration_seconds_count)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|kubelet_pod_(worker_duration_seconds_bucket|start_duration_seconds_bucket|worker_duration_seconds_count|start_duration_seconds_count)|kubelet_cgroup_manager_(duration_seconds_bucket|duration_seconds_count)|kubelet_runtime_operations_(duration_seconds_bucket|total|errors_total)|kubelet_volume_stats_(inodes_used|inodes|available_bytes|capacity_bytes|used_bytes)|kubelet_pleg_relist_(duration_seconds_bucket|interval_seconds_bucket|duration_seconds_count)|kubelet_running_(containers|pods)|kubelet_node_name|volume_manager_total_volumes' + regex: "up|go_goroutines|storage_operation_(duration_seconds_bucket|duration_seconds_count)|rest_client_(request_duration_seconds_bucket|requests_total)|workqueue_(queue_duration_seconds_bucket|depth|adds_total)|process_(start_time_seconds|cpu_seconds_total|resident_memory_bytes)|kubelet_pod_(worker_duration_seconds_bucket|start_duration_seconds_bucket|worker_duration_seconds_count|start_duration_seconds_count)|kubelet_cgroup_manager_(duration_seconds_bucket|duration_seconds_count)|kubelet_runtime_operations_(duration_seconds_bucket|total|errors_total)|kubelet_volume_stats_(inodes_used|inodes|available_bytes|capacity_bytes|used_bytes)|kubelet_pleg_relist_(duration_seconds_bucket|interval_seconds_bucket|duration_seconds_count)|kubelet_running_(containers|pods)|kubelet_node_name|volume_manager_total_volumes" sourceLabels: - __name__ - port: metrics @@ -854,7 +893,7 @@ hardenedKubelet: targetLabel: metrics_path metricRelabelings: - action: keep - regex: 'up|container_network_(transmit_bytes_total|transmit_bytes_total|receive_errors_total|receive_packets_dropped_total|receive_bytes_total|receive_packets_total|transmit_packets_dropped_total|transmit_packets_total|transmit_errors_total)|container_memory_(cache|rss|working_set_bytes|usage_bytes)|container_fs_(reads_total|writes_total|reads_bytes_total|writes_bytes_total)|container_cpu_(system_seconds_total|usage_seconds_total|user_seconds_total|cfs_periods_total|cfs_throttled_periods_total|cfs_throttled_seconds_total)|node_namespace_pod_container:(container_memory_working_set_bytes|container_memory_cache|container_memory_rss)|machine_(cpu_cores|memory_bytes)' + regex: "up|container_network_(transmit_bytes_total|transmit_bytes_total|receive_errors_total|receive_packets_dropped_total|receive_bytes_total|receive_packets_total|transmit_packets_dropped_total|transmit_packets_total|transmit_errors_total)|container_memory_(cache|rss|working_set_bytes|usage_bytes)|container_fs_(reads_total|writes_total|reads_bytes_total|writes_bytes_total)|container_cpu_(system_seconds_total|usage_seconds_total|user_seconds_total|cfs_periods_total|cfs_throttled_periods_total|cfs_throttled_seconds_total)|node_namespace_pod_container:(container_memory_working_set_bytes|container_memory_cache|container_memory_rss)|machine_(cpu_cores|memory_bytes)" sourceLabels: - __name__ - port: metrics