diff --git a/modules/kubernetes/monitoring/dashboards/idrac.json b/modules/kubernetes/monitoring/dashboards/idrac.json index b0e3e9e5..c899ec92 100644 --- a/modules/kubernetes/monitoring/dashboards/idrac.json +++ b/modules/kubernetes/monitoring/dashboards/idrac.json @@ -26,6 +26,7 @@ }, "enable": true, "expr": "last_over_time(r730_idrac_idrac_events_log_entry{job=~\"$job\", instance=~\"$instance\"}[$__interval] offset -$__interval) * 1000 < ${__to}\nand \nlast_over_time(r730_idrac_idrac_events_log_entry{job=~\"$job\", instance=~\"$instance\"}[$__interval] offset -$__interval) * 1000 > ${__from}", + "hide": false, "iconColor": "purple", "name": "Events", "tagKeys": "instance,severity", @@ -53,7 +54,6 @@ "url": "d/3faidY24k" } ], - "liveNow": false, "panels": [ { "collapsed": false, @@ -109,7 +109,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -145,7 +145,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -212,7 +212,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -248,7 +248,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -303,6 +303,9 @@ "cellOptions": { "type": "auto" }, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -311,7 +314,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -456,14 +459,6 @@ "id": 32, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [ { @@ -472,7 +467,7 @@ } ] }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -590,7 +585,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -604,7 +599,6 @@ "x": 0, "y": 5 }, - "hideTimeOverride": true, "id": 4, "options": { "colorMode": "value", @@ -624,7 +618,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -686,7 +680,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -700,7 +694,6 @@ "x": 4, "y": 5 }, - "hideTimeOverride": true, "id": 6, "options": { "colorMode": "value", @@ -720,7 +713,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -747,7 +740,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -783,7 +776,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -847,7 +840,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -861,7 +854,6 @@ "x": 0, "y": 7 }, - "hideTimeOverride": true, "id": 5, "options": { "colorMode": "value", @@ -881,7 +873,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -918,7 +910,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -932,7 +924,6 @@ "x": 4, "y": 7 }, - "hideTimeOverride": true, "id": 7, "options": { "colorMode": "value", @@ -952,7 +943,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -979,7 +970,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -1015,7 +1006,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -1069,7 +1060,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -1105,7 +1096,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -1173,7 +1164,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -1209,7 +1200,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -1278,7 +1269,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -1314,7 +1305,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -1368,6 +1359,9 @@ "cellOptions": { "type": "auto" }, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -1376,7 +1370,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1505,14 +1499,6 @@ "id": 31, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [ { @@ -1521,7 +1507,7 @@ } ] }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1616,6 +1602,9 @@ "cellOptions": { "type": "auto" }, + "footer": { + "reducers": [] + }, "inspect": false }, "mappings": [], @@ -1624,7 +1613,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1765,18 +1754,10 @@ "id": 34, "options": { "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, "showHeader": true, "sortBy": [] }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1909,6 +1890,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "opacity", @@ -1925,6 +1907,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -1941,7 +1924,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -1966,11 +1949,13 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "desc" } }, + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -2025,6 +2010,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "opacity", @@ -2041,6 +2027,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": 3600000, "stacking": { "group": "A", @@ -2057,7 +2044,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -2082,11 +2069,13 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "desc" } }, + "pluginVersion": "12.3.0", "targets": [ { "alias": "", @@ -2184,8 +2173,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -2287,8 +2275,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -2412,8 +2399,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -2490,8 +2476,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -2604,8 +2589,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2814,8 +2798,9 @@ "type": "table" } ], + "preload": false, "refresh": "auto", - "schemaVersion": 39, + "schemaVersion": 42, "tags": [ "dell", "idrac", @@ -2826,30 +2811,21 @@ "list": [ { "current": { - "selected": false, "text": "Prometheus", "value": "PBFA97CFB590B2093" }, - "hide": 0, "includeAll": false, "label": "Datasource", - "multi": false, "name": "datasource", "options": [], "query": "prometheus", - "queryValue": "", "refresh": 1, "regex": ".+", - "skipUrlSync": false, "type": "datasource" }, { - "allValue": "", "current": { - "selected": true, - "text": [ - "All" - ], + "text": "All", "value": [ "$__all" ] @@ -2859,7 +2835,6 @@ "uid": "${datasource}" }, "definition": "label_values(r730_idrac_idrac_system_machine_info,job)", - "hide": 0, "includeAll": true, "label": "job", "multi": true, @@ -2868,14 +2843,12 @@ "query": "label_values(r730_idrac_idrac_system_machine_info,job)", "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, { "allValue": ".+", "current": { - "selected": false, "text": "192.168.1.4", "value": "192.168.1.4" }, @@ -2884,16 +2857,12 @@ "uid": "${datasource}" }, "definition": "label_values(r730_idrac_idrac_system_machine_info{job=~\"$job\"},instance)", - "hide": 0, "includeAll": false, - "label": "", - "multi": false, "name": "instance", "options": [], "query": "label_values(r730_idrac_idrac_system_machine_info{job=~\"$job\"},instance)", "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 3, "type": "query" } @@ -2907,6 +2876,5 @@ "timezone": "", "title": "IDRAC", "uid": "YVz226S4z", - "version": 3, - "weekStart": "" + "version": 4 } diff --git a/modules/kubernetes/monitoring/dashboards/nginx_ingress.json b/modules/kubernetes/monitoring/dashboards/nginx_ingress.json index ada1881d..a67ea61f 100644 --- a/modules/kubernetes/monitoring/dashboards/nginx_ingress.json +++ b/modules/kubernetes/monitoring/dashboards/nginx_ingress.json @@ -36,7 +36,6 @@ "description": "NGINX Ingress controller", "editable": true, "fiscalYearStartMonth": 0, - "gnetId": 21334, "graphTooltip": 0, "id": 21, "links": [], @@ -68,7 +67,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -80,6 +79,12 @@ }, "overrides": [] }, + "gridPos": { + "h": 3, + "w": 6, + "x": 0, + "y": 0 + }, "id": 20, "maxDataPoints": 100, "options": { @@ -99,7 +104,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -143,7 +148,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -180,7 +185,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -225,7 +230,7 @@ "steps": [ { "color": "rgba(245, 54, 54, 0.9)", - "value": null + "value": 0 }, { "color": "rgba(237, 129, 40, 0.89)", @@ -266,7 +271,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -311,7 +316,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -348,7 +353,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -394,7 +399,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -431,7 +436,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -466,6 +471,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -482,6 +488,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -497,7 +504,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -547,12 +554,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.4.3", - "repeatDirection": "h", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -591,6 +598,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -607,6 +615,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -622,7 +631,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -717,11 +726,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "asc" } }, - "pluginVersion": "10.4.3", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -747,6 +757,10 @@ "type": "loki", "uid": "fejvsai4fvvggf" }, + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, "gridPos": { "h": 12, "w": 24, @@ -756,14 +770,17 @@ "id": 92, "options": { "dedupStrategy": "none", + "enableInfiniteScrolling": false, "enableLogDetails": true, "prettifyLogMessage": false, "showCommonLabels": false, + "showControls": false, "showLabels": false, "showTime": true, "sortOrder": "Descending", "wrapLogMessage": true }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -796,6 +813,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -812,6 +830,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -827,7 +846,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -858,11 +877,12 @@ "width": 200 }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.4.3", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -915,6 +935,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -931,6 +952,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -946,7 +968,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1023,11 +1045,12 @@ "width": 200 }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "desc" } }, - "pluginVersion": "10.4.3", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1065,6 +1088,7 @@ "axisLabel": "cores", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1081,6 +1105,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": true, "stacking": { "group": "A", @@ -1096,7 +1121,7 @@ "steps": [ { "color": "transparent", - "value": null + "value": 0 } ] }, @@ -1122,11 +1147,12 @@ "showLegend": false }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "desc" } }, - "pluginVersion": "10.4.3", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1169,8 +1195,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1287,8 +1312,7 @@ "mode": "absolute", "steps": [ { - "color": "rgba(245, 54, 54, 0.9)", - "value": null + "color": "rgba(245, 54, 54, 0.9)" }, { "color": "rgba(237, 129, 40, 0.89)" @@ -1352,7 +1376,6 @@ "x": 0, "y": 28 }, - "hideTimeOverride": false, "id": 75, "options": { "cellHeight": "sm", @@ -1367,7 +1390,6 @@ "showHeader": true }, "pluginVersion": "11.1.0", - "repeatDirection": "h", "targets": [ { "datasource": { @@ -1511,7 +1533,6 @@ "x": 0, "y": 36 }, - "hideTimeOverride": false, "id": 91, "options": { "legend": { @@ -1526,7 +1547,6 @@ } }, "pluginVersion": "8.3.4", - "repeatDirection": "h", "targets": [ { "datasource": { @@ -1579,15 +1599,6 @@ "type": "timeseries" }, { - "cards": {}, - "color": { - "cardColor": "#b4ff00", - "colorScale": "sqrt", - "colorScheme": "interpolateWarm", - "exponent": 0.5, - "mode": "spectrum" - }, - "dataFormat": "tsbuckets", "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" @@ -1614,13 +1625,7 @@ "x": 12, "y": 36 }, - "heatmap": {}, - "hideZeroBuckets": false, - "highlightCards": true, "id": 89, - "legend": { - "show": true - }, "options": { "calculate": false, "calculation": {}, @@ -1660,7 +1665,6 @@ } }, "pluginVersion": "10.4.3", - "reverseYBuckets": false, "targets": [ { "datasource": { @@ -1676,20 +1680,7 @@ } ], "title": "Ingress Request Latency Heatmap (Ingress Namespaces)", - "tooltip": { - "show": true, - "showHistogram": true - }, - "type": "heatmap", - "xAxis": { - "show": true - }, - "yAxis": { - "format": "s", - "logBase": 1, - "show": true - }, - "yBucketBound": "auto" + "type": "heatmap" }, { "datasource": { @@ -1833,8 +1824,9 @@ "type": "table" } ], + "preload": false, "refresh": "5s", - "schemaVersion": 39, + "schemaVersion": 42, "tags": [ "nginx" ], @@ -1842,27 +1834,21 @@ "list": [ { "current": { - "selected": false, "text": "Prometheus", "value": "PBFA97CFB590B2093" }, - "hide": 0, "includeAll": false, "label": "datasource", - "multi": false, "name": "DS_PROMETHEUS", "options": [], "query": "prometheus", - "queryValue": "", "refresh": 1, "regex": "", - "skipUrlSync": false, "type": "datasource" }, { "allValue": ".*", "current": { - "selected": false, "text": "All", "value": "$__all" }, @@ -1871,26 +1857,18 @@ "uid": "PBFA97CFB590B2093" }, "definition": "", - "hide": 0, "includeAll": true, "label": "Namespace", - "multi": false, "name": "namespace", "options": [], "query": "label_values(nginx_ingress_controller_config_hash, controller_namespace)", "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" }, { "allValue": ".*", "current": { - "selected": false, "text": "All", "value": "$__all" }, @@ -1899,26 +1877,18 @@ "uid": "PBFA97CFB590B2093" }, "definition": "", - "hide": 0, "includeAll": true, "label": "Controller Class", - "multi": false, "name": "controller_class", "options": [], "query": "label_values(nginx_ingress_controller_config_hash{namespace=~\"$namespace\"}, controller_class) ", "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" }, { "allValue": ".*", "current": { - "selected": false, "text": "All", "value": "$__all" }, @@ -1927,26 +1897,19 @@ "uid": "PBFA97CFB590B2093" }, "definition": "", - "hide": 0, "includeAll": true, "label": "Controller", - "multi": false, "name": "controller", "options": [], "query": "label_values(nginx_ingress_controller_config_hash{namespace=~\"$namespace\",controller_class=~\"$controller_class\"}, controller_pod) ", "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" }, { "allValue": ".*", "current": { - "selected": false, "text": "All", "value": "$__all" }, @@ -1955,26 +1918,19 @@ "uid": "PBFA97CFB590B2093" }, "definition": "", - "hide": 0, "includeAll": true, "label": "Ingress Namespace", - "multi": false, "name": "exported_namespace", "options": [], "query": "label_values(nginx_ingress_controller_requests{namespace=~\"$namespace\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}, exported_namespace) ", "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" }, { "allValue": ".*", "current": { - "selected": false, "text": "All", "value": "$__all" }, @@ -1983,21 +1939,15 @@ "uid": "PBFA97CFB590B2093" }, "definition": "", - "hide": 0, "includeAll": true, "label": "Ingress", - "multi": false, "name": "ingress", "options": [], "query": "label_values(nginx_ingress_controller_requests{namespace=~\"$namespace\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",exported_namespace=~\"$exported_namespace\"}, ingress) ", "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" } ] }, @@ -2017,22 +1967,10 @@ "1h", "2h", "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" ] }, "timezone": "browser", "title": "NGINX Ingress controller", "uid": "nginx", - "version": 2, - "weekStart": "" + "version": 2 } diff --git a/modules/kubernetes/monitoring/dashboards/registry.json b/modules/kubernetes/monitoring/dashboards/registry.json index b04d26f7..e9d904c7 100644 --- a/modules/kubernetes/monitoring/dashboards/registry.json +++ b/modules/kubernetes/monitoring/dashboards/registry.json @@ -17,17 +17,12 @@ }, "editable": true, "fiscalYearStartMonth": 0, - "gnetId": 9621, "graphTooltip": 0, "id": 24, "links": [], "panels": [ { "collapsed": false, - "datasource": { - "type": "datasource", - "uid": "grafana" - }, "gridPos": { "h": 1, "w": 24, @@ -36,15 +31,6 @@ }, "id": 22, "panels": [], - "targets": [ - { - "datasource": { - "type": "datasource", - "uid": "grafana" - }, - "refId": "A" - } - ], "title": "General Counters, CPU, Memory and File Descriptor Stats", "type": "row" }, @@ -72,7 +58,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -109,7 +95,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -152,7 +138,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -189,7 +175,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -230,7 +216,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -267,7 +253,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -308,7 +294,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -345,7 +331,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -390,7 +376,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -427,7 +413,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -464,6 +450,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -480,6 +467,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -495,7 +483,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -527,10 +515,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -567,6 +557,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -583,6 +574,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -598,7 +590,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -630,10 +622,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -683,6 +677,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -699,6 +694,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -714,7 +710,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -746,10 +742,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -770,10 +768,6 @@ }, { "collapsed": false, - "datasource": { - "type": "datasource", - "uid": "grafana" - }, "gridPos": { "h": 1, "w": 24, @@ -782,15 +776,6 @@ }, "id": 20, "panels": [], - "targets": [ - { - "datasource": { - "type": "datasource", - "uid": "grafana" - }, - "refId": "A" - } - ], "title": "Registry Metrics", "type": "row" }, @@ -812,6 +797,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -828,6 +814,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -844,7 +831,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -873,10 +860,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -911,6 +900,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -927,6 +917,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -943,7 +934,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -972,10 +963,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1010,6 +1003,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1026,6 +1020,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1042,7 +1037,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1069,10 +1064,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1106,6 +1103,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1122,6 +1120,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1138,7 +1137,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1165,10 +1164,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "multi", "sort": "desc" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1189,15 +1190,6 @@ "type": "timeseries" }, { - "cards": {}, - "color": { - "cardColor": "#b4ff00", - "colorScale": "sqrt", - "colorScheme": "interpolateOranges", - "exponent": 0.5, - "mode": "spectrum" - }, - "dataFormat": "timeseries", "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" @@ -1223,12 +1215,7 @@ "x": 8, "y": 20 }, - "heatmap": {}, - "highlightCards": true, "id": 36, - "legend": { - "show": false - }, "options": { "calculate": true, "calculation": {}, @@ -1268,7 +1255,7 @@ "unit": "short" } }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1284,32 +1271,9 @@ } ], "title": "HTTP Request Latencies in seconds (blob)", - "tooltip": { - "show": true, - "showHistogram": false - }, - "type": "heatmap", - "xAxis": { - "show": true - }, - "yAxis": { - "format": "short", - "logBase": 1, - "min": "0", - "show": true - }, - "yBucketBound": "auto" + "type": "heatmap" }, { - "cards": {}, - "color": { - "cardColor": "#b4ff00", - "colorScale": "sqrt", - "colorScheme": "interpolateOranges", - "exponent": 0.5, - "mode": "spectrum" - }, - "dataFormat": "timeseries", "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" @@ -1335,12 +1299,7 @@ "x": 16, "y": 20 }, - "heatmap": {}, - "highlightCards": true, "id": 38, - "legend": { - "show": false - }, "options": { "calculate": true, "calculation": {}, @@ -1380,7 +1339,7 @@ "unit": "short" } }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1396,32 +1355,9 @@ } ], "title": "Upload HTTP Request Latencies in seconds (base)", - "tooltip": { - "show": true, - "showHistogram": false - }, - "type": "heatmap", - "xAxis": { - "show": true - }, - "yAxis": { - "format": "short", - "logBase": 1, - "min": "0", - "show": true - }, - "yBucketBound": "auto" + "type": "heatmap" }, { - "cards": {}, - "color": { - "cardColor": "#b4ff00", - "colorScale": "sqrt", - "colorScheme": "interpolateOranges", - "exponent": 0.5, - "mode": "spectrum" - }, - "dataFormat": "timeseries", "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" @@ -1447,12 +1383,7 @@ "x": 0, "y": 27 }, - "heatmap": {}, - "highlightCards": true, "id": 2, - "legend": { - "show": false - }, "options": { "calculate": true, "calculation": {}, @@ -1492,7 +1423,7 @@ "unit": "short" } }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1508,32 +1439,9 @@ } ], "title": "Upload HTTP Request Latencies in seconds (blob_upload)", - "tooltip": { - "show": true, - "showHistogram": false - }, - "type": "heatmap", - "xAxis": { - "show": true - }, - "yAxis": { - "format": "short", - "logBase": 1, - "min": "0", - "show": true - }, - "yBucketBound": "auto" + "type": "heatmap" }, { - "cards": {}, - "color": { - "cardColor": "#b4ff00", - "colorScale": "sqrt", - "colorScheme": "interpolateOranges", - "exponent": 0.5, - "mode": "spectrum" - }, - "dataFormat": "timeseries", "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" @@ -1559,12 +1467,7 @@ "x": 8, "y": 27 }, - "heatmap": {}, - "highlightCards": true, "id": 42, - "legend": { - "show": false - }, "options": { "calculate": true, "calculation": {}, @@ -1604,7 +1507,7 @@ "unit": "short" } }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1618,32 +1521,9 @@ } ], "title": "Manifest HTTP Request Latencies in seconds (manifest)", - "tooltip": { - "show": true, - "showHistogram": false - }, - "type": "heatmap", - "xAxis": { - "show": true - }, - "yAxis": { - "format": "short", - "logBase": 1, - "min": "0", - "show": true - }, - "yBucketBound": "auto" + "type": "heatmap" }, { - "cards": {}, - "color": { - "cardColor": "#b4ff00", - "colorScale": "sqrt", - "colorScheme": "interpolateOranges", - "exponent": 0.5, - "mode": "spectrum" - }, - "dataFormat": "timeseries", "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" @@ -1669,12 +1549,7 @@ "x": 16, "y": 27 }, - "heatmap": {}, - "highlightCards": true, "id": 40, - "legend": { - "show": false - }, "options": { "calculate": true, "calculation": {}, @@ -1714,7 +1589,7 @@ "unit": "short" } }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1730,25 +1605,12 @@ } ], "title": "Catalog HTTP Request Latencies in seconds (catalog)", - "tooltip": { - "show": true, - "showHistogram": false - }, - "type": "heatmap", - "xAxis": { - "show": true - }, - "yAxis": { - "format": "short", - "logBase": 1, - "min": "0", - "show": true - }, - "yBucketBound": "auto" + "type": "heatmap" } ], + "preload": false, "refresh": "10s", - "schemaVersion": 39, + "schemaVersion": 42, "tags": [ "docker", "registry", @@ -1758,9 +1620,7 @@ "list": [ { "current": { - "isNone": true, - "selected": false, - "text": "None", + "text": "", "value": "" }, "datasource": { @@ -1768,26 +1628,17 @@ "uid": "PBFA97CFB590B2093" }, "definition": "", - "hide": 0, "includeAll": false, - "multi": false, "name": "namespace", "options": [], "query": "query_result(registry_registry_http_in_flight_requests)", "refresh": 2, "regex": "/.*kubernetes_namespace=\"([^\"]+).*/", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" }, { "current": { - "isNone": true, - "selected": false, - "text": "None", + "text": "", "value": "" }, "datasource": { @@ -1795,46 +1646,31 @@ "uid": "PBFA97CFB590B2093" }, "definition": "", - "hide": 0, "includeAll": false, - "multi": false, "name": "app", "options": [], "query": "query_result(registry_registry_http_in_flight_requests{kubernetes_namespace=\"$namespace\"})", "refresh": 2, "regex": "/.*app=\"([^\"]+)/", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" }, { "current": { - "selected": false, - "text": "10.0.10.10:5001", - "value": "10.0.10.10:5001" + "text": "10.0.20.10:5001", + "value": "10.0.20.10:5001" }, "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, "definition": "", - "hide": 0, "includeAll": false, - "multi": false, "name": "instance", "options": [], "query": "query_result(up{app=\"$app\"})", "refresh": 1, "regex": "/.*instance=\"([^\"]+).*/", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" } ] }, @@ -1842,34 +1678,9 @@ "from": "now-6h", "to": "now" }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, + "timepicker": {}, "timezone": "", "title": "Docker Registry", "uid": "CoBSgj8iz", - "version": 6, - "weekStart": "" + "version": 6 } diff --git a/modules/kubernetes/monitoring/dashboards/ups.json b/modules/kubernetes/monitoring/dashboards/ups.json index 830b9826..8ed8de9c 100644 --- a/modules/kubernetes/monitoring/dashboards/ups.json +++ b/modules/kubernetes/monitoring/dashboards/ups.json @@ -62,7 +62,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -80,7 +80,6 @@ "x": 0, "y": 1 }, - "hideTimeOverride": true, "id": 16, "maxDataPoints": 100, "options": { @@ -100,7 +99,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -139,7 +138,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "semi-dark-red", @@ -185,7 +184,7 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -223,7 +222,7 @@ "steps": [ { "color": "red", - "value": null + "value": 0 }, { "color": "orange", @@ -267,7 +266,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -306,7 +305,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "#EAB839", @@ -344,7 +343,7 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -382,7 +381,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -417,7 +416,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -456,7 +455,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "yellow", @@ -496,7 +495,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -534,7 +533,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "dark-red", @@ -576,7 +575,7 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -614,7 +613,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 } ] }, @@ -644,7 +643,7 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -683,6 +682,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -699,6 +699,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -714,7 +715,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -741,10 +742,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -786,6 +789,7 @@ "axisSoftMax": 235, "axisSoftMin": 225, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -802,6 +806,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -817,7 +822,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -844,10 +849,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -886,6 +893,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -902,6 +910,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -917,7 +926,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -944,10 +953,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -986,6 +997,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1002,6 +1014,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1017,7 +1030,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1044,10 +1057,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1086,6 +1101,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1102,6 +1118,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1117,7 +1134,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1144,10 +1161,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1186,6 +1205,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1202,6 +1222,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1217,7 +1238,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1244,10 +1265,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1287,6 +1310,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1303,6 +1327,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1318,7 +1343,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "semi-dark-red", @@ -1357,11 +1382,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1400,6 +1426,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1416,6 +1443,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1431,7 +1459,7 @@ "steps": [ { "color": "red", - "value": null + "value": 0 }, { "color": "orange", @@ -1466,11 +1494,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1535,7 +1564,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1574,7 +1603,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1613,6 +1642,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1629,6 +1659,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1644,7 +1675,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1670,10 +1701,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1729,6 +1762,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1745,6 +1779,7 @@ "type": "linear" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1760,7 +1795,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1787,10 +1822,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1827,6 +1864,17 @@ "range": true, "refId": "B", "useBackend": false + }, + { + "datasource": { + "name": "Expression", + "type": "__expr__", + "uid": "__expr__" + }, + "expression": "$A+$B", + "hide": false, + "refId": "Total", + "type": "math" } ], "title": "Daily Total Consumption", @@ -1849,6 +1897,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1866,6 +1915,7 @@ "type": "log" }, "showPoints": "auto", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -1881,7 +1931,7 @@ "steps": [ { "color": "green", - "value": null + "value": 0 }, { "color": "red", @@ -1908,10 +1958,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "12.3.0", "targets": [ { "datasource": { @@ -1951,20 +2003,20 @@ "type": "timeseries" } ], - "refresh": "5s", - "schemaVersion": 39, + "preload": false, + "refresh": "1m", + "schemaVersion": 42, "tags": [], "templating": { "list": [] }, "time": { - "from": "now-7d", + "from": "now-1h", "to": "now" }, "timepicker": {}, "timezone": "browser", "title": "Huawei UPS 2000", "uid": "ee70yskqw5u68f", - "version": 33, - "weekStart": "" + "version": 35 }