diff --git a/configs/grafana/grafana-net-2-dashboard.json b/configs/grafana/grafana-net-2-dashboard.json index cb2cf1b..d724a39 100644 --- a/configs/grafana/grafana-net-2-dashboard.json +++ b/configs/grafana/grafana-net-2-dashboard.json @@ -199,7 +199,7 @@ "step": 4 }], "thresholds": "500,4000", - "title": "Interal Storage Queue Length", + "title": "Internal Storage Queue Length", "type": "singlestat", "valueFontSize": "70%", "valueMaps": [{ diff --git a/configs/prometheus/prometheus.yaml b/configs/prometheus/prometheus.yaml index 7cdfd00..d5e08ad 100644 --- a/configs/prometheus/prometheus.yaml +++ b/configs/prometheus/prometheus.yaml @@ -101,3 +101,20 @@ scrape_configs: - source_labels: [__meta_kubernetes_pod_container_port_number] action: keep regex: 9\d{3} + - job_name: 'kubernetes-cadvisor' + scheme: https + tls_config: + ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + kubernetes_sd_configs: + - role: node + relabel_configs: + - action: labelmap + - action: labelmap + regex: __meta_kubernetes_node_label_(.+) + - target_label: __address__ + replacement: kubernetes.default.svc:443 + - source_labels: [__meta_kubernetes_node_name] + regex: (.+) + target_label: __metrics_path__ + replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor diff --git a/manifests-all.yaml b/manifests-all.yaml index 06502e0..16d642c 100644 --- a/manifests-all.yaml +++ b/manifests-all.yaml @@ -613,7 +613,7 @@ data: "step": 4 }], "thresholds": "500,4000", - "title": "Interal Storage Queue Length", + "title": "Internal Storage Queue Length", "type": "singlestat", "valueFontSize": "70%", "valueMaps": [{ @@ -2455,6 +2455,23 @@ data: - source_labels: [__meta_kubernetes_pod_container_port_number] action: keep regex: 9\d{3} + - job_name: 'kubernetes-cadvisor' + scheme: https + tls_config: + ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + kubernetes_sd_configs: + - role: node + relabel_configs: + - action: labelmap + - action: labelmap + regex: __meta_kubernetes_node_label_(.+) + - target_label: __address__ + replacement: kubernetes.default.svc:443 + - source_labels: [__meta_kubernetes_node_name] + regex: (.+) + target_label: __metrics_path__ + replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor kind: ConfigMap metadata: creationTimestamp: null @@ -2780,7 +2797,6 @@ metadata: name: prometheus-rules namespace: monitoring --- ---- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: @@ -2802,6 +2818,7 @@ rules: - apiGroups: [""] resources: - nodes + - nodes/proxy - services - endpoints - pods diff --git a/manifests/grafana/import-dashboards/configmap.yaml b/manifests/grafana/import-dashboards/configmap.yaml index 7035cfa..f0de987 100644 --- a/manifests/grafana/import-dashboards/configmap.yaml +++ b/manifests/grafana/import-dashboards/configmap.yaml @@ -202,7 +202,7 @@ data: "step": 4 }], "thresholds": "500,4000", - "title": "Interal Storage Queue Length", + "title": "Internal Storage Queue Length", "type": "singlestat", "valueFontSize": "70%", "valueMaps": [{ diff --git a/manifests/prometheus/configmap.yaml b/manifests/prometheus/configmap.yaml index 069a43d..c1426e6 100644 --- a/manifests/prometheus/configmap.yaml +++ b/manifests/prometheus/configmap.yaml @@ -104,6 +104,23 @@ data: - source_labels: [__meta_kubernetes_pod_container_port_number] action: keep regex: 9\d{3} + - job_name: 'kubernetes-cadvisor' + scheme: https + tls_config: + ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + kubernetes_sd_configs: + - role: node + relabel_configs: + - action: labelmap + - action: labelmap + regex: __meta_kubernetes_node_label_(.+) + - target_label: __address__ + replacement: kubernetes.default.svc:443 + - source_labels: [__meta_kubernetes_node_name] + regex: (.+) + target_label: __metrics_path__ + replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor kind: ConfigMap metadata: creationTimestamp: null diff --git a/manifests/prometheus/rbac.yaml b/manifests/prometheus/rbac.yaml index 2a62c70..4748e38 100644 --- a/manifests/prometheus/rbac.yaml +++ b/manifests/prometheus/rbac.yaml @@ -20,6 +20,7 @@ rules: - apiGroups: [""] resources: - nodes + - nodes/proxy - services - endpoints - pods