diff --git a/config/federation/grafana/dashboards/GCP_Billing.json b/config/federation/grafana/dashboards/GCP_Billing.json index 8c7e8e33..0108280c 100644 --- a/config/federation/grafana/dashboards/GCP_Billing.json +++ b/config/federation/grafana/dashboards/GCP_Billing.json @@ -128,7 +128,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -238,7 +238,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -409,7 +409,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -550,7 +550,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -693,7 +693,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -846,7 +846,7 @@ }, { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -900,7 +900,7 @@ }, { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -1073,7 +1073,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -1214,7 +1214,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -1357,7 +1357,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "editorMode": "code", @@ -1425,7 +1425,7 @@ "value": "measurement-lab" }, "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${bqSource}" }, "definition": "", @@ -1626,4 +1626,4 @@ "uid": "a5mC51ZMk", "version": 59, "weekStart": "" -} \ No newline at end of file +} diff --git a/config/federation/grafana/dashboards/NDT_EarlyExit.json b/config/federation/grafana/dashboards/NDT_EarlyExit.json index 4d32cd5e..23e67c33 100644 --- a/config/federation/grafana/dashboards/NDT_EarlyExit.json +++ b/config/federation/grafana/dashboards/NDT_EarlyExit.json @@ -100,7 +100,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -215,7 +215,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -369,7 +369,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -511,7 +511,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -650,7 +650,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -790,7 +790,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -932,7 +932,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -1072,7 +1072,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -1164,7 +1164,7 @@ ] }, "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "definition": "SELECT SUBSTR(server.Site, 0, 3) AS metro,\nFROM ndt.ndt7\nWHERE date >= \"2023-09-01\"\nGROUP BY metro\nORDER BY metro", @@ -1192,7 +1192,7 @@ ] }, "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "definition": "SELECT server.Site AS site,\nFROM ndt.ndt7\nWHERE date >= \"2023-09-01\"\nAND REGEXP_CONTAINS(SUBSTR(server.Site, 0, 3), '${metro:regex}')\nGROUP BY site\nORDER BY site", @@ -1276,4 +1276,4 @@ "uid": "W8JPPzzIz", "version": 39, "weekStart": "" -} \ No newline at end of file +} diff --git a/config/federation/grafana/dashboards/NDT_Metro_Performance_Distributions.json b/config/federation/grafana/dashboards/NDT_Metro_Performance_Distributions.json index 2bcfc056..46ba885e 100644 --- a/config/federation/grafana/dashboards/NDT_Metro_Performance_Distributions.json +++ b/config/federation/grafana/dashboards/NDT_Metro_Performance_Distributions.json @@ -101,7 +101,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -215,7 +215,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -329,7 +329,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -469,7 +469,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", diff --git a/config/federation/grafana/dashboards/NDT_Site_Performance_Distributions.json b/config/federation/grafana/dashboards/NDT_Site_Performance_Distributions.json index bc018ca4..b11accd5 100644 --- a/config/federation/grafana/dashboards/NDT_Site_Performance_Distributions.json +++ b/config/federation/grafana/dashboards/NDT_Site_Performance_Distributions.json @@ -89,7 +89,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -205,7 +205,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -321,7 +321,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -430,7 +430,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -547,7 +547,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", @@ -684,7 +684,7 @@ "targets": [ { "datasource": { - "type": "doitintl-bigquery-datasource", + "type": "grafana-bigquery-datasource", "uid": "${datasource}" }, "editorMode": "code", diff --git a/config/federation/grafana/dashboards/Ops_SwitchOverview.json b/config/federation/grafana/dashboards/Ops_SwitchOverview.json index 6371a9d5..c4f6daf5 100644 --- a/config/federation/grafana/dashboards/Ops_SwitchOverview.json +++ b/config/federation/grafana/dashboards/Ops_SwitchOverview.json @@ -3,7 +3,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": false, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -13,63 +16,99 @@ ] }, "editable": true, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 1, - "id": 197, - "iteration": 1621888082480, + "id": 46, "links": [], + "liveNow": false, "panels": [ { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "fieldConfig": { "defaults": { - "custom": {} + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bps" }, "overrides": [] }, - "fill": 0, - "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, "y": 0 }, - "hiddenSeries": false, "id": 1, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } }, - "percentage": false, - "pluginVersion": "7.3.5", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.2.2", "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "- quantile(0.99, max by (site) (8 * irate(ifHCInOctets{ifAlias=\"uplink\",speed=~\"$speed\"}[4m])))", "format": "time_series", "interval": "", @@ -79,6 +118,9 @@ "step": 10 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "quantile(0.90, max by (site) (8 * irate(ifHCOutOctets{ifAlias=\"uplink\",speed=~\"$speed\"}[4m])))", "format": "time_series", "hide": false, @@ -89,6 +131,9 @@ "step": 10 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "- max(8 * irate(ifHCInOctets{ifAlias=\"uplink\",speed=~\"$speed\"}[4m]))", "format": "time_series", "hide": false, @@ -99,6 +144,9 @@ "step": 10 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "quantile(0.99, max by (site) (8 * irate(ifHCOutOctets{ifAlias=\"uplink\",speed=~\"$speed\"}[4m])))", "format": "time_series", "interval": "", @@ -108,6 +156,9 @@ "step": 10 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "max(8 * irate(ifHCOutOctets{ifAlias=\"uplink\",speed=~\"$speed\"}[4m]))", "format": "time_series", "hide": false, @@ -118,6 +169,9 @@ "step": 10 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "- quantile(0.90, max by (site) (8 * irate(ifHCInOctets{ifAlias=\"uplink\",speed=~\"$speed\"}[4m])))", "format": "time_series", "hide": false, @@ -128,114 +182,148 @@ "step": 10 } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "Uplink Percentiles (In/Out)", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:391", - "format": "bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:392", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "fieldConfig": { "defaults": { - "custom": {}, - "links": [] + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "links": [], + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bps" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/10g/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#8AB8FF", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/1g/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#1F60C4", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsZero", + "value": 0 + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + } + ] }, - "fill": 0, - "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 12, "y": 0 }, - "hiddenSeries": false, "id": 7, - "legend": { - "alignAsTable": false, - "avg": true, - "current": false, - "hideEmpty": false, - "hideZero": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.5", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:1176", - "alias": "/10g/", - "color": "#8AB8FF" + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, - { - "$$hashKey": "object:1192", - "alias": "/1g/", - "color": "#1F60C4" + "tooltip": { + "mode": "multi", + "sort": "desc" } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, + "pluginVersion": "10.2.2", "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "-max by (site) (8 * irate(ifHCOutOctets{ifAlias=\"uplink\", site=\"$site\",speed=~\"$speed\"}[4m]))", "format": "time_series", "interval": "", @@ -245,6 +333,9 @@ "step": 10 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "max by (site) (8 * irate(ifHCInOctets{ifAlias=\"uplink\", site=\"$site\",speed=~\"$speed\"}[4m]))", "format": "time_series", "hide": false, @@ -255,104 +346,97 @@ "step": 10 } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "$site: uplink traffic (In/Out)", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:477", - "format": "bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:478", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "fieldConfig": { "defaults": { - "custom": {}, - "links": [] + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "links": [], + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bps" }, "overrides": [] }, - "fill": 0, - "fillGradient": 0, "gridPos": { "h": 8, "w": 12, "x": 0, "y": 9 }, - "hiddenSeries": false, "id": 3, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sideWidth": null, - "sort": "avg", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } }, - "percentage": false, - "pluginVersion": "7.3.5", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.2.2", "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "topk(10, max by (site) (8 * rate(ifHCOutOctets{ifAlias=\"uplink\",speed=~\"$speed\"}[10m])))", "format": "time_series", "interval": "", @@ -362,104 +446,97 @@ "step": 10 } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "Top 10 Mbps 0ut (10m avg)", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:305", - "format": "bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:306", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "fieldConfig": { "defaults": { - "custom": {}, - "links": [] + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "links": [], + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bps" }, "overrides": [] }, - "fill": 0, - "fillGradient": 0, "gridPos": { "h": 8, "w": 12, "x": 12, "y": 9 }, - "hiddenSeries": false, "id": 4, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sideWidth": null, - "sort": "avg", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } }, - "percentage": false, - "pluginVersion": "7.3.5", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.2.2", "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "topk(10, max by (site) (8 * rate(ifHCInOctets{ifAlias=\"uplink\",speed=~\"$speed\"}[10m])))", "format": "time_series", "interval": "", @@ -469,113 +546,121 @@ "step": 10 } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "Top 10 Mbps In (10m avg)", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:561", - "format": "bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:562", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "fieldConfig": { "defaults": { - "custom": {}, - "links": [] + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "bars", + "fillOpacity": 100, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "links": [], + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "pps" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Global/" + }, + "properties": [ + { + "id": "custom.drawStyle", + "value": "line" + }, + { + "id": "color", + "value": { + "fixedColor": "rgb(110, 109, 109)", + "mode": "fixed" + } + }, + { + "id": "custom.drawStyle", + "value": "line" + } + ] + } + ] }, - "fill": 0, - "fillGradient": 0, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 17 }, - "hiddenSeries": false, "id": 6, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "avg", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": false, - "linewidth": 1, "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.5", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:468", - "alias": "/Global/", - "bars": false, - "color": "rgb(110, 109, 109)", - "lines": true + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, + "pluginVersion": "10.2.2", "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "topk(10, max by (site) (irate(ifOutDiscards{ifAlias=\"uplink\",speed=~\"$speed\"}[4m]) > 0))", "format": "time_series", "hide": false, @@ -586,6 +671,9 @@ "step": 10 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "sum(max by (site) (irate(ifOutDiscards{ifAlias=\"uplink\",speed=~\"$speed\"}[4m]) > 0))", "format": "time_series", "hide": false, @@ -596,105 +684,138 @@ "step": 10 } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "Uplink Dropped Packets: Top 10", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:81", - "format": "pps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:82", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", + "datasource": { + "uid": "$datasource" + }, "fieldConfig": { "defaults": { - "custom": {}, - "links": [] + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "bars", + "fillOpacity": 100, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "links": [], + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "pps" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsZero", + "value": 0 + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + }, + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsNull", + "value": 0 + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + } + ] }, - "fill": 0, - "fillGradient": 0, "gridPos": { "h": 7, "w": 12, "x": 12, "y": 17 }, - "hiddenSeries": false, "id": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "avg", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": false, - "linewidth": 1, "links": [], - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "mean" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } }, - "percentage": false, - "pluginVersion": "7.3.5", - "pointradius": 1, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.2.2", "targets": [ { + "datasource": { + "uid": "$datasource" + }, "expr": "-topk(10, max by(site)(irate(ifOutErrors{ifAlias=\"uplink\",speed=~\"$speed\"}[4m])))", "format": "time_series", "hide": false, @@ -705,6 +826,9 @@ "step": 10 }, { + "datasource": { + "uid": "$datasource" + }, "expr": "topk(10, max by(site)(irate(ifInErrors{ifAlias=\"uplink\",speed=~\"$speed\"}[4m])))", "format": "time_series", "hide": false, @@ -715,53 +839,12 @@ "step": 10 } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "Uplink Errors", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:645", - "format": "pps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:646", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" } ], - "refresh": false, - "schemaVersion": 26, - "style": "dark", + "refresh": "", + "schemaVersion": 38, "tags": [], "templating": { "list": [ @@ -769,9 +852,8 @@ "current": { "selected": false, "text": "Platform Cluster (mlab-oti)", - "value": "Platform Cluster (mlab-oti)" + "value": "xXLAihsGz" }, - "error": null, "hide": 0, "includeAll": false, "label": "Datasource", @@ -785,15 +867,16 @@ "type": "datasource" }, { - "allValue": null, "current": { "selected": false, - "text": "dfw05", - "value": "dfw05" + "text": "akl01", + "value": "akl01" + }, + "datasource": { + "type": "prometheus", + "uid": "$datasource" }, - "datasource": "$datasource", "definition": "label_values(machine)", - "error": null, "hide": 0, "includeAll": false, "label": "Site", @@ -806,21 +889,21 @@ "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": { "selected": false, "text": "All", "value": "$__all" }, - "datasource": "$datasource", + "datasource": { + "type": "prometheus", + "uid": "$datasource" + }, "definition": "label_values(speed)", - "error": null, "hide": 0, "includeAll": true, "label": "Uplink speed", @@ -833,7 +916,6 @@ "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false @@ -872,5 +954,6 @@ "timezone": "utc", "title": "Ops: Switch Overview", "uid": "SuqnZ6Hiz", - "version": 146 + "version": 41, + "weekStart": "" } diff --git a/config/federation/grafana/grafana.ini b/config/federation/grafana/grafana.ini index 93158633..2a3769a0 100644 --- a/config/federation/grafana/grafana.ini +++ b/config/federation/grafana/grafana.ini @@ -1,8 +1,5 @@ # https://raw.githubusercontent.com/grafana/grafana/master/conf/sample.ini -[alerting] -enabled = false - [users] # disable user signup / registration allow_sign_up = false diff --git a/config/federation/grafana/provisioning/datasources/bigquery_mlab-oti.yml.template b/config/federation/grafana/provisioning/datasources/bigquery_mlab-oti.yml.template deleted file mode 100644 index 0cffb9ad..00000000 --- a/config/federation/grafana/provisioning/datasources/bigquery_mlab-oti.yml.template +++ /dev/null @@ -1,23 +0,0 @@ -# config file version -apiVersion: 1 - -datasources: - # org id. will default to orgId 1 if not specified -- orgId: 1 - version: 1 - # name of the datasource. Required - name: BigQuery (mlab-oti) - # datasource type. Required - type: doitintl-bigquery-datasource - # access mode. proxy or direct (Server or Browser in the UI). Required - access: proxy - # mark as default datasource. Max one per org - isDefault: {{IS_DEFAULT}} - # allow users to edit datasources from the UI. - editable: false - # additional JSON configuration for this datasource. - jsonData: - authenticationType: gce - flatRateProject: mlab-oti - processingLocation: US - queryPriority: INTERACTIVE diff --git a/config/federation/grafana/provisioning/datasources/bigquery_mlab-sandbox.yml.template b/config/federation/grafana/provisioning/datasources/bigquery_mlab-sandbox.yml.template deleted file mode 100644 index 74334dfe..00000000 --- a/config/federation/grafana/provisioning/datasources/bigquery_mlab-sandbox.yml.template +++ /dev/null @@ -1,23 +0,0 @@ -# config file version -apiVersion: 1 - -datasources: - # org id. will default to orgId 1 if not specified -- orgId: 1 - version: 1 - # name of the datasource. Required - name: BigQuery (mlab-sandbox) - # datasource type. Required - type: doitintl-bigquery-datasource - # access mode. proxy or direct (Server or Browser in the UI). Required - access: proxy - # mark as default datasource. Max one per org - isDefault: {{IS_DEFAULT}} - # allow users to edit datasources from the UI. - editable: false - # additional JSON configuration for this datasource. - jsonData: - authenticationType: gce - flatRateProject: mlab-sandbox - processingLocation: US - queryPriority: INTERACTIVE diff --git a/config/federation/grafana/provisioning/datasources/bigquery_mlab-staging.yml.template b/config/federation/grafana/provisioning/datasources/bigquery_mlab-staging.yml.template deleted file mode 100644 index 155f7226..00000000 --- a/config/federation/grafana/provisioning/datasources/bigquery_mlab-staging.yml.template +++ /dev/null @@ -1,23 +0,0 @@ -# config file version -apiVersion: 1 - -datasources: - # org id. will default to orgId 1 if not specified -- orgId: 1 - version: 1 - # name of the datasource. Required - name: BigQuery (mlab-staging) - # datasource type. Required - type: doitintl-bigquery-datasource - # access mode. proxy or direct (Server or Browser in the UI). Required - access: proxy - # mark as default datasource. Max one per org - isDefault: {{IS_DEFAULT}} - # allow users to edit datasources from the UI. - editable: false - # additional JSON configuration for this datasource. - jsonData: - authenticationType: gce - flatRateProject: mlab-staging - processingLocation: US - queryPriority: INTERACTIVE diff --git a/config/federation/grafana/provisioning/datasources/config.yml b/config/federation/grafana/provisioning/datasources/config.yml new file mode 100644 index 00000000..834bcbc9 --- /dev/null +++ b/config/federation/grafana/provisioning/datasources/config.yml @@ -0,0 +1,16 @@ +apiVersion: 1 + +# Mark provisioned data sources for deletion if they are no longer in a provisioning file. +# It takes no effect if data sources are already listed in the deleteDatasources section. +prune: true + +deleteDatasources: +- name: BigQuery (mlab-oti) + orgId: 1 +- name: BigQuery (mlab-staging) + orgId: 1 +- name: BigQuery (mlab-sandbox) + orgId: 1 +- name: Google BigQuery (mlab-ns) + orgId: 1 + diff --git a/config/federation/grafana/provisioning/datasources/deleted.yml b/config/federation/grafana/provisioning/datasources/deleted.yml deleted file mode 100644 index 49d5674e..00000000 --- a/config/federation/grafana/provisioning/datasources/deleted.yml +++ /dev/null @@ -1,31 +0,0 @@ -# config file version -apiVersion: 1 - -deleteDatasources: - - name: Scraper (mlab-oti) - orgId: 1 - - name: Scraper (mlab-staging) - orgId: 1 - - name: Scraper (mlab-sandbox) - orgId: 1 - - - name: Downloader (mlab-oti) - orgId: 1 - - name: Downloader (mlab-staging) - orgId: 1 - - name: Downloader (mlab-sandbox) - orgId: 1 - - - name: Data Proc (mlab-oti) - orgId: 1 - - name: Data Proc (mlab-staging) - orgId: 1 - - name: Data Proc (mlab-sandbox) - orgId: 1 - - - name: Data Processing (mlab-oti) - orgId: 1 - - name: Data Processing (mlab-staging) - orgId: 1 - - name: Data Processing (mlab-sandbox) - orgId: 1 diff --git a/k8s/prometheus-federation/deployments/grafana.yml b/k8s/prometheus-federation/deployments/grafana.yml index 1b51fdea..3d99f069 100644 --- a/k8s/prometheus-federation/deployments/grafana.yml +++ b/k8s/prometheus-federation/deployments/grafana.yml @@ -25,7 +25,7 @@ spec: containers: # Check https://hub.docker.com/r/grafana/grafana/tags/ for the current # stable version. - - image: grafana/grafana:10.2.2 + - image: grafana/grafana:11.1.3 name: grafana-server # NOTE: the official Grafana Docker images may set various environment # variables which will override configurations in grafana.ini (which is diff --git a/k8s/prometheus-federation/deployments/prometheus.yml b/k8s/prometheus-federation/deployments/prometheus.yml index c0fc447d..ed5d034c 100644 --- a/k8s/prometheus-federation/deployments/prometheus.yml +++ b/k8s/prometheus-federation/deployments/prometheus.yml @@ -42,7 +42,7 @@ spec: containers: # Check https://hub.docker.com/r/prom/prometheus/tags/ for the current # stable version. - - image: prom/prometheus:v2.51.2 + - image: prom/prometheus:v2.53.1 # Note: the container name appears to be ignored and the actual pod name # is derived from the Deployment.metadata.name. However, removing this # value results in a configuration error.