Navigation Menu

Skip to content

Commit

Permalink
Merge branch 'master' into PMM-2304-New-Dashboard-System-Compare-Servers
Browse files Browse the repository at this point in the history
  • Loading branch information
@adivinho
adivinho committed Aug 29, 2018
2 parents 6d31d19 + 1e8fc51 commit a05968d
Show file tree
Hide file tree
Showing 10 changed files with 6,033 additions and 1,062 deletions.
32 changes: 17 additions & 15 deletions dashboards/CPU_Utilization_Details_Cores.json
View file
Expand Up @@ -21,7 +21,7 @@
"gnetId": null,
"graphTooltip": 1,
"id": null,
"iteration": 1529322261358,
"iteration": 1535381370089,
"links": [
{
"icon": "dashboard",
Expand Down Expand Up @@ -459,18 +459,19 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
"targets": [
{
"expr": "clamp_max(sum by () ((avg by (mode) ( (clamp_max(rate(node_cpu{instance=\"$host\",mode!=\"idle\",mode!=\"iowait\"}[$interval]),1)) or (clamp_max(irate(node_cpu{instance=\"$host\",cpu=\"$cpu\",mode!=\"idle\",mode!=\"iowait\"}[5m]),1)) )) *100 or (max_over_time(node_cpu_average{instance=~\"$host\", mode=\"total\"}[$interval]) or max_over_time(node_cpu_average{instance=~\"$host\", mode=\"total\"}[5m]))),100)",
"expr": "clamp_max(sum by () ((avg by (mode) ( \n(clamp_max(rate(node_cpu{instance=\"$host\",mode!=\"idle\",mode!=\"iowait\"}[$interval]),1)) or \n(clamp_max(irate(node_cpu{instance=\"$host\",mode!=\"idle\",mode!=\"iowait\"}[5m]),1)) )) *100 or \nsum by () (\navg_over_time(node_cpu_average{instance=\"$host\",mode!=\"total\",mode!=\"idle\"}[$interval]) or \navg_over_time(node_cpu_average{instance=\"$host\",mode!=\"total\",mode!=\"idle\"}[5m])) unless\n(avg_over_time(node_cpu_average{instance=\"$host\",mode=\"total\",job=\"rds-basic\"}[$interval]) or \navg_over_time(node_cpu_average{instance=\"$host\",mode=\"total\",job=\"rds-basic\"}[5m]))\n),100)",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,
"legendFormat": "",
"refId": "A"
}
],
Expand Down Expand Up @@ -542,9 +543,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down Expand Up @@ -625,9 +626,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down Expand Up @@ -708,9 +709,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down Expand Up @@ -791,9 +792,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down Expand Up @@ -874,9 +875,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down Expand Up @@ -1000,19 +1001,20 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
"targets": [
{
"expr": "clamp_max((sum by () ((avg by (mode) ( (clamp_max(rate(node_cpu{instance=\"$host\",mode!=\"idle\",mode!=\"iowait\"}[$interval]),1)) or (clamp_max(irate(node_cpu{instance=\"$host\",cpu=\"$cpu\",mode!=\"idle\",mode!=\"iowait\"}[5m]),1)) )) *100) or (max_over_time(node_cpu_average{instance=\"$host\",mode=\"total\"}[$interval]) or max_over_time(node_cpu_average{instance=\"$host\",mode=\"total\"}[5m]))),100)",
"expr": "clamp_max(\nsum by (cpu) (\n(avg by (mode) ( (clamp_max(rate(node_cpu{instance=\"$host\",cpu=\"$cpu\",mode!=\"idle\",mode!=\"iowait\"}[$interval]),1)) or \n(clamp_max(irate(node_cpu{instance=\"$host\",cpu=\"$cpu\",mode!=\"idle\",mode!=\"iowait\"}[5m]),1)) )) *100) or \nsum by () (\navg_over_time(node_cpu_average{instance=\"$host\",mode!=\"total\",mode!=\"idle\"}[$interval]) or \navg_over_time(node_cpu_average{instance=\"$host\",mode!=\"total\",mode!=\"idle\"}[5m])) unless\n(avg_over_time(node_cpu_average{instance=\"$host\",mode=\"total\",job=\"rds-basic\"}[$interval]) or \navg_over_time(node_cpu_average{instance=\"$host\",mode=\"total\",job=\"rds-basic\"}[5m]))\n,100)",
"format": "time_series",
"instant": false,
"interval": "$interval",
"intervalFactor": 1,
"legendFormat": "",
"refId": "A"
}
],
Expand Down Expand Up @@ -1084,9 +1086,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down Expand Up @@ -1167,9 +1169,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down Expand Up @@ -1250,9 +1252,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down Expand Up @@ -1333,9 +1335,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down Expand Up @@ -1416,9 +1418,9 @@
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"maxValue": 100,
"minValue": 0,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
Expand Down
30 changes: 18 additions & 12 deletions dashboards/Disk_Performance.json
View file
Expand Up @@ -21,7 +21,7 @@
"gnetId": null,
"graphTooltip": 1,
"id": null,
"iteration": 1529322287237,
"iteration": 1535393643104,
"links": [
{
"icon": "dashboard",
Expand Down Expand Up @@ -185,11 +185,11 @@
"calculatedInterval": "2m",
"datasourceErrors": {},
"errors": {},
"expr": "(rate(node_disk_read_time_ms{device=~\"$device\", instance=\"$host\"}[$interval]) / rate(node_disk_reads_completed{device=~\"$device\", instance=\"$host\"}[$interval])) or (irate(node_disk_read_time_ms{device=~\"$device\", instance=\"$host\"}[5m]) / irate(node_disk_reads_completed{device=~\"$device\", instance=\"$host\"}[5m]))\nor avg_over_time(aws_rds_read_latency_average{instance=\"$host\"}[$interval]) or avg_over_time(aws_rds_read_latency_average{instance=\"$host\"}[5m])",
"expr": "(rate(node_disk_read_time_ms{device=~\"$device\", instance=\"$host\"}[$interval]) / \nrate(node_disk_reads_completed{device=~\"$device\", instance=\"$host\"}[$interval])) or \n(irate(node_disk_read_time_ms{device=~\"$device\", instance=\"$host\"}[5m]) / \nirate(node_disk_reads_completed{device=~\"$device\", instance=\"$host\"}[5m])) or\navg_over_time(aws_rds_read_latency_average{instance=\"$host\"}[$interval]) or \navg_over_time(aws_rds_read_latency_average{instance=\"$host\"}[5m]) or\navg_over_time(rdsosmetrics_diskIO_readLatency{instance=\"$host\"}[$interval]) or \navg_over_time(rdsosmetrics_diskIO_readLatency{instance=\"$host\"}[5m])",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,
"legendFormat": "Read: {{ device }}",
"legendFormat": "Read: {{device}}",
"metric": "",
"refId": "A",
"step": 300,
Expand All @@ -199,11 +199,11 @@
"calculatedInterval": "2m",
"datasourceErrors": {},
"errors": {},
"expr": "(rate(node_disk_write_time_ms{device=~\"$device\", instance=\"$host\"}[$interval]) / rate(node_disk_writes_completed{device=~\"$device\", instance=\"$host\"}[$interval])) or (irate(node_disk_write_time_ms{device=~\"$device\", instance=\"$host\"}[5m]) / irate(node_disk_writes_completed{device=~\"$device\", instance=\"$host\"}[5m]))\nor (avg_over_time(aws_rds_write_latency_average{instance=\"$host\"}[$interval]) or avg_over_time(aws_rds_write_latency_average{instance=\"$host\"}[5m]))",
"expr": "(rate(node_disk_write_time_ms{device=~\"$device\", instance=\"$host\"}[$interval]) / \nrate(node_disk_writes_completed{device=~\"$device\", instance=\"$host\"}[$interval])) or \n(irate(node_disk_write_time_ms{device=~\"$device\", instance=\"$host\"}[5m]) / \nirate(node_disk_writes_completed{device=~\"$device\", instance=\"$host\"}[5m])) or \n(avg_over_time(aws_rds_write_latency_average{instance=\"$host\"}[$interval]) or \navg_over_time(aws_rds_write_latency_average{instance=\"$host\"}[5m])) or\n(avg_over_time(rdsosmetrics_diskIO_writeLatency{instance=\"$host\"}[$interval]) or \navg_over_time(rdsosmetrics_diskIO_writeLatency{instance=\"$host\"}[5m]))",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,
"legendFormat": "Write: {{ device }}",
"legendFormat": "Write: {{device}}",
"metric": "",
"refId": "B",
"step": 300,
Expand Down Expand Up @@ -303,7 +303,8 @@
"calculatedInterval": "2m",
"datasourceErrors": {},
"errors": {},
"expr": "rate(node_disk_reads_completed{device=~\"$device\", instance=\"$host\"}[$interval]) or irate(node_disk_reads_completed{device=~\"$device\", instance=\"$host\"}[5m])",
"expr": "(rate(node_disk_reads_completed{device=~\"$device\", instance=\"$host\"}[$interval]) or \nirate(node_disk_reads_completed{device=~\"$device\", instance=\"$host\"}[5m])) or\n(max_over_time(rdsosmetrics_diskIO_readIOsPS{instance=\"$host\"}[$interval]) or\nmax_over_time(rdsosmetrics_diskIO_readIOsPS{instance=\"$host\"}[5m])) ",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,
"legendFormat": "Read: {{ device }}",
Expand All @@ -316,7 +317,8 @@
"calculatedInterval": "2m",
"datasourceErrors": {},
"errors": {},
"expr": "rate(node_disk_writes_completed{device=~\"$device\", instance=\"$host\"}[$interval]) or irate(node_disk_writes_completed{device=~\"$device\", instance=\"$host\"}[5m])",
"expr": "(rate(node_disk_writes_completed{device=~\"$device\", instance=\"$host\"}[$interval]) or \nirate(node_disk_writes_completed{device=~\"$device\", instance=\"$host\"}[5m])) or\n(max_over_time(rdsosmetrics_diskIO_writeIOsPS{instance=\"$host\"}[$interval]) or\nmax_over_time(rdsosmetrics_diskIO_writeIOsPS{instance=\"$host\"}[5m])) ",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,
"legendFormat": "Write: {{ device }}",
Expand Down Expand Up @@ -360,7 +362,7 @@
"logBase": 1,
"max": null,
"min": 0,
"show": true
"show": false
}
],
"yaxis": {
Expand Down Expand Up @@ -419,7 +421,8 @@
"calculatedInterval": "2m",
"datasourceErrors": {},
"errors": {},
"expr": "rate(node_disk_bytes_read{device=~\"$device\", instance=\"$host\"}[$interval]) or irate(node_disk_bytes_read{device=~\"$device\", instance=\"$host\"}[5m])",
"expr": "(rate(node_disk_bytes_read{device=~\"$device\", instance=\"$host\"}[$interval]) or \nirate(node_disk_bytes_read{device=~\"$device\", instance=\"$host\"}[5m])) or\n(rate(rdsosmetrics_diskIO_readThroughput{instance=\"$host\"}[$interval]) or\nirate(rdsosmetrics_diskIO_readThroughput{instance=\"$host\"}[5m]))",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,
"legendFormat": "Read: {{ device }}",
Expand All @@ -432,7 +435,8 @@
"calculatedInterval": "2m",
"datasourceErrors": {},
"errors": {},
"expr": "rate(node_disk_bytes_written{device=~\"$device\", instance=\"$host\"}[$interval]) or irate(node_disk_bytes_written{device=~\"$device\", instance=\"$host\"}[5m])",
"expr": "rate(node_disk_bytes_written{device=~\"$device\", instance=\"$host\"}[$interval]) or \nirate(node_disk_bytes_written{device=~\"$device\", instance=\"$host\"}[5m]) or\n(rate(rdsosmetrics_diskIO_writeThroughput{instance=\"$host\"}[$interval]) or\nirate(rdsosmetrics_diskIO_writeThroughput{instance=\"$host\"}[5m]))",
"format": "time_series",
"interval": "$interval",
"intervalFactor": 1,
"legendFormat": "Write: {{ device }}",
Expand Down Expand Up @@ -649,7 +653,9 @@
"calculatedInterval": "2m",
"datasourceErrors": {},
"errors": {},
"expr": "rate(node_disk_io_time_ms{device=~\"$device\", instance=\"$host\"}[$interval])/1000 or irate(node_disk_io_time_ms{device=~\"$device\", instance=\"$host\"}[5m])/1000",
"expr": "rate(node_disk_io_time_ms{device=~\"$device\", instance=\"$host\"}[$interval])/1000 or \nirate(node_disk_io_time_ms{device=~\"$device\", instance=\"$host\"}[5m])/1000",
"format": "time_series",
"hide": false,
"interval": "$interval",
"intervalFactor": 1,
"legendFormat": "{{ device }}",
Expand Down Expand Up @@ -1016,7 +1022,7 @@
"multiFormat": "regex values",
"name": "host",
"options": [],
"query": "label_values({__name__=~\"node_disk_reads_completed|aws_rds_disk_queue_depth_average\"}, instance)",
"query": "label_values({__name__=~\"node_disk_reads_completed|aws_rds_disk_queue_depth_average|rdsosmetrics_diskIO_readLatency\"}, instance)",
"refresh": 1,
"refresh_on_load": false,
"regex": "",
Expand Down

0 comments on commit a05968d

Please sign in to comment.