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

After update libs and regenerate

Browse Source
This commit is contained in:
CarlosEDP
2019-02-14 19:43:49 -02:00
parent fbc92dd9b3
commit 1e7a633147
3 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
} }
}, },
"version": "7c4b660febf68b4b0930f761c7c0a992330d3935" "version": "94b30526f43d589912a38193b69dce19b4fa1893"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "a16ec1d098eb45e7cfb44d7e4b73ba7b766f0e0a" "version": "5525c8cc8a4a52d272bdaf481dd77b53a0c0f051"
}, },
{ {
"name": "grafonnet", "name": "grafonnet",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "24590e90dcfc9d581c4208b4bb3d15df50f1328e" "version": "403b7d0120d2903d21854eae217b4e4863c454d1"
}, },
{ {
"name": "grafana", "name": "grafana",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin" "subdir": "Documentation/etcd-mixin"
} }
}, },
"version": "3546c4868cec93e1587471b42fd815684a7dd439" "version": "4cd0bf8ea846a0d158761d55899f631eb2a423cf"
} }
] ]
} }

40
manifests/grafana-dashboardDefinitions.yaml
View File

@@ -60,7 +60,7 @@ items:
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
{ {
"expr": "node:node_cpu_utilisation:avg1m * node:node_num_cpu:sum / scalar(sum(node:node_num_cpu:sum))", "expr": "node:cluster_cpu_utilisation:ratio",
"format": "time_series", "format": "time_series",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "{{node}}", "legendFormat": "{{node}}",
@@ -244,7 +244,7 @@ items:
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
{ {
"expr": "node:node_memory_utilisation:ratio", "expr": "node:cluster_memory_utilisation:ratio",
"format": "time_series", "format": "time_series",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "{{node}}", "legendFormat": "{{node}}",
@@ -856,7 +856,7 @@ items:
"schemaVersion": 14, "schemaVersion": 14,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"kubernetes-mixin"
], ],
"templating": { "templating": {
"list": [ "list": [
@@ -908,7 +908,7 @@ items:
] ]
}, },
"timezone": "", "timezone": "",
"title": "K8s / USE Method / Cluster", "title": "Kubernetes / USE Method / Cluster",
"uid": "a6e7d1362e1ddbb79db21d5bb40d7137", "uid": "a6e7d1362e1ddbb79db21d5bb40d7137",
"version": 0 "version": 0
} }
@@ -1772,7 +1772,7 @@ items:
"schemaVersion": 14, "schemaVersion": 14,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"kubernetes-mixin"
], ],
"templating": { "templating": {
"list": [ "list": [
@@ -1851,7 +1851,7 @@ items:
] ]
}, },
"timezone": "", "timezone": "",
"title": "K8s / USE Method / Node", "title": "Kubernetes / USE Method / Node",
"uid": "4ac4f123aae0ff6dbaf4f4f66120033b", "uid": "4ac4f123aae0ff6dbaf4f4f66120033b",
"version": 0 "version": 0
} }
@@ -3127,7 +3127,7 @@ items:
"schemaVersion": 14, "schemaVersion": 14,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"kubernetes-mixin"
], ],
"templating": { "templating": {
"list": [ "list": [
@@ -3179,7 +3179,7 @@ items:
] ]
}, },
"timezone": "", "timezone": "",
"title": "K8s / Compute Resources / Cluster", "title": "Kubernetes / Compute Resources / Cluster",
"uid": "efa86fd1d0c121a26444b636a3f509a8", "uid": "efa86fd1d0c121a26444b636a3f509a8",
"version": 0 "version": 0
} }
@@ -3939,7 +3939,7 @@ items:
"schemaVersion": 14, "schemaVersion": 14,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"kubernetes-mixin"
], ],
"templating": { "templating": {
"list": [ "list": [
@@ -4018,7 +4018,7 @@ items:
] ]
}, },
"timezone": "", "timezone": "",
"title": "K8s / Compute Resources / Namespace", "title": "Kubernetes / Compute Resources / Namespace",
"uid": "85a562078cdf77779eaa1add43ccec1e", "uid": "85a562078cdf77779eaa1add43ccec1e",
"version": 0 "version": 0
} }
@@ -4778,7 +4778,7 @@ items:
"schemaVersion": 14, "schemaVersion": 14,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"kubernetes-mixin"
], ],
"templating": { "templating": {
"list": [ "list": [
@@ -4884,7 +4884,7 @@ items:
] ]
}, },
"timezone": "", "timezone": "",
"title": "K8s / Compute Resources / Pod", "title": "Kubernetes / Compute Resources / Pod",
"uid": "6581e46e4e5c7ba40a07646395ef7b23", "uid": "6581e46e4e5c7ba40a07646395ef7b23",
"version": 0 "version": 0
} }
@@ -6124,7 +6124,7 @@ items:
"schemaVersion": 14, "schemaVersion": 14,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"kubernetes-mixin"
], ],
"templating": { "templating": {
"list": [ "list": [
@@ -6202,7 +6202,7 @@ items:
] ]
}, },
"timezone": "", "timezone": "",
"title": "Nodes", "title": "Kubernetes / Nodes",
"uid": "fa49a4706d07a042595b664c87fb33ea", "uid": "fa49a4706d07a042595b664c87fb33ea",
"version": 0 "version": 0
} }
@@ -6447,7 +6447,7 @@ items:
"schemaVersion": 14, "schemaVersion": 14,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"kubernetes-mixin"
], ],
"templating": { "templating": {
"list": [ "list": [
@@ -6551,7 +6551,7 @@ items:
] ]
}, },
"timezone": "", "timezone": "",
"title": "Persistent Volumes", "title": "Kubernetes / Persistent Volumes",
"uid": "919b92a8e8041bd567af9edab12c840c", "uid": "919b92a8e8041bd567af9edab12c840c",
"version": 0 "version": 0
} }
@@ -6911,7 +6911,7 @@ items:
"schemaVersion": 14, "schemaVersion": 14,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"kubernetes-mixin"
], ],
"templating": { "templating": {
"list": [ "list": [
@@ -7041,7 +7041,7 @@ items:
] ]
}, },
"timezone": "", "timezone": "",
"title": "Pods", "title": "Kubernetes / Pods",
"uid": "ab4f13a9892a76a4d21ce8c2445bf4ea", "uid": "ab4f13a9892a76a4d21ce8c2445bf4ea",
"version": 0 "version": 0
} }
@@ -7800,7 +7800,7 @@ items:
"schemaVersion": 14, "schemaVersion": 14,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"kubernetes-mixin"
], ],
"templating": { "templating": {
"list": [ "list": [
@@ -7904,7 +7904,7 @@ items:
] ]
}, },
"timezone": "", "timezone": "",
"title": "StatefulSets", "title": "Kubernetes / StatefulSets",
"uid": "a31c1f46e6f727cb37c0d731a7245005", "uid": "a31c1f46e6f727cb37c0d731a7245005",
"version": 0 "version": 0
} }

14
manifests/prometheus-rules.yaml
View File

@@ -136,6 +136,13 @@ spec:
* on (namespace, pod) group_left(node) * on (namespace, pod) group_left(node)
node_namespace_pod:kube_pod_info:) node_namespace_pod:kube_pod_info:)
record: node:node_cpu_utilisation:avg1m record: node:node_cpu_utilisation:avg1m
- expr: |
node:node_cpu_utilisation:avg1m
*
node:node_num_cpu:sum
/
scalar(sum(node:node_num_cpu:sum))
record: node:cluster_cpu_utilisation:ratio
- expr: | - expr: |
sum(node_load1{job="node-exporter"}) sum(node_load1{job="node-exporter"})
/ /
@@ -179,8 +186,13 @@ spec:
- expr: | - expr: |
(node:node_memory_bytes_total:sum - node:node_memory_bytes_available:sum) (node:node_memory_bytes_total:sum - node:node_memory_bytes_available:sum)
/ /
scalar(sum(node:node_memory_bytes_total:sum)) node:node_memory_bytes_total:sum
record: node:node_memory_utilisation:ratio record: node:node_memory_utilisation:ratio
- expr: |
(node:node_memory_bytes_total:sum - node:node_memory_bytes_available:sum)
/
scalar(sum(node:node_memory_bytes_total:sum))
record: node:cluster_memory_utilisation:ratio
- expr: | - expr: |
1e3 * sum( 1e3 * sum(
(rate(node_vmstat_pgpgin{job="node-exporter"}[1m]) (rate(node_vmstat_pgpgin{job="node-exporter"}[1m])