andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
rancher-charts/packages/rancher-monitoring/generated-changes/patch/templates/grafana/dashboards-1.14/proxy.yaml.patch

162 lines
11 KiB
Diff
Raw Normal View History

(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
--- charts-original/templates/grafana/dashboards-1.14/proxy.yaml
+++ charts/templates/grafana/dashboards-1.14/proxy.yaml
@@ -4,11 +4,12 @@
https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack
*/ -}}
{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
-{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeProxy.enabled }}
+{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }}
+{{- if (include "exporter.kubeProxy.enabled" .)}}
apiVersion: v1
kind: ConfigMap
metadata:
- namespace: {{ template "kube-prometheus-stack.namespace" . }}
+ namespace: {{ .Values.grafana.defaultDashboards.namespace }}
name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }}
annotations:
{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -107,7 +108,11 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"tableColumn": "",
"targets": [
{
- "expr": "sum(up{job=\"kube-proxy\"})",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
+ {{- if .Values.k3sServer.enabled }}
+ "expr": "sum(up{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", metrics_path=\"/metrics\"})",
+ {{- else }}
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
+ "expr": "sum(up{job=\"{{ include "exporter.kubeProxy.jobName" . }}\"})",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
+ {{- end }}
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -176,7 +181,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "sum(rate(kubeproxy_sync_proxy_rules_duration_seconds_count{job=\"kube-proxy\", instance=~\"$instance\"}[5m]))",
+ "expr": "sum(rate(kubeproxy_sync_proxy_rules_duration_seconds_count{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", instance=~\"$instance\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "rate",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -269,7 +274,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "histogram_quantile(0.99,rate(kubeproxy_sync_proxy_rules_duration_seconds_bucket{job=\"kube-proxy\", instance=~\"$instance\"}[5m]))",
+ "expr": "histogram_quantile(0.99,rate(kubeproxy_sync_proxy_rules_duration_seconds_bucket{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", instance=~\"$instance\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{`{{`}}instance{{`}}`}}",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -375,7 +380,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "sum(rate(kubeproxy_network_programming_duration_seconds_count{job=\"kube-proxy\", instance=~\"$instance\"}[5m]))",
+ "expr": "sum(rate(kubeproxy_network_programming_duration_seconds_count{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", instance=~\"$instance\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "rate",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -468,7 +473,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "histogram_quantile(0.99, sum(rate(kubeproxy_network_programming_duration_seconds_bucket{job=\"kube-proxy\", instance=~\"$instance\"}[5m])) by (instance, le))",
+ "expr": "histogram_quantile(0.99, sum(rate(kubeproxy_network_programming_duration_seconds_bucket{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", instance=~\"$instance\"}[5m])) by (instance, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{`{{`}}instance{{`}}`}}",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -574,28 +579,28 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "sum(rate(rest_client_requests_total{job=\"kube-proxy\", instance=~\"$instance\",code=~\"2..\"}[5m]))",
+ "expr": "sum(rate(rest_client_requests_total{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", instance=~\"$instance\",code=~\"2..\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "2xx",
"refId": "A"
},
{
- "expr": "sum(rate(rest_client_requests_total{job=\"kube-proxy\", instance=~\"$instance\",code=~\"3..\"}[5m]))",
+ "expr": "sum(rate(rest_client_requests_total{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", instance=~\"$instance\",code=~\"3..\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "3xx",
"refId": "B"
},
{
- "expr": "sum(rate(rest_client_requests_total{job=\"kube-proxy\", instance=~\"$instance\",code=~\"4..\"}[5m]))",
+ "expr": "sum(rate(rest_client_requests_total{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", instance=~\"$instance\",code=~\"4..\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "4xx",
"refId": "C"
},
{
- "expr": "sum(rate(rest_client_requests_total{job=\"kube-proxy\", instance=~\"$instance\",code=~\"5..\"}[5m]))",
+ "expr": "sum(rate(rest_client_requests_total{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", instance=~\"$instance\",code=~\"5..\"}[5m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "5xx",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -688,7 +693,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{job=\"kube-proxy\",instance=~\"$instance\",verb=\"POST\"}[5m])) by (verb, url, le))",
+ "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{job=\"{{ include "exporter.kubeProxy.jobName" . }}\",instance=~\"$instance\",verb=\"POST\"}[5m])) by (verb, url, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{`{{`}}verb{{`}}`}} {{`{{`}}url{{`}}`}}",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -794,7 +799,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{job=\"kube-proxy\", instance=~\"$instance\", verb=\"GET\"}[5m])) by (verb, url, le))",
+ "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_duration_seconds_bucket{job=\"{{ include "exporter.kubeProxy.jobName" . }}\", instance=~\"$instance\", verb=\"GET\"}[5m])) by (verb, url, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{`{{`}}verb{{`}}`}} {{`{{`}}url{{`}}`}}",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -900,7 +905,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "process_resident_memory_bytes{job=\"kube-proxy\",instance=~\"$instance\"}",
+ "expr": "process_resident_memory_bytes{job=\"{{ include "exporter.kubeProxy.jobName" . }}\",instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{`{{`}}instance{{`}}`}}",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -993,7 +998,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "rate(process_cpu_seconds_total{job=\"kube-proxy\",instance=~\"$instance\"}[5m])",
+ "expr": "rate(process_cpu_seconds_total{job=\"{{ include "exporter.kubeProxy.jobName" . }}\",instance=~\"$instance\"}[5m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{`{{`}}instance{{`}}`}}",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -1086,7 +1091,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"steppedLine": false,
"targets": [
{
- "expr": "go_goroutines{job=\"kube-proxy\",instance=~\"$instance\"}",
+ "expr": "go_goroutines{job=\"{{ include "exporter.kubeProxy.jobName" . }}\",instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{`{{`}}instance{{`}}`}}",
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -1180,7 +1185,7 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"options": [
],
- "query": "label_values(kubeproxy_network_programming_duration_seconds_bucket{job=\"kube-proxy\"}, instance)",
+ "query": "label_values(kubeproxy_network_programming_duration_seconds_bucket{job=\"{{ include "exporter.kubeProxy.jobName" . }}\"}, instance)",
"refresh": 2,
"regex": "",
"sort": 1,
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image (#1245) * Bump PushProx chart version * Expose serviceMonitor endpoints and client SA RBAC * Bump PushProx image to v0.1.0-rancher2 * Support hardened kubelet+nodeExporter & update k3s * Generate charts * Disable kubelet serviceMonitor if k3sServer enabled * make charts (partially cherry picked from commit a064b37d4e1f0ac882037afd2854828cdbf11e65)
2021-06-04 22:33:21 +00:00
@@ -1228,4 +1233,4 @@
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source ```bash git fetch upstream git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md ``` (partially cherry picked from commit 551327b14eb2607047bc70c4851369c5174893e3)
2021-05-17 22:30:18 +00:00
"uid": "632e265de029684c40b21cb76bca4f94",
"version": 0
}
-{{- end }}
\ No newline at end of file
+{{- end }}{{- end }}
\ No newline at end of file