easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #386 from paulfantom/bump_kube-mix

Browse Source 
Bump kubernetes-mixins
This commit is contained in:
Frederic Branczyk
2020-01-23 12:22:40 +01:00
committed by GitHub
parent 269aef6e37 894069f24d
commit e410043b6b
3 changed files with 508 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsonnetfile.lock.json
View File

@@ -72,8 +72,8 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "a7ee9d1abe1b1a3670a02ede1135cadb660b9d0c", "version": "68f82d2a428d91df57e9af43739981a6a8ede897",
"sum": "bFGN7aEnh4Hs+tkuRkmlWboht0RWt38qy+Y4gGS+pa0=" "sum": "J/tuXi0Z8GRHo63pM17YFIyk4QgkFuMcQ20mAxi1flM="
}, },
{ {
"name": "node-mixin", "name": "node-mixin",

761
manifests/grafana-dashboardDefinitions.yaml
View File

File diff suppressed because it is too large Load Diff

17
manifests/prometheus-rules.yaml
View File

@@ -93,9 +93,9 @@ spec:
sum(rate(container_cpu_usage_seconds_total{job="kubelet", metrics_path="/metrics/cadvisor", image!="", container!="POD"}[5m])) by (namespace) sum(rate(container_cpu_usage_seconds_total{job="kubelet", metrics_path="/metrics/cadvisor", image!="", container!="POD"}[5m])) by (namespace)
record: namespace:container_cpu_usage_seconds_total:sum_rate record: namespace:container_cpu_usage_seconds_total:sum_rate
- expr: | - expr: |
sum by (namespace, pod, container) ( sum by (cluster, namespace, pod, container) (
rate(container_cpu_usage_seconds_total{job="kubelet", metrics_path="/metrics/cadvisor", image!="", container!="POD"}[5m]) rate(container_cpu_usage_seconds_total{job="kubelet", metrics_path="/metrics/cadvisor", image!="", container!="POD"}[5m])
) * on (namespace, pod) group_left(node) max by(namespace, pod, node) (kube_pod_info) ) * on (cluster, namespace, pod) group_left(node) max by(cluster, namespace, pod, node) (kube_pod_info)
record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate
- expr: | - expr: |
container_memory_working_set_bytes{job="kubelet", metrics_path="/metrics/cadvisor", image!=""} container_memory_working_set_bytes{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
@@ -147,7 +147,7 @@ spec:
) * on(replicaset, namespace) group_left(owner_name) kube_replicaset_owner{job="kube-state-metrics"}, ) * on(replicaset, namespace) group_left(owner_name) kube_replicaset_owner{job="kube-state-metrics"},
"workload", "$1", "owner_name", "(.*)" "workload", "$1", "owner_name", "(.*)"
) )
) by (namespace, workload, pod) ) by (cluster, namespace, workload, pod)
labels: labels:
workload_type: deployment workload_type: deployment
record: mixin_pod_workload record: mixin_pod_workload
@@ -157,7 +157,7 @@ spec:
kube_pod_owner{job="kube-state-metrics", owner_kind="DaemonSet"}, kube_pod_owner{job="kube-state-metrics", owner_kind="DaemonSet"},
"workload", "$1", "owner_name", "(.*)" "workload", "$1", "owner_name", "(.*)"
) )
) by (namespace, workload, pod) ) by (cluster, namespace, workload, pod)
labels: labels:
workload_type: daemonset workload_type: daemonset
record: mixin_pod_workload record: mixin_pod_workload
@@ -167,7 +167,7 @@ spec:
kube_pod_owner{job="kube-state-metrics", owner_kind="StatefulSet"}, kube_pod_owner{job="kube-state-metrics", owner_kind="StatefulSet"},
"workload", "$1", "owner_name", "(.*)" "workload", "$1", "owner_name", "(.*)"
) )
) by (namespace, workload, pod) ) by (cluster, namespace, workload, pod)
labels: labels:
workload_type: statefulset workload_type: statefulset
record: mixin_pod_workload record: mixin_pod_workload
@@ -220,13 +220,14 @@ spec:
record: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile record: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile
- name: node.rules - name: node.rules
rules: rules:
- expr: sum(min(kube_pod_info) by (node)) - expr: |
sum(min(kube_pod_info) by (cluster, node))
record: ':kube_pod_info_node_count:' record: ':kube_pod_info_node_count:'
- expr: | - expr: |
max(label_replace(kube_pod_info{job="kube-state-metrics"}, "pod", "$1", "pod", "(.*)")) by (node, namespace, pod) max(label_replace(kube_pod_info{job="kube-state-metrics"}, "pod", "$1", "pod", "(.*)")) by (node, namespace, pod)
record: 'node_namespace_pod:kube_pod_info:' record: 'node_namespace_pod:kube_pod_info:'
- expr: | - expr: |
count by (node) (sum by (node, cpu) ( count by (cluster, node) (sum by (node, cpu) (
node_cpu_seconds_total{job="node-exporter"} node_cpu_seconds_total{job="node-exporter"}
* on (namespace, pod) group_left(node) * on (namespace, pod) group_left(node)
node_namespace_pod:kube_pod_info: node_namespace_pod:kube_pod_info:
@@ -241,7 +242,7 @@ spec:
node_memory_MemFree_bytes{job="node-exporter"} + node_memory_MemFree_bytes{job="node-exporter"} +
node_memory_Slab_bytes{job="node-exporter"} node_memory_Slab_bytes{job="node-exporter"}
) )
) ) by (cluster)
record: :node_memory_MemAvailable_bytes:sum record: :node_memory_MemAvailable_bytes:sum
- name: kube-prometheus-node-recording.rules - name: kube-prometheus-node-recording.rules
rules: rules: