znetsixe
a76f22281e
When generateDashboardsForGraph builds a root dashboard for a parent (e.g. pumpingStation) and a set of child dashboards (e.g. measurements), it now removes any non-row panel from the root whose meta.emittedFields are fully covered by panels declared in any child dashboard. Result: the parent shows only metrics its children don't already plot, eliminating redundant rendering of the same series in two dashboards. - config/pumpingStation.json: 11 non-row panels annotated with meta.emittedFields (Direction, Time Left, Flow Source, Fill %, Level (x2), Volume, Net Flow Rate, Inflow+Outflow, Heights, Volume Limits). - src/specificClass.js: generateDashboardsForGraph runs the parent-panel filter after composing children; row panels always kept; panels without emittedFields declaration always kept (no silent removal). - test/basic/slice39-no-duplication.basic.test.js: 4 cases — annotation presence, child-covered removal, no-overlap preservation, row preservation. Closes #39
701 lines
15 KiB
JSON
701 lines
15 KiB
JSON
{
|
|
"annotations": {
|
|
"list": [
|
|
{
|
|
"builtIn": 1,
|
|
"datasource": {
|
|
"type": "grafana",
|
|
"uid": "-- Grafana --"
|
|
},
|
|
"enable": true,
|
|
"hide": true,
|
|
"iconColor": "rgba(0, 211, 255, 1)",
|
|
"name": "Annotations & Alerts",
|
|
"type": "dashboard"
|
|
}
|
|
]
|
|
},
|
|
"editable": true,
|
|
"graphTooltip": 0,
|
|
"id": null,
|
|
"links": [],
|
|
"panels": [
|
|
{
|
|
"gridPos": {
|
|
"h": 1,
|
|
"w": 24,
|
|
"x": 0,
|
|
"y": 0
|
|
},
|
|
"id": 1,
|
|
"title": "Status",
|
|
"type": "row"
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"thresholds": {
|
|
"mode": "absolute",
|
|
"steps": [
|
|
{
|
|
"color": "blue",
|
|
"value": null
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 4,
|
|
"w": 5,
|
|
"x": 0,
|
|
"y": 1
|
|
},
|
|
"id": 2,
|
|
"options": {
|
|
"reduceOptions": {
|
|
"calcs": [
|
|
"lastNotNull"
|
|
]
|
|
},
|
|
"colorMode": "value",
|
|
"graphMode": "none"
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: -7d)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and r._field==\"direction\")\n |> last()",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Direction",
|
|
"type": "stat",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"direction"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "s",
|
|
"thresholds": {
|
|
"mode": "absolute",
|
|
"steps": [
|
|
{
|
|
"color": "green",
|
|
"value": null
|
|
},
|
|
{
|
|
"color": "orange",
|
|
"value": 300
|
|
},
|
|
{
|
|
"color": "red",
|
|
"value": 600
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 4,
|
|
"w": 5,
|
|
"x": 5,
|
|
"y": 1
|
|
},
|
|
"id": 3,
|
|
"options": {
|
|
"reduceOptions": {
|
|
"calcs": [
|
|
"lastNotNull"
|
|
]
|
|
},
|
|
"colorMode": "value",
|
|
"graphMode": "area"
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: -7d)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and r._field==\"timeleft\")\n |> last()",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Time Left",
|
|
"type": "stat",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"timeLeft"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"thresholds": {
|
|
"mode": "absolute",
|
|
"steps": [
|
|
{
|
|
"color": "purple",
|
|
"value": null
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 4,
|
|
"w": 4,
|
|
"x": 10,
|
|
"y": 1
|
|
},
|
|
"id": 4,
|
|
"options": {
|
|
"reduceOptions": {
|
|
"calcs": [
|
|
"lastNotNull"
|
|
]
|
|
},
|
|
"colorMode": "value",
|
|
"graphMode": "none"
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: -7d)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and r._field==\"flowSource\")\n |> last()",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Flow Source",
|
|
"type": "stat",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"flowSource"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"min": 0,
|
|
"max": 100,
|
|
"unit": "percent",
|
|
"thresholds": {
|
|
"mode": "absolute",
|
|
"steps": [
|
|
{
|
|
"color": "red",
|
|
"value": null
|
|
},
|
|
{
|
|
"color": "orange",
|
|
"value": 20
|
|
},
|
|
{
|
|
"color": "green",
|
|
"value": 40
|
|
},
|
|
{
|
|
"color": "orange",
|
|
"value": 80
|
|
},
|
|
{
|
|
"color": "red",
|
|
"value": 95
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 4,
|
|
"w": 5,
|
|
"x": 14,
|
|
"y": 1
|
|
},
|
|
"id": 5,
|
|
"options": {
|
|
"reduceOptions": {
|
|
"calcs": [
|
|
"lastNotNull"
|
|
]
|
|
},
|
|
"showThresholdLabels": false,
|
|
"showThresholdMarkers": true
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: -7d)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and r._field =~ /^volumePercent\\.predicted\\.atequipment/)\n |> last()",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Fill %",
|
|
"type": "gauge",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"volumePercent"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "m",
|
|
"thresholds": {
|
|
"mode": "absolute",
|
|
"steps": [
|
|
{
|
|
"color": "green",
|
|
"value": null
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 4,
|
|
"w": 5,
|
|
"x": 19,
|
|
"y": 1
|
|
},
|
|
"id": 6,
|
|
"options": {
|
|
"reduceOptions": {
|
|
"calcs": [
|
|
"lastNotNull"
|
|
]
|
|
},
|
|
"colorMode": "value",
|
|
"graphMode": "area"
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: -7d)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and r._field =~ /^level\\.predicted\\.atequipment/)\n |> last()",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Level",
|
|
"type": "stat",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"level"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"gridPos": {
|
|
"h": 1,
|
|
"w": 24,
|
|
"x": 0,
|
|
"y": 5
|
|
},
|
|
"id": 7,
|
|
"title": "Basin",
|
|
"type": "row"
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "m",
|
|
"custom": {
|
|
"drawStyle": "line",
|
|
"lineWidth": 2,
|
|
"fillOpacity": 10
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 8,
|
|
"w": 12,
|
|
"x": 0,
|
|
"y": 6
|
|
},
|
|
"id": 8,
|
|
"options": {
|
|
"legend": {
|
|
"displayMode": "list",
|
|
"placement": "bottom"
|
|
},
|
|
"tooltip": {
|
|
"mode": "multi"
|
|
}
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and r._field =~ /^level\\.(predicted|measured)\\.atequipment/)\n |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Level",
|
|
"type": "timeseries",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"level"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "m\u00b3",
|
|
"custom": {
|
|
"drawStyle": "line",
|
|
"lineWidth": 2,
|
|
"fillOpacity": 10
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 8,
|
|
"w": 12,
|
|
"x": 12,
|
|
"y": 6
|
|
},
|
|
"id": 9,
|
|
"options": {
|
|
"legend": {
|
|
"displayMode": "list",
|
|
"placement": "bottom"
|
|
},
|
|
"tooltip": {
|
|
"mode": "multi"
|
|
}
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and r._field =~ /^volume\\.predicted\\.atequipment/)\n |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Volume",
|
|
"type": "timeseries",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"volume"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"gridPos": {
|
|
"h": 1,
|
|
"w": 24,
|
|
"x": 0,
|
|
"y": 14
|
|
},
|
|
"id": 10,
|
|
"title": "Flow",
|
|
"type": "row"
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "m\u00b3/h",
|
|
"custom": {
|
|
"drawStyle": "line",
|
|
"lineWidth": 2,
|
|
"fillOpacity": 10
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 8,
|
|
"w": 12,
|
|
"x": 0,
|
|
"y": 15
|
|
},
|
|
"id": 11,
|
|
"options": {
|
|
"legend": {
|
|
"displayMode": "list",
|
|
"placement": "bottom"
|
|
},
|
|
"tooltip": {
|
|
"mode": "multi"
|
|
}
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and r._field =~ /^netFlowRate\\.predicted\\.atequipment/)\n |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Net Flow Rate",
|
|
"type": "timeseries",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"flow.net",
|
|
"flow"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "m\u00b3/h",
|
|
"custom": {
|
|
"drawStyle": "line",
|
|
"lineWidth": 2,
|
|
"fillOpacity": 10
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 8,
|
|
"w": 12,
|
|
"x": 12,
|
|
"y": 15
|
|
},
|
|
"id": 12,
|
|
"options": {
|
|
"legend": {
|
|
"displayMode": "list",
|
|
"placement": "bottom"
|
|
},
|
|
"tooltip": {
|
|
"mode": "multi"
|
|
}
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and r._field =~ /^flow\\.(predicted|measured)\\.atequipment/)\n |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Inflow + Outflow",
|
|
"type": "timeseries",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"flow.in",
|
|
"flow.out"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"gridPos": {
|
|
"h": 1,
|
|
"w": 24,
|
|
"x": 0,
|
|
"y": 23
|
|
},
|
|
"id": 13,
|
|
"title": "Configuration",
|
|
"type": "row"
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "m",
|
|
"thresholds": {
|
|
"mode": "absolute",
|
|
"steps": [
|
|
{
|
|
"color": "blue",
|
|
"value": null
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 4,
|
|
"w": 12,
|
|
"x": 0,
|
|
"y": 24
|
|
},
|
|
"id": 14,
|
|
"options": {
|
|
"reduceOptions": {
|
|
"calcs": [
|
|
"lastNotNull"
|
|
]
|
|
},
|
|
"colorMode": "value",
|
|
"graphMode": "none"
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: -7d)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and (r._field==\"heightInlet\" or r._field==\"heightOverflow\" or r._field==\"volEmptyBasin\"))\n |> last()",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Heights",
|
|
"type": "stat",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"heights.min",
|
|
"heights.max"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"datasource": {
|
|
"type": "influxdb",
|
|
"uid": "cdzg44tv250jkd"
|
|
},
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "m\u00b3",
|
|
"thresholds": {
|
|
"mode": "absolute",
|
|
"steps": [
|
|
{
|
|
"color": "blue",
|
|
"value": null
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"overrides": []
|
|
},
|
|
"gridPos": {
|
|
"h": 4,
|
|
"w": 12,
|
|
"x": 12,
|
|
"y": 24
|
|
},
|
|
"id": 15,
|
|
"options": {
|
|
"reduceOptions": {
|
|
"calcs": [
|
|
"lastNotNull"
|
|
]
|
|
},
|
|
"colorMode": "value",
|
|
"graphMode": "none"
|
|
},
|
|
"targets": [
|
|
{
|
|
"query": "from(bucket: \"${bucket}\")\n |> range(start: -7d)\n |> filter(fn:(r) => r._measurement==\"${measurement}\" and (r._field==\"maxVol\" or r._field==\"minVol\" or r._field==\"maxVolOverflow\" or r._field==\"minVolOut\" or r._field==\"minVolIn\"))\n |> last()",
|
|
"refId": "A"
|
|
}
|
|
],
|
|
"title": "Volume Limits",
|
|
"type": "stat",
|
|
"meta": {
|
|
"emittedFields": [
|
|
"volume.min",
|
|
"volume.max"
|
|
]
|
|
}
|
|
}
|
|
],
|
|
"schemaVersion": 39,
|
|
"tags": [
|
|
"EVOLV",
|
|
"pumpingStation",
|
|
"template"
|
|
],
|
|
"templating": {
|
|
"list": [
|
|
{
|
|
"name": "dbase",
|
|
"type": "custom",
|
|
"label": "dbase",
|
|
"query": "cdzg44tv250jkd",
|
|
"current": {
|
|
"text": "cdzg44tv250jkd",
|
|
"value": "cdzg44tv250jkd",
|
|
"selected": false
|
|
},
|
|
"options": [
|
|
{
|
|
"text": "cdzg44tv250jkd",
|
|
"value": "cdzg44tv250jkd",
|
|
"selected": true
|
|
}
|
|
],
|
|
"hide": 2
|
|
},
|
|
{
|
|
"name": "measurement",
|
|
"type": "custom",
|
|
"query": "template",
|
|
"current": {
|
|
"text": "template",
|
|
"value": "template",
|
|
"selected": false
|
|
},
|
|
"options": [
|
|
{
|
|
"text": "template",
|
|
"value": "template",
|
|
"selected": true
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "bucket",
|
|
"type": "custom",
|
|
"query": "lvl2",
|
|
"current": {
|
|
"text": "lvl2",
|
|
"value": "lvl2",
|
|
"selected": false
|
|
},
|
|
"options": [
|
|
{
|
|
"text": "lvl2",
|
|
"value": "lvl2",
|
|
"selected": true
|
|
}
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"time": {
|
|
"from": "now-6h",
|
|
"to": "now"
|
|
},
|
|
"timezone": "",
|
|
"title": "template",
|
|
"uid": null,
|
|
"version": 1
|
|
} |