Skip to content

Commit

Permalink
Bump version for prometheus and alertmanager. Fix configmaps and dash…
Browse files Browse the repository at this point in the history 
…boards to work with the new versions.
  • Loading branch information
@camilb
camilb committed Nov 2, 2016
1 parent 1bbc18e commit 4781108
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 115 deletions.
30 changes: 15 additions & 15 deletions definitions/grafana/grafana-dashboards/k8s-cluster.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
},
"targets": [
{
"expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"}) * 100",
"expr": "sum (container_memory_working_set_bytes{id=\"/\",instance=~\"^$Node$\"}) / sum (machine_memory_bytes{instance=~\"^$Node$\"}) * 100",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "",
Expand Down Expand Up @@ -154,7 +154,7 @@
},
"targets": [
{
"expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"}) * 100",
"expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",instance=~\"^$Node$\"}[1m])) / sum (machine_cpu_cores{instance=~\"^$Node$\"}) * 100",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "",
Expand Down Expand Up @@ -316,7 +316,7 @@
},
"targets": [
{
"expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
"expr": "sum (container_memory_working_set_bytes{id=\"/\",instance=~\"^$Node$\"})",
"interval": "10s",
"intervalFactor": 1,
"refId": "A",
Expand Down Expand Up @@ -396,7 +396,7 @@
},
"targets": [
{
"expr": "sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"})",
"expr": "sum (machine_memory_bytes{instance=~\"^$Node$\"})",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "",
Expand Down Expand Up @@ -477,7 +477,7 @@
},
"targets": [
{
"expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m]))",
"expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",instance=~\"^$Node$\"}[1m]))",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "",
Expand Down Expand Up @@ -558,7 +558,7 @@
},
"targets": [
{
"expr": "sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"})",
"expr": "sum (machine_cpu_cores{instance=~\"^$Node$\"})",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "",
Expand Down Expand Up @@ -639,7 +639,7 @@
},
"targets": [
{
"expr": "sum (container_fs_usage_bytes{device=\"/dev/xvda9\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
"expr": "sum (container_fs_usage_bytes{device=\"/dev/xvda9\",id=\"/\",instance=~\"^$Node$\"})",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "",
Expand Down Expand Up @@ -720,7 +720,7 @@
},
"targets": [
{
"expr": "sum (container_fs_limit_bytes{device=\"/dev/xvda9\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
"expr": "sum (container_fs_limit_bytes{device=\"/dev/xvda9\",id=\"/\",instance=~\"^$Node$\"})",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "",
Expand Down Expand Up @@ -800,7 +800,7 @@
},
"targets": [
{
"expr": "sum(kubelet_running_pod_count{instance=~\"^$Node$\",job=\"kubernetes-nodes\"})",
"expr": "sum(kubelet_running_pod_count{instance=~\"^$Node$\",job=\"kubelets\"})",
"interval": "10s",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -880,7 +880,7 @@
},
"targets": [
{
"expr": "sum(kubelet_running_container_count{instance=~\"^$Node$\",job=\"kubernetes-nodes\"})",
"expr": "sum(kubelet_running_container_count{instance=~\"^$Node$\",job=\"kubelets\"})",
"interval": "10s",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -1151,7 +1151,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod_name)",
"expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",instance=~\"^$Node$\"}[1m])) by (pod_name)",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "{{ pod_name }}",
Expand Down Expand Up @@ -1256,7 +1256,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum (container_memory_working_set_bytes{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}) by (pod_name)",
"expr": "sum (container_memory_working_set_bytes{image!=\"\",name=~\"^k8s_.*\",instance=~\"^$Node$\"}) by (pod_name)",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "{{ pod_name }}",
Expand Down Expand Up @@ -1353,7 +1353,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sort_desc(sum by (pod_name) (rate (container_network_receive_bytes_total{kubernetes_io_hostname=~\"^$Node$\",name!=\"\", pod_name=~\".*\"}[1m]) ))",
"expr": "sort_desc(sum by (pod_name) (rate (container_network_receive_bytes_total{instance=~\"^$Node$\",name!=\"\", pod_name=~\".*\"}[1m]) ))",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "{{ pod_name }}Reveived",
Expand All @@ -1362,7 +1362,7 @@
"step": 10
},
{
"expr": "- sort_desc(sum by (pod_name) (rate (container_network_transmit_bytes_total{kubernetes_io_hostname=~\"^$Node$\",name!=\"\", pod_name=~\".*\"}[1m]) ))",
"expr": "- sort_desc(sum by (pod_name) (rate (container_network_transmit_bytes_total{instance=~\"^$Node$\",name!=\"\", pod_name=~\".*\"}[1m]) ))",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "{{ pod_name }}Sent",
Expand Down Expand Up @@ -1490,7 +1490,7 @@
"selected": false
}
],
"query": "label_values(kubelet_running_pod_count{job=\"kubernetes-nodes\"}, instance)",
"query": "label_values(kubelet_running_pod_count{job=\"kubelets\"}, instance)",
"refresh": 1,
"regex": "",
"type": "query"
Expand Down
36 changes: 18 additions & 18 deletions definitions/grafana/grafana-dashboards/k8s-nodes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
"targets": [
{
"expr": "node_load1{app=\"node-exporter\",instance=~\"$node:.*\",job=\"kubernetes-service-endpoints\",name=\"node-exporter\"}",
"expr": "node_load1{instance=~\"$node:.*\",job=\"node-exporter\"}",
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
Expand Down Expand Up @@ -155,7 +155,7 @@
},
"targets": [
{
"expr": "up{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"}",
"expr": "up{job=\"node-exporter\", instance=~\"$node:.*\"}",
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
Expand Down Expand Up @@ -238,7 +238,7 @@
},
"targets": [
{
"expr": "count(count by(cpu)(node_cpu{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"}))\t",
"expr": "count(count by(cpu)(node_cpu{job=\"node-exporter\", instance=~\"$node:.*\"}))\t",
"intervalFactor": 10,
"legendFormat": "",
"metric": "",
Expand Down Expand Up @@ -317,7 +317,7 @@
},
"targets": [
{
"expr": "node_memory_MemTotal{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"}",
"expr": "node_memory_MemTotal{job=\"node-exporter\", instance=~\"$node:.*\"}",
"intervalFactor": 10,
"legendFormat": "",
"metric": "",
Expand Down Expand Up @@ -396,7 +396,7 @@
},
"targets": [
{
"expr": "sum(node_filesystem_size{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\", device=~\"overlay\", mountpoint!=\"/var/lib/docker/aufs\"})",
"expr": "sum(node_filesystem_size{job=\"node-exporter\", instance=~\"$node:.*\", device=~\"overlay\", mountpoint!=\"/var/lib/docker/aufs\"})",
"intervalFactor": 10,
"legendFormat": "",
"metric": "",
Expand Down Expand Up @@ -475,7 +475,7 @@
},
"targets": [
{
"expr": "time() - node_boot_time{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"}",
"expr": "time() - node_boot_time{job=\"node-exporter\", instance=~\"$node:.*\"}",
"intervalFactor": 10,
"legendFormat": "",
"metric": "node_boot_time",
Expand Down Expand Up @@ -552,7 +552,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by(mode)(irate(node_cpu{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\", mode!=\"idle\"}[5m])) > 0",
"expr": "sum by(mode)(irate(node_cpu{job=\"node-exporter\", instance=~\"$node:.*\", mode!=\"idle\"}[5m])) > 0",
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{mode}}",
Expand Down Expand Up @@ -666,31 +666,31 @@
"steppedLine": false,
"targets": [
{
"expr": "node_memory_Buffers{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"}",
"expr": "node_memory_Buffers{job=\"node-exporter\", instance=~\"$node:.*\"}",
"interval": "",
"intervalFactor": 2,
"legendFormat": "buffers",
"refId": "A",
"step": 10
},
{
"expr": "node_memory_Cached{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"}",
"expr": "node_memory_Cached{job=\"node-exporter\", instance=~\"$node:.*\"}",
"interval": "",
"intervalFactor": 2,
"legendFormat": "cached",
"refId": "B",
"step": 10
},
{
"expr": "node_memory_MemFree{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"}",
"expr": "node_memory_MemFree{job=\"node-exporter\", instance=~\"$node:.*\"}",
"interval": "",
"intervalFactor": 2,
"legendFormat": "free",
"refId": "C",
"step": 10
},
{
"expr": "node_memory_MemTotal{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"} - node_memory_MemFree{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"} - node_memory_Cached{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"} - node_memory_Buffers{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"}",
"expr": "node_memory_MemTotal{job=\"node-exporter\", instance=~\"$node:.*\"} - node_memory_MemFree{job=\"node-exporter\", instance=~\"$node:.*\"} - node_memory_Cached{job=\"node-exporter\", instance=~\"$node:.*\"} - node_memory_Buffers{job=\"node-exporter\", instance=~\"$node:.*\"}",
"interval": "",
"intervalFactor": 2,
"legendFormat": "used",
Expand Down Expand Up @@ -789,7 +789,7 @@
"steppedLine": false,
"targets": [
{
"expr": "irate(node_network_transmit_bytes{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\", device!~\"lo|bond[0-9]|cbr[0-9]|veth.*\"}[5m]) > 0",
"expr": "irate(node_network_transmit_bytes{job=\"node-exporter\", instance=~\"$node:.*\", device!~\"lo|bond[0-9]|cbr[0-9]|veth.*\"}[5m]) > 0",
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{device}} outbound",
Expand All @@ -798,7 +798,7 @@
"step": 10
},
{
"expr": "irate(node_network_receive_bytes{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\", device!~\"lo|bond[0-9]|cbr[0-9]|veth.*\"}[5m]) > 0",
"expr": "irate(node_network_receive_bytes{job=\"node-exporter\", instance=~\"$node:.*\", device!~\"lo|bond[0-9]|cbr[0-9]|veth.*\"}[5m]) > 0",
"hide": false,
"interval": "",
"intervalFactor": 2,
Expand Down Expand Up @@ -902,7 +902,7 @@
"steppedLine": false,
"targets": [
{
"expr": "irate(node_disk_io_time_ms{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\"}[5m]) / 1000",
"expr": "irate(node_disk_io_time_ms{job=\"node-exporter\", instance=~\"$node:.*\"}[5m]) / 1000",
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{device}}",
Expand Down Expand Up @@ -1012,7 +1012,7 @@
"steppedLine": false,
"targets": [
{
"expr": "node_filesystem_size{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\", device=\"overlay\", mountpoint=\"/\"} - node_filesystem_free{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\", device=\"overlay\", mountpoint=\"/\"}",
"expr": "node_filesystem_size{job=\"node-exporter\", instance=~\"$node:.*\", device=\"overlay\", mountpoint=\"/\"} - node_filesystem_free{job=\"node-exporter\", instance=~\"$node:.*\", device=\"overlay\", mountpoint=\"/\"}",
"interval": "",
"intervalFactor": 2,
"legendFormat": "used",
Expand All @@ -1021,7 +1021,7 @@
"step": 10
},
{
"expr": "node_filesystem_free{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\", device=\"overlay\", mountpoint=\"/\"}",
"expr": "node_filesystem_free{job=\"node-exporter\", instance=~\"$node:.*\", device=\"overlay\", mountpoint=\"/\"}",
"interval": "",
"intervalFactor": 2,
"legendFormat": "free",
Expand Down Expand Up @@ -1139,7 +1139,7 @@
"selected": false
}
],
"query": "label_values(node_load1{job=\"kubernetes-service-endpoints\"}, instance)",
"query": "label_values(node_load1{job=\"node-exporter\"}, instance)",
"refresh": 1,
"regex": "/([^:]+):.*/",
"type": "query",
Expand Down Expand Up @@ -1170,7 +1170,7 @@
"selected": false
}
],
"query": "node_filesystem_size{job=\"kubernetes-service-endpoints\", instance=~\"$node:.*\", device=\"overlay\", mountpoint=\"/\"}",
"query": "node_filesystem_size{job=\"node-exporter\", instance=~\"$node:.*\", device=\"overlay\", mountpoint=\"/\"}",
"refresh": 1,
"regex": "/mountpoint=\"([^\"]+)/",
"type": "query"
Expand Down
4 changes: 3 additions & 1 deletion definitions/grafana/grafana-dashboards/prometheus-data-exploration.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"id": 3,
"title": "Prometheus Data Exploration",
"description": "VERY simple dashboard to VERY easily view and explore Prometheus data. Just click away.",
"tags": [],
"tags": [
"prometheus"
],
"style": "dark",
"timezone": "browser",
"editable": true,
Expand Down
16 changes: 8 additions & 8 deletions definitions/grafana/grafana-dashboards/prometheus-stats.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": 2,
"id": 1,
"title": "Prometheus Stats Extended",
"description": "VIew Prometheus internal metrics: an extension of the standard dashboard.",
"tags": [
Expand All @@ -8,7 +8,7 @@
"style": "dark",
"timezone": "browser",
"editable": true,
"hideControls": true,
"hideControls": false,
"sharedCrosshair": true,
"rows": [
{
Expand Down Expand Up @@ -74,11 +74,11 @@
},
"targets": [
{
"expr": "(time() - process_start_time_seconds{name=\"prometheus\"})",
"expr": "(time() - process_start_time_seconds{job=\"prometheus\"})",
"intervalFactor": 2,
"legendFormat": "",
"refId": "A",
"step": 4,
"legendFormat": ""
"step": 4
}
],
"thresholds": "",
Expand Down Expand Up @@ -528,7 +528,7 @@
"steppedLine": false,
"targets": [
{
"expr": "prometheus_evaluator_duration_milliseconds{quantile!=\"0.01\", quantile!=\"0.05\"}",
"expr": "prometheus_evaluator_duration_seconds{quantile!=\"0.01\", quantile!=\"0.05\"}",
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{quantile}}",
Expand All @@ -551,7 +551,7 @@
},
"yaxes": [
{
"format": "percentunit",
"format": "s",
"label": "",
"logBase": 1,
"max": null,
Expand Down Expand Up @@ -1268,7 +1268,7 @@
},
"refresh": "10s",
"schemaVersion": 12,
"version": 5,
"version": 0,
"links": [
{
"icon": "info",
Expand Down
Loading

0 comments on commit 4781108

Please sign in to comment.