Commit 36f4e2e0 authored by jmsolo's avatar jmsolo

enhancement: adjust uptime to display day/hour/minute format

parent 85d33269
......@@ -16,7 +16,7 @@
"editable": true,
"gnetId": 5955,
"graphTooltip": 1,
"iteration": 1561563152752,
"iteration": 1563899011516,
"links": [],
"panels": [
{
......@@ -42,7 +42,8 @@
"#d44a3a"
],
"datasource": "InfluxStandard",
"format": "s",
"decimals": 2,
"format": "dtdurations",
"gauge": {
"maxValue": 100,
"minValue": 0,
......@@ -94,6 +95,7 @@
"tableColumn": "",
"targets": [
{
"alias": "",
"groupBy": [
{
"params": [
......@@ -103,22 +105,21 @@
},
{
"params": [
"null"
"none"
],
"type": "fill"
}
],
"measurement": "system",
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT last(\"uptime_format\") AS \"value\" FROM \"system\" WHERE \"host\" =~ /$server$/ AND $timeFilter GROUP BY time($interval)",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
"uptime"
],
"type": "field"
},
......@@ -128,13 +129,19 @@
}
]
],
"tags": []
"tags": [
{
"key": "host",
"operator": "=~",
"value": "/^$server$/"
}
]
}
],
"thresholds": "",
"title": "Uptime",
"type": "singlestat",
"valueFontSize": "80%",
"valueFontSize": "50%",
"valueMaps": [
{
"op": "=",
......@@ -190,7 +197,7 @@
"showThresholdLabels": false,
"showThresholdMarkers": true
},
"pluginVersion": "6.2.4",
"pluginVersion": "6.2.5",
"targets": [
{
"alias": "$tag_path ($tag_fstype on $tag_device)",
......@@ -5244,7 +5251,7 @@
}
}
],
"refresh": "1m",
"refresh": "5s",
"schemaVersion": 18,
"style": "dark",
"tags": [
......@@ -5275,8 +5282,8 @@
{
"allValue": null,
"current": {
"text": "subbox2.quickbox.io",
"value": "subbox2.quickbox.io"
"text": "/$server/",
"value": "/$server/"
},
"datasource": "InfluxStandard",
"definition": "",
......@@ -5517,5 +5524,5 @@
"timezone": "browser",
"title": "System Metrics",
"uid": "kK_iPEnZz",
"version": 2
"version": 1
}
\ No newline at end of file
......@@ -16,7 +16,7 @@
"editable": true,
"gnetId": 5955,
"graphTooltip": 1,
"iteration": 1561513027223,
"iteration": 1563899011516,
"links": [],
"panels": [
{
......@@ -42,7 +42,8 @@
"#d44a3a"
],
"datasource": "InfluxStandard",
"format": "s",
"decimals": 2,
"format": "dtdurations",
"gauge": {
"maxValue": 100,
"minValue": 0,
......@@ -94,6 +95,7 @@
"tableColumn": "",
"targets": [
{
"alias": "",
"groupBy": [
{
"params": [
......@@ -103,22 +105,21 @@
},
{
"params": [
"null"
"none"
],
"type": "fill"
}
],
"measurement": "system",
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT last(\"uptime_format\") AS \"value\" FROM \"system\" WHERE \"host\" =~ /$server$/ AND $timeFilter GROUP BY time($interval)",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
"uptime"
],
"type": "field"
},
......@@ -128,13 +129,19 @@
}
]
],
"tags": []
"tags": [
{
"key": "host",
"operator": "=~",
"value": "/^$server$/"
}
]
}
],
"thresholds": "",
"title": "Uptime",
"type": "singlestat",
"valueFontSize": "80%",
"valueFontSize": "50%",
"valueMaps": [
{
"op": "=",
......@@ -146,22 +153,7 @@
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorValue": true,
"colors": [
"#3bc391",
"#eb9532",
"#d9534f"
],
"datasource": "InfluxStandard",
"format": "percent",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": true,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 3,
"w": 2,
......@@ -169,43 +161,46 @@
"y": 1
},
"id": 65079,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
"options": {
"fieldOptions": {
"calcs": [
"mean"
],
"defaults": {
"max": 100,
"min": 0,
"unit": "percent"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "#3bc391",
"index": 0,
"value": null
},
{
"color": "#eb9532",
"index": 1,
"value": 75
},
{
"color": "#d9534f",
"index": 2,
"value": 90
}
],
"values": false
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"options": {},
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"show": false
"orientation": "auto",
"showThresholdLabels": false,
"showThresholdMarkers": true
},
"tableColumn": "",
"pluginVersion": "6.2.5",
"targets": [
{
"alias": "$tag_path ($tag_fstype on $tag_device)",
"groupBy": [
{
"params": [
......@@ -222,7 +217,7 @@
],
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT last(\"used_percent\") FROM \"disk\" WHERE (\"host\" =~ /^$server$/ AND \"path\" = '/home') AND $timeFilter GROUP BY time($interval) fill(null)",
"query": "SELECT last(\"used_percent\") FROM \"disk\" WHERE (\"host\" =~ /^$server$/) AND $timeFilter GROUP BY time($interval), \"path\", \"device\", \"fstype\" fill(null)",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
......@@ -243,18 +238,8 @@
"tags": []
}
],
"thresholds": "70,80,90",
"title": "Root FS Used",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "current"
"title": "FS Used",
"type": "gauge"
},
{
"cacheTimeout": null,
......@@ -2110,10 +2095,11 @@
"interval": "$inter",
"legend": {
"alignAsTable": true,
"avg": true,
"avg": false,
"current": true,
"max": true,
"min": true,
"rightSide": false,
"show": true,
"sort": "current",
"sortDesc": true,
......@@ -2143,7 +2129,7 @@
"steppedLine": true,
"targets": [
{
"alias": "$tag_host: $tag_path : $col",
"alias": "$tag_path ($tag_fstype on $tag_device) : $col",
"dsType": "influxdb",
"function": "mean",
"groupBy": [
......@@ -2172,7 +2158,7 @@
"measurement": "disk_total",
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT mean(total) AS \"total\", mean(used) as \"used\", mean(free) as \"free\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" = '/home' AND $timeFilter GROUP BY time($interval), \"host\", \"path\"",
"query": "SELECT mean(total) AS \"total\", mean(used) as \"used\", mean(free) as \"free\" FROM \"disk\" WHERE (\"host\" =~ /^$server$/) AND $timeFilter GROUP BY time($interval), \"path\", \"device\", \"fstype\" fill(null)",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series",
......@@ -2197,7 +2183,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Root Disk usage (/)",
"title": "Disk usage",
"tooltip": {
"shared": true,
"sort": 0,
......@@ -2224,7 +2210,7 @@
"logBase": 1,
"max": null,
"min": null,
"show": true
"show": false
}
],
"yaxis": {
......@@ -2432,7 +2418,7 @@
"steppedLine": true,
"targets": [
{
"alias": "$tag_host: $tag_path : $col",
"alias": "$tag_path ($tag_fstype on $tag_device) : $col",
"dsType": "influxdb",
"function": "mean",
"groupBy": [
......@@ -2461,7 +2447,7 @@
"measurement": "disk_inodes_free",
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT mean(inodes_total) as \"total\", mean(inodes_free) as \"free\", mean(inodes_used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$server$/ AND \"path\" = '/home' AND $timeFilter GROUP BY time($interval), \"host\", \"path\"",
"query": "SELECT mean(inodes_total) as \"total\", mean(inodes_free) as \"free\", mean(inodes_used) as \"used\" FROM \"disk\" WHERE (\"host\" =~ /^$server$/) AND $timeFilter GROUP BY time($interval), \"path\", \"device\", \"fstype\" fill(null)",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series",
......@@ -2486,7 +2472,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Root (/) Disk inodes",
"title": "Disk inodes",
"tooltip": {
"shared": true,
"sort": 0,
......@@ -5265,7 +5251,7 @@
}
}
],
"refresh": false,
"refresh": "5s",
"schemaVersion": 18,
"style": "dark",
"tags": [
......@@ -5296,8 +5282,8 @@
{
"allValue": null,
"current": {
"text": "subbox2",
"value": "subbox2"
"text": "/$server/",
"value": "/$server/"
},
"datasource": "InfluxStandard",
"definition": "",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment