Skip to content

Commit

Permalink
update grafana to v5.1.0 and node-exporter to 0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmirAliSobhGol
AmirAliSobhGol committed Jun 26, 2018
1 parent 0f4d40e commit cd1e8bf
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ services:
memory: 64M

grafana:
image: stefanprodan/swarmprom-grafana:5.0.1
image: stefanprodan/swarmprom-grafana:5.1.0
networks:
- net
environment:
Expand Down Expand Up @@ -122,7 +122,7 @@ services:
replicas: 1

node-exporter:
image: stefanprodan/swarmprom-node-exporter:v0.15.2
image: stefanprodan/swarmprom-node-exporter:v0.16.0
networks:
- net
environment:
Expand Down
2 changes: 1 addition & 1 deletion grafana/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM grafana/grafana:5.0.1
FROM grafana/grafana:5.1.0
# https://hub.docker.com/r/grafana/grafana/tags/

COPY datasources /etc/grafana/provisioning/datasources/
Expand Down
28 changes: 14 additions & 14 deletions grafana/dashboards/swarmprom-nodes-dash.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"tableColumn": "",
"targets": [
{
"expr": "topk(1, sum((node_time - node_boot_time) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name))",
"expr": "topk(1, sum((node_time_seconds - node_boot_time_seconds) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -252,7 +252,7 @@
"tableColumn": "",
"targets": [
{
"expr": "count(node_cpu{mode=\"idle\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"expr": "count(node_cpu_seconds_total{mode=\"idle\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -338,7 +338,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(irate(node_cpu{mode=\"idle\"}[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) * 100 / count(node_cpu{mode=\"user\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) ",
"expr": "sum(irate(node_cpu_seconds_total{mode=\"idle\"}[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) * 100 / count(node_cpu_seconds_total{mode=\"user\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) ",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -489,7 +489,7 @@
"steppedLine": false,
"targets": [
{
"expr": "100 - (avg(irate(node_cpu{mode=\"idle\"}[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) by (node_name))",
"expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) by (node_name))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{node_name}}",
Expand Down Expand Up @@ -596,7 +596,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(node_memory_MemTotal * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"expr": "sum(node_memory_MemTotal_bytes * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -680,7 +680,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum((node_memory_MemAvailable / node_memory_MemTotal) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"expr": "sum((node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -764,7 +764,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(node_filesystem_size{mountpoint=\"/\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"expr": "sum(node_filesystem_size_bytes{mountpoint=\"/\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -848,7 +848,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum((node_filesystem_free{mountpoint=\"/\"} / node_filesystem_size{mountpoint=\"/\"}) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"expr": "sum((node_filesystem_free_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -908,7 +908,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum((node_memory_MemTotal - node_memory_MemFree - node_memory_Cached - node_memory_Buffers - node_memory_Slab) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"expr": "sum((node_memory_MemTotal_bytes - node_memory_MemFree_bytes - node_memory_Cached_bytes - node_memory_Buffers_bytes - node_memory_Slab_bytes) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Used {{node_name}}",
Expand Down Expand Up @@ -1000,15 +1000,15 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(irate(node_disk_bytes_read[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"expr": "sum(irate(node_disk_read_bytes_total[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Read {{node_name}}",
"refId": "A",
"step": 2
},
{
"expr": "sum(irate(node_disk_bytes_written[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"expr": "sum(irate(node_disk_written_bytes_total[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Written {{node_name}}",
Expand Down Expand Up @@ -1092,15 +1092,15 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(irate(node_disk_reads_completed[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"expr": "sum(irate(node_disk_reads_completed_total[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Reads {{node_name}}",
"refId": "A",
"step": 2
},
{
"expr": "sum(irate(node_disk_writes_completed[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"expr": "sum(irate(node_disk_writes_completed_total[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) by (node_name)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Writes {{node_name}}",
Expand Down Expand Up @@ -1186,7 +1186,7 @@
"steppedLine": false,
"targets": [
{
"expr": "(avg(irate(node_cpu{mode=\"iowait\"}[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) by (node_name))",
"expr": "(avg(irate(node_cpu_seconds_total{mode=\"iowait\"}[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) by (node_name))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{node_name}}",
Expand Down
6 changes: 3 additions & 3 deletions grafana/dashboards/swarmprom-services-dash.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(irate(node_cpu{mode=\"idle\"}[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) * 100 / count(node_cpu{mode=\"user\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) ",
"expr": "sum(irate(node_cpu_seconds_total{mode=\"idle\"}[$interval]) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) * 100 / count(node_cpu_seconds_total{mode=\"user\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"}) ",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -959,7 +959,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum((node_memory_MemAvailable / node_memory_MemTotal) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"expr": "sum((node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down Expand Up @@ -1479,7 +1479,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum((node_filesystem_free{mountpoint=\"/\"} / node_filesystem_size{mountpoint=\"/\"}) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"expr": "sum((node_filesystem_free_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "",
Expand Down
2 changes: 1 addition & 1 deletion node-exporter/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM prom/node-exporter:v0.15.2
FROM prom/node-exporter:v0.16.0

ENV NODE_ID=none

Expand Down

0 comments on commit cd1e8bf

Please sign in to comment.