diff --git a/services/grafana/provisioning/dashboards/bigip/device/device-irules.json b/services/grafana/provisioning/dashboards/bigip/device/device-irules.json index c0107ca..05d86ba 100644 --- a/services/grafana/provisioning/dashboards/bigip/device/device-irules.json +++ b/services/grafana/provisioning/dashboards/bigip/device/device-irules.json @@ -917,6 +917,20 @@ "tags": [], "templating": { "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": {}, "datasource": { @@ -973,6 +987,6 @@ "timezone": "browser", "title": "Device iRules", "uid": "cdrjs6lfzq2v4e", - "version": 1, + "version": 3, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/device/device-overview.json b/services/grafana/provisioning/dashboards/bigip/device/device-overview.json index 141bf03..5d427f1 100644 --- a/services/grafana/provisioning/dashboards/bigip/device/device-overview.json +++ b/services/grafana/provisioning/dashboards/bigip/device/device-overview.json @@ -1927,6 +1927,20 @@ "tags": [], "templating": { "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": {}, "datasource": { @@ -1962,6 +1976,6 @@ "timezone": "browser", "title": "Device Overview", "uid": "adpz4tutl28e8f", - "version": 1, + "version": 4, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/device/device-pools-overview.json b/services/grafana/provisioning/dashboards/bigip/device/device-pools-overview.json index 493aceb..f21db61 100644 --- a/services/grafana/provisioning/dashboards/bigip/device/device-pools-overview.json +++ b/services/grafana/provisioning/dashboards/bigip/device/device-pools-overview.json @@ -1191,8 +1191,7 @@ "mode": "absolute", "steps": [ { - "color": "red", - "value": null + "color": "red" }, { "color": "green", @@ -1268,8 +1267,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1859,6 +1857,20 @@ "tags": [], "templating": { "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": {}, "datasource": { @@ -1915,6 +1927,6 @@ "timezone": "browser", "title": "Device Pools", "uid": "cdu11thaxntvkf", - "version": 1, + "version": 4, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/device/device-waf-overview.json b/services/grafana/provisioning/dashboards/bigip/device/device-waf-overview.json index 5a6bf4c..3632988 100644 --- a/services/grafana/provisioning/dashboards/bigip/device/device-waf-overview.json +++ b/services/grafana/provisioning/dashboards/bigip/device/device-waf-overview.json @@ -1491,6 +1491,20 @@ "tags": [], "templating": { "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": {}, "datasource": { @@ -1551,6 +1565,6 @@ "timezone": "browser", "title": "Device WAF Overview", "uid": "ddsqr9yhrgidcc", - "version": 1, + "version": 4, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/device/top-n.json b/services/grafana/provisioning/dashboards/bigip/device/top-n.json index 21106d7..fe54e73 100644 --- a/services/grafana/provisioning/dashboards/bigip/device/top-n.json +++ b/services/grafana/provisioning/dashboards/bigip/device/top-n.json @@ -763,8 +763,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -863,8 +862,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2073,6 +2071,20 @@ "tags": [], "templating": { "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": {}, "datasource": { @@ -2128,6 +2140,6 @@ "timezone": "browser", "title": "Top N", "uid": "edrjqc81ub85cc", - "version": 1, + "version": 7, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/device/virtual-server-overview.json b/services/grafana/provisioning/dashboards/bigip/device/virtual-server-overview.json index b84a3a7..e2de4e7 100644 --- a/services/grafana/provisioning/dashboards/bigip/device/virtual-server-overview.json +++ b/services/grafana/provisioning/dashboards/bigip/device/virtual-server-overview.json @@ -2363,6 +2363,20 @@ "tags": [], "templating": { "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": {}, "datasource": { @@ -2419,6 +2433,6 @@ "timezone": "browser", "title": "Device Virtual Servers", "uid": "ddq2jbj2v588wa", - "version": 1, + "version": 21, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/fleet/fleet-device-utilization.json b/services/grafana/provisioning/dashboards/bigip/fleet/fleet-device-utilization.json index 4c91909..baf2ae4 100644 --- a/services/grafana/provisioning/dashboards/bigip/fleet/fleet-device-utilization.json +++ b/services/grafana/provisioning/dashboards/bigip/fleet/fleet-device-utilization.json @@ -930,6 +930,20 @@ "tags": [], "templating": { "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": ".*", "current": {}, @@ -965,6 +979,6 @@ "timezone": "browser", "title": "Device Utilization", "uid": "aduca5eah75dsa", - "version": 1, + "version": 4, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/fleet/fleet-inventory.json b/services/grafana/provisioning/dashboards/bigip/fleet/fleet-inventory.json index e8da685..1b827f2 100644 --- a/services/grafana/provisioning/dashboards/bigip/fleet/fleet-inventory.json +++ b/services/grafana/provisioning/dashboards/bigip/fleet/fleet-inventory.json @@ -489,7 +489,22 @@ "schemaVersion": 39, "tags": [], "templating": { - "list": [] + "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + } + ] }, "time": { "from": "now-5m", @@ -499,6 +514,6 @@ "timezone": "browser", "title": "Fleet Inventory", "uid": "bdpz4za42wnb4a", - "version": 1, + "version": 4, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/fleet/fleet-virtual-server.json b/services/grafana/provisioning/dashboards/bigip/fleet/fleet-virtual-server.json index 35e2fdb..0343720 100644 --- a/services/grafana/provisioning/dashboards/bigip/fleet/fleet-virtual-server.json +++ b/services/grafana/provisioning/dashboards/bigip/fleet/fleet-virtual-server.json @@ -947,6 +947,20 @@ "tags": [], "templating": { "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "allValue": ".*", "current": {}, @@ -1007,6 +1021,6 @@ "timezone": "browser", "title": "Virtual Servers", "uid": "bdubjp6117lz4f", - "version": 1, + "version": 6, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/fleet/ssl-certificates.json b/services/grafana/provisioning/dashboards/bigip/fleet/ssl-certificates.json index bcaba4e..cb52376 100644 --- a/services/grafana/provisioning/dashboards/bigip/fleet/ssl-certificates.json +++ b/services/grafana/provisioning/dashboards/bigip/fleet/ssl-certificates.json @@ -528,7 +528,22 @@ "schemaVersion": 39, "tags": [], "templating": { - "list": [] + "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + } + ] }, "time": { "from": "now-6h", @@ -538,6 +553,6 @@ "timezone": "browser", "title": "SSL Certificate Status", "uid": "fdq2gvt19pkaoc", - "version": 1, + "version": 4, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/bigip/profile/ltm-http.json b/services/grafana/provisioning/dashboards/bigip/profile/ltm-http.json index aa6920a..4d167fb 100644 --- a/services/grafana/provisioning/dashboards/bigip/profile/ltm-http.json +++ b/services/grafana/provisioning/dashboards/bigip/profile/ltm-http.json @@ -737,8 +737,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -839,8 +838,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -897,6 +895,20 @@ "tags": [], "templating": { "list": [ + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, { "current": {}, "datasource": { @@ -954,6 +966,6 @@ "timezone": "browser", "title": "LTM - HTTP Profile", "uid": "cdu8euqz7w0zkc", - "version": 1, + "version": 6, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/otel-collector/collector-health.json b/services/grafana/provisioning/dashboards/otel-collector/collector-health.json index 705a85e..1be0865 100644 --- a/services/grafana/provisioning/dashboards/otel-collector/collector-health.json +++ b/services/grafana/provisioning/dashboards/otel-collector/collector-health.json @@ -1,4 +1,53 @@ { + "__inputs": [ + { + "name": "DS_PROMETHEUS", + "label": "Prometheus", + "description": "", + "type": "datasource", + "pluginId": "prometheus", + "pluginName": "Prometheus" + } + ], + "__elements": {}, + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "11.2.0" + }, + { + "type": "panel", + "id": "heatmap", + "name": "Heatmap", + "version": "" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "table", + "name": "Table", + "version": "" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" + } + ], "annotations": { "list": [ { @@ -26,7 +75,7 @@ "fiscalYearStartMonth": 0, "gnetId": 15983, "graphTooltip": 1, - "id": 1, + "id": null, "links": [], "liveNow": false, "panels": [ @@ -74,6 +123,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -169,7 +219,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -204,7 +254,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Sent: count/rate of metric points successfully sent to destination.\nEnqueue: count/rate of metric points failed to be added to the sending queue.\nFailed: count/rate of metric points in failed attempts to send to destination.", "fieldConfig": { @@ -219,6 +269,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -329,7 +380,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -391,7 +442,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Number of units in the batch", "fieldConfig": { @@ -454,7 +505,7 @@ "reverse": false } }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { @@ -479,7 +530,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "", "fieldConfig": { @@ -494,6 +545,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -616,7 +668,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -651,6 +703,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -757,7 +810,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -819,7 +872,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Current size of the retry queue (in batches)", "fieldConfig": { @@ -834,6 +887,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -926,7 +980,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Fixed capacity of the retry queue (in batches)", "fieldConfig": { @@ -941,6 +995,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1033,7 +1088,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "", "fieldConfig": { @@ -1048,6 +1103,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1167,7 +1223,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Total physical memory (resident set size)", "fieldConfig": { @@ -1214,8 +1270,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1343,7 +1398,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -1378,7 +1433,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys')", "fieldConfig": { @@ -1425,8 +1480,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1554,7 +1608,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -1589,7 +1643,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc')", "fieldConfig": { @@ -1636,8 +1690,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1765,7 +1818,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -1800,7 +1853,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Total CPU user and system time in percentage", "fieldConfig": { @@ -1847,8 +1900,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1972,7 +2024,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -2008,7 +2060,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Number of service instances, which are reporting metrics", "fieldConfig": { @@ -2055,8 +2107,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2118,7 +2169,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "", "fieldConfig": { @@ -2165,8 +2216,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2228,7 +2278,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "", "fieldConfig": { @@ -2250,8 +2300,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2332,7 +2381,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Measures the number of messages received per RPC. Should be 1 for all non-streaming RPCs. GRPC status codes: https://grpc.github.io/grpc/core/md_doc_statuscodes.html", "fieldConfig": { @@ -2377,8 +2426,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2643,7 +2691,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Measures the number of messages received per RPC. Should be 1 for all non-streaming RPCs. GRPC status codes: https://grpc.github.io/grpc/core/md_doc_statuscodes.html", "fieldConfig": { @@ -2688,8 +2736,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2954,7 +3001,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "", "fieldConfig": { @@ -3042,7 +3089,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "", "fieldConfig": { @@ -3130,7 +3177,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "", "fieldConfig": { @@ -3218,7 +3265,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "", "fieldConfig": { @@ -3320,7 +3367,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "description": "Added: Number of namespace add events received.\nUpdated: Number of namespace update events received.", "fieldConfig": { @@ -3367,8 +3414,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3446,7 +3492,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -3513,8 +3559,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3556,7 +3601,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -3588,7 +3633,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", "exemplar": true, @@ -3650,7 +3695,7 @@ { "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "refId": "A" } @@ -3668,11 +3713,7 @@ "templating": { "list": [ { - "current": { - "selected": false, - "text": "Prometheus", - "value": "PBFA97CFB590B2093" - }, + "current": {}, "hide": 0, "includeAll": false, "label": "Datasource", @@ -3687,11 +3728,7 @@ "type": "datasource" }, { - "current": { - "selected": false, - "text": "opentelemetry-collector", - "value": "opentelemetry-collector" - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "$datasource" @@ -3789,14 +3826,10 @@ }, { "allValue": ".*", - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, + "current": {}, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "definition": "query_result(avg by (receiver) ({__name__=~\"otelcol_receiver_.+\",job=\"$job\"}))", "hide": 0, @@ -3821,11 +3854,7 @@ }, { "allValue": ".*", - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "$datasource" @@ -3853,14 +3882,10 @@ }, { "allValue": ".*", - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, + "current": {}, "datasource": { "type": "prometheus", - "uid": "$datasource" + "uid": "${DS_PROMETHEUS}" }, "definition": "query_result(avg by (exporter) ({__name__=~\"otelcol_exporter_.+\",job=\"$job\"}))", "hide": 0, @@ -3918,11 +3943,7 @@ "type": "custom" }, { - "current": { - "selected": false, - "text": "_total", - "value": "_total" - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "$datasource" @@ -3964,7 +3985,6 @@ "from": "now-6h", "to": "now" }, - "timeRangeUpdatedDuringEditOrView": false, "timepicker": { "refresh_intervals": [ "5s", @@ -3993,6 +4013,6 @@ "timezone": "", "title": "OpenTelemetry Collector", "uid": "BKf2sowmj", - "version": 2, + "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/services/grafana/provisioning/dashboards/otel-collector/receiver-stats.json b/services/grafana/provisioning/dashboards/otel-collector/receiver-stats.json index 4a85169..28342d2 100644 --- a/services/grafana/provisioning/dashboards/otel-collector/receiver-stats.json +++ b/services/grafana/provisioning/dashboards/otel-collector/receiver-stats.json @@ -1,4 +1,41 @@ { + "__inputs": [ + { + "name": "DS_PROMETHEUS", + "label": "Prometheus", + "description": "", + "type": "datasource", + "pluginId": "prometheus", + "pluginName": "Prometheus" + } + ], + "__elements": {}, + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "11.2.0" + }, + { + "type": "panel", + "id": "piechart", + "name": "Pie chart", + "version": "" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" + } + ], "annotations": { "list": [ { @@ -18,13 +55,13 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 19, + "id": null, "links": [], "panels": [ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -107,7 +144,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "disableTextWrap": false, "editorMode": "builder", @@ -127,7 +164,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -208,7 +245,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "disableTextWrap": false, "editorMode": "builder", @@ -228,7 +265,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -309,7 +346,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "disableTextWrap": false, "editorMode": "builder", @@ -329,7 +366,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -411,7 +448,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "disableTextWrap": false, "editorMode": "builder", @@ -433,7 +470,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -483,7 +520,7 @@ { "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "disableTextWrap": false, "editorMode": "builder", @@ -508,18 +545,10 @@ "list": [ { "allValue": ".*", - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] - }, + "current": {}, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(endpoint_scrape_requests_total,endpoint)", "hide": 0, @@ -541,18 +570,10 @@ }, { "allValue": ".*", - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] - }, + "current": {}, "datasource": { "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(scrape_duration_seconds{job=~\"bigip.*\"},job)", "hide": 0, @@ -571,6 +592,20 @@ "skipUrlSync": false, "sort": 0, "type": "query" + }, + { + "current": {}, + "hide": 0, + "includeAll": false, + "label": "Prometheus", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" } ] }, @@ -582,6 +617,6 @@ "timezone": "browser", "title": "BigIP Collector Stats", "uid": "fdvbp5jh3qarke", - "version": 13, + "version": 3, "weekStart": "" } \ No newline at end of file