diff --git a/cloud/__pycache__/dynamic.cpython-311.pyc b/cloud/__pycache__/dynamic.cpython-311.pyc index 0c13cf3..927cad6 100644 Binary files a/cloud/__pycache__/dynamic.cpython-311.pyc and b/cloud/__pycache__/dynamic.cpython-311.pyc differ diff --git a/cloud/__pycache__/nodePatch.cpython-311.pyc b/cloud/__pycache__/nodePatch.cpython-311.pyc index a02570b..1af4a5f 100644 Binary files a/cloud/__pycache__/nodePatch.cpython-311.pyc and b/cloud/__pycache__/nodePatch.cpython-311.pyc differ diff --git a/cloud/dashboard/templates/temp.json b/cloud/dashboard/templates/temp.json index e187556..2ed170b 100644 --- a/cloud/dashboard/templates/temp.json +++ b/cloud/dashboard/templates/temp.json @@ -9,7 +9,7 @@ }, "id": 201, "panels": [], - "title": "Host Flow Summary - T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org", + "title": "Host Flow Summary - T2_US_Caltech_Test:sandie-3.ultralight.org", "type": "row" }, { @@ -27,13 +27,13 @@ }, "id": 202, "options": { - "content": "```\nHost: T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org Interface:\nname: mlx5p1s1 | vlan: not used | ip: 10.251.88.178\nname: T2_US_Caltech_Test:dellos9_s0 | vlan: 3614 | peer: name: None, interface: None, vlan: 3614\n ```", + "content": "```\nHost: T2_US_Caltech_Test:sandie-3.ultralight.org Interface:\nname: mlx3p1s1 | vlan: not used | ip: 10.251.89.179\nname: T2_US_Caltech_Test:dellos9_s0 | vlan: 3874 | peer: name: None, interface: None, vlan: 3874\n ```", "mode": "markdown" }, "pluginVersion": "7.5.4", "timeFrom": null, "timeShift": null, - "title": "T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org - Node Interface Information", + "title": "T2_US_Caltech_Test:sandie-3.ultralight.org - Node Interface Information", "type": "text" }, { @@ -79,7 +79,7 @@ "seriesOverrides": [ { "$$hashKey": "object:176", - "alias": "recv mlx5p1s1", + "alias": "recv mlx3p1s1", "transform": "negative-Y" } ], @@ -89,7 +89,7 @@ "targets": [ { "exemplar": true, - "expr": "irate(node_network_receive_bytes_total{exported_instance=\"T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org\", device=\"mlx5p1s1\",flow=\"rtmon-a316e548-2589-4164-904e-5987275e9c33 \"}[1m])*8", + "expr": "irate(node_network_receive_bytes_total{exported_instance=\"T2_US_Caltech_Test:sandie-3.ultralight.org\", device=\"mlx3p1s1\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "instant": false, "interval": "", "intervalFactor": 1, @@ -98,7 +98,7 @@ }, { "exemplar": true, - "expr": "irate(node_network_transmit_bytes_total{exported_instance=\"T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org\",device=\"mlx5p1s1\",flow=\"rtmon-a316e548-2589-4164-904e-5987275e9c33 \"}[1m])*8", + "expr": "irate(node_network_transmit_bytes_total{exported_instance=\"T2_US_Caltech_Test:sandie-3.ultralight.org\",device=\"mlx3p1s1\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "hide": false, "instant": false, "interval": "", @@ -111,7 +111,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org - interface: mlx5p1s1 Flow Bandwidth", + "title": "T2_US_Caltech_Test:sandie-3.ultralight.org - interface: mlx3p1s1 Flow Bandwidth", "tooltip": { "shared": true, "sort": 0, @@ -161,7 +161,7 @@ }, "id": 205, "panels": [], - "title": "Host Flow Summary - T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org", + "title": "Host Flow Summary - T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net", "type": "row" }, { @@ -179,13 +179,13 @@ }, "id": 206, "options": { - "content": "```\nHost: T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org Interface:\nname: mlx4p1s1 | vlan: not used | ip: 10.251.88.177\nname: T2_US_Caltech_Test:dellos9_s0 | vlan: 3614 | peer: name: None, interface: None, vlan: 3614\n ```", + "content": "```\nHost: T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net Interface:\nname: enp65s0np0 | vlan: not used | ip: 10.251.89.180\nname: T2_US_SDSC:sn3700_s0 | vlan: 3874 | peer: name: None, interface: None, vlan: 3874\n ```", "mode": "markdown" }, "pluginVersion": "7.5.4", "timeFrom": null, "timeShift": null, - "title": "T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org - Node Interface Information", + "title": "T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net - Node Interface Information", "type": "text" }, { @@ -231,7 +231,7 @@ "seriesOverrides": [ { "$$hashKey": "object:176", - "alias": "recv mlx4p1s1", + "alias": "recv enp65s0np0", "transform": "negative-Y" } ], @@ -241,7 +241,7 @@ "targets": [ { "exemplar": true, - "expr": "irate(node_network_receive_bytes_total{exported_instance=\"T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org\", device=\"mlx4p1s1\",flow=\"rtmon-a316e548-2589-4164-904e-5987275e9c33 \"}[1m])*8", + "expr": "irate(node_network_receive_bytes_total{exported_instance=\"T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net\", device=\"enp65s0np0\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "instant": false, "interval": "", "intervalFactor": 1, @@ -250,7 +250,7 @@ }, { "exemplar": true, - "expr": "irate(node_network_transmit_bytes_total{exported_instance=\"T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org\",device=\"mlx4p1s1\",flow=\"rtmon-a316e548-2589-4164-904e-5987275e9c33 \"}[1m])*8", + "expr": "irate(node_network_transmit_bytes_total{exported_instance=\"T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net\",device=\"enp65s0np0\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "hide": false, "instant": false, "interval": "", @@ -263,7 +263,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org - interface: mlx4p1s1 Flow Bandwidth", + "title": "T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net - interface: enp65s0np0 Flow Bandwidth", "tooltip": { "shared": true, "sort": 0, @@ -331,7 +331,7 @@ }, "id": 210, "options": { - "content": "```\nSwitch: T2_US_Caltech_Test:dellos9_s0 Interface:\nname: hundredGigE_1-27 | vlan: 3614 | peer: name: T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org, interface: mlx5p1s1, vlan: 3614\nname: hundredGigE_1-23 | vlan: 3614 | peer: name: T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org, interface: mlx5p1s1, vlan: 3614\n ```", + "content": "```\nSwitch: T2_US_Caltech_Test:dellos9_s0 Interface:\nname: Port-channel_103 | vlan: 3874 | peer: name: aristaeos_s0, interface: Port-Channel501, vlan: not_used\nname: fortyGigE_1-30-1 | vlan: 3874 | peer: name: T2_US_Caltech_Test:sandie-3.ultralight.org, interface: mlx3p1s1, vlan: 3874\n ```", "mode": "markdown" }, "pluginVersion": "7.5.4", @@ -383,7 +383,7 @@ "seriesOverrides": [ { "$$hashKey": "object:176", - "alias": "recv hundredGigE_1-27", + "alias": "recv Port-channel_103", "transform": "negative-Y" } ], @@ -393,7 +393,7 @@ "targets": [ { "exemplar": true, - "expr": "irate(interface_statistics{Key=\"ifHCInOctets\",hostname=\"T2_US_Caltech_Test:dellos9_s0\",ifDescr=\"hundredGigE_1-27\",flow=\"rtmon-a316e548-2589-4164-904e-5987275e9c33 \"}[1m])*8", "instant": false, + "expr": "irate(interface_statistics{Key=\"ifHCInOctets\",hostname=\"T2_US_Caltech_Test:dellos9_s0\",ifDescr=\"Port-channel_103\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "instant": false, "interval": "", "intervalFactor": 1, "legendFormat": "recv {{ifDescr}}", @@ -401,7 +401,7 @@ }, { "exemplar": true, - "expr": "irate(interface_statistics{Key=\"ifHCOutOctets\",hostname=\"T2_US_Caltech_Test:dellos9_s0\",ifDescr=\"hundredGigE_1-27\",flow=\"rtmon-a316e548-2589-4164-904e-5987275e9c33 \"}[1m])*8", + "expr": "irate(interface_statistics{Key=\"ifHCOutOctets\",hostname=\"T2_US_Caltech_Test:dellos9_s0\",ifDescr=\"Port-channel_103\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "hide": false, "instant": false, "interval": "", @@ -414,7 +414,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "T2_US_Caltech_Test:dellos9_s0 - interface: hundredGigE_1-27 Flow Bandwidth", + "title": "T2_US_Caltech_Test:dellos9_s0 - interface: Port-channel_103 Flow Bandwidth", "tooltip": { "shared": true, "sort": 0, @@ -496,7 +496,7 @@ "seriesOverrides": [ { "$$hashKey": "object:176", - "alias": "recv hundredGigE_1-23", + "alias": "recv fortyGigE_1-30-1", "transform": "negative-Y" } ], @@ -506,7 +506,7 @@ "targets": [ { "exemplar": true, - "expr": "irate(interface_statistics{Key=\"ifHCInOctets\",hostname=\"T2_US_Caltech_Test:dellos9_s0\",ifDescr=\"hundredGigE_1-23\",flow=\"rtmon-a316e548-2589-4164-904e-5987275e9c33 \"}[1m])*8", "instant": false, + "expr": "irate(interface_statistics{Key=\"ifHCInOctets\",hostname=\"T2_US_Caltech_Test:dellos9_s0\",ifDescr=\"fortyGigE_1-30-1\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "instant": false, "interval": "", "intervalFactor": 1, "legendFormat": "recv {{ifDescr}}", @@ -514,7 +514,7 @@ }, { "exemplar": true, - "expr": "irate(interface_statistics{Key=\"ifHCOutOctets\",hostname=\"T2_US_Caltech_Test:dellos9_s0\",ifDescr=\"hundredGigE_1-23\",flow=\"rtmon-a316e548-2589-4164-904e-5987275e9c33 \"}[1m])*8", + "expr": "irate(interface_statistics{Key=\"ifHCOutOctets\",hostname=\"T2_US_Caltech_Test:dellos9_s0\",ifDescr=\"fortyGigE_1-30-1\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "hide": false, "instant": false, "interval": "", @@ -527,7 +527,535 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "T2_US_Caltech_Test:dellos9_s0 - interface: hundredGigE_1-23 Flow Bandwidth", + "title": "T2_US_Caltech_Test:dellos9_s0 - interface: fortyGigE_1-30-1 Flow Bandwidth", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:118", + "format": "Bps", + "label": "bw out(-) / in(+)", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:119", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, +{ + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 215 + }, + "id": 215, + "panels": [], + "title": "Switch Flow Summary - T2_US_SDSC:sn3700_s0", + "type": "row" + }, +{ + "datasource": null, + "description": "", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 24, + "x": 0, + "y": 216 + }, + "id": 216, + "options": { + "content": "```\nSwitch: T2_US_SDSC:sn3700_s0 Interface:\nname: PortChannel501 | vlan: 3874 | peer: name: aristaeos_s0, interface: Port-Channel502, vlan: not_used\nname: Ethernet104 | vlan: 3874 | peer: name: T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net, interface: enp65s0np0, vlan: 3874\n ```", + "mode": "markdown" + }, + "pluginVersion": "7.5.4", + "timeFrom": null, + "timeShift": null, + "title": "T2_US_SDSC:sn3700_s0 - Node Interface Information", + "type": "text" + }, +{ + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 217 + }, + "hiddenSeries": false, + "id": 217, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.5.4", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:176", + "alias": "recv PortChannel501", + "transform": "negative-Y" + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ +{ + "exemplar": true, + "expr": "irate(interface_statistics{Key=\"ifHCInOctets\",hostname=\"T2_US_SDSC:sn3700_s0\",ifDescr=\"PortChannel501\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "recv {{ifDescr}}", + "refId": "A" + }, + { + "exemplar": true, + "expr": "irate(interface_statistics{Key=\"ifHCOutOctets\",hostname=\"T2_US_SDSC:sn3700_s0\",ifDescr=\"PortChannel501\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", + "hide": false, + "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "trans {{ifDescr}}", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "T2_US_SDSC:sn3700_s0 - interface: PortChannel501 Flow Bandwidth", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:118", + "format": "Bps", + "label": "bw out(-) / in(+)", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:119", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, +{ + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 219 + }, + "hiddenSeries": false, + "id": 219, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.5.4", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:176", + "alias": "recv Ethernet104", + "transform": "negative-Y" + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ +{ + "exemplar": true, + "expr": "irate(interface_statistics{Key=\"ifHCInOctets\",hostname=\"T2_US_SDSC:sn3700_s0\",ifDescr=\"Ethernet104\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "recv {{ifDescr}}", + "refId": "A" + }, + { + "exemplar": true, + "expr": "irate(interface_statistics{Key=\"ifHCOutOctets\",hostname=\"T2_US_SDSC:sn3700_s0\",ifDescr=\"Ethernet104\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", + "hide": false, + "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "trans {{ifDescr}}", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "T2_US_SDSC:sn3700_s0 - interface: Ethernet104 Flow Bandwidth", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:118", + "format": "Bps", + "label": "bw out(-) / in(+)", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:119", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, +{ + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 221 + }, + "id": 221, + "panels": [], + "title": "Switch Flow Summary - NRM_CENIC:aristaeos_s0", + "type": "row" + }, +{ + "datasource": null, + "description": "", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 24, + "x": 0, + "y": 222 + }, + "id": 222, + "options": { + "content": "```\nSwitch: NRM_CENIC:aristaeos_s0 Interface:\nname: Port-Channel501 | vlan: 3874 | peer: name: dellos9_s0, interface: Port-channel_103, vlan: not_used\nname: Port-Channel502 | vlan: 3874 | peer: name: sn3700_s0, interface: PortChannel501, vlan: not_used\n ```", + "mode": "markdown" + }, + "pluginVersion": "7.5.4", + "timeFrom": null, + "timeShift": null, + "title": "NRM_CENIC:aristaeos_s0 - Node Interface Information", + "type": "text" + }, +{ + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 223 + }, + "hiddenSeries": false, + "id": 223, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.5.4", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:176", + "alias": "recv Port-Channel501", + "transform": "negative-Y" + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ +{ + "exemplar": true, + "expr": "irate(interface_statistics{Key=\"ifHCInOctets\",hostname=\"NRM_CENIC:aristaeos_s0\",ifDescr=\"Port-Channel501\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "recv {{ifDescr}}", + "refId": "A" + }, + { + "exemplar": true, + "expr": "irate(interface_statistics{Key=\"ifHCOutOctets\",hostname=\"NRM_CENIC:aristaeos_s0\",ifDescr=\"Port-Channel501\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", + "hide": false, + "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "trans {{ifDescr}}", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "NRM_CENIC:aristaeos_s0 - interface: Port-Channel501 Flow Bandwidth", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:118", + "format": "Bps", + "label": "bw out(-) / in(+)", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:119", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, +{ + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 225 + }, + "hiddenSeries": false, + "id": 225, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.5.4", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:176", + "alias": "recv Port-Channel502", + "transform": "negative-Y" + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ +{ + "exemplar": true, + "expr": "irate(interface_statistics{Key=\"ifHCInOctets\",hostname=\"NRM_CENIC:aristaeos_s0\",ifDescr=\"Port-Channel502\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "recv {{ifDescr}}", + "refId": "A" + }, + { + "exemplar": true, + "expr": "irate(interface_statistics{Key=\"ifHCOutOctets\",hostname=\"NRM_CENIC:aristaeos_s0\",ifDescr=\"Port-Channel502\",flow=\"rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 \"}[1m])*8", + "hide": false, + "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "trans {{ifDescr}}", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "NRM_CENIC:aristaeos_s0 - interface: Port-Channel502 Flow Bandwidth", "tooltip": { "shared": true, "sort": 0, @@ -573,9 +1101,9 @@ "h": 20, "w": 24, "x": 0, - "y": 315 + "y": 327 }, - "id": 315, + "id": 327, "panels": [], "title": "L2 Debugging", "type": "row" @@ -630,9 +1158,9 @@ "h": 6, "w": 24, "x": 0, - "y": 316 + "y": 328 }, - "id": 316, + "id": 328, "options": { "alignValue": "center", "legend": { @@ -650,7 +1178,7 @@ "targets": [ { "exemplar": true, - "expr": "t2_us_caltech_test:sdn_dtn_2_11_ultralight_org_script_exporter_task1_rtmon_a316e548_2589_4164_904e_5987275e9c33 ", + "expr": "t2_us_caltech_test:sandie_3_ultralight_org_script_exporter_task1_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", "hide": false, "instant": false, "interval": "", @@ -659,16 +1187,16 @@ }, { "exemplar": true, - "expr": "t2_us_caltech_test:sdn_dtn_2_11_ultralight_org_script_exporter_task2_rtmon_a316e548_2589_4164_904e_5987275e9c33 ", + "expr": "t2_us_caltech_test:sandie_3_ultralight_org_script_exporter_task2_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", "format": "time_series", "hide": false, "instant": false, "interval": "", - "legendFormat": "ARP Table contains T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org IP Address", + "legendFormat": "ARP Table contains T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net IP Address", "refId": "B" } ], - "title": "T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org ARP/MAC Correlation", + "title": "T2_US_Caltech_Test:sandie-3.ultralight.org ARP/MAC Correlation", "transparent": true, "type": "state-timeline" }, @@ -722,9 +1250,9 @@ "h": 6, "w": 24, "x": 0, - "y": 317 + "y": 329 }, - "id": 317, + "id": 329, "options": { "alignValue": "center", "legend": { @@ -742,7 +1270,7 @@ "targets": [ { "exemplar": true, - "expr": "t2_us_caltech_test:sdn_dtn_1_7_ultralight_org_script_exporter_task1_rtmon_a316e548_2589_4164_904e_5987275e9c33 ", + "expr": "t2_us_sdsc:k8s_gen4_01_sdsc_optiputer_net_script_exporter_task1_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", "hide": false, "instant": false, "interval": "", @@ -751,16 +1279,16 @@ }, { "exemplar": true, - "expr": "t2_us_caltech_test:sdn_dtn_1_7_ultralight_org_script_exporter_task2_rtmon_a316e548_2589_4164_904e_5987275e9c33 ", + "expr": "t2_us_sdsc:k8s_gen4_01_sdsc_optiputer_net_script_exporter_task2_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", "format": "time_series", "hide": false, "instant": false, "interval": "", - "legendFormat": "ARP Table contains T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org IP Address", + "legendFormat": "ARP Table contains T2_US_Caltech_Test:sandie-3.ultralight.org IP Address", "refId": "B" } ], - "title": "T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org ARP/MAC Correlation", + "title": "T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net ARP/MAC Correlation", "transparent": true, "type": "state-timeline" }, @@ -814,9 +1342,9 @@ "h": 6, "w": 24, "x": 0, - "y": 318 + "y": 330 }, - "id": 318, + "id": 330, "options": { "alignValue": "center", "legend": { @@ -834,7 +1362,7 @@ "targets": [ { "exemplar": true, - "expr": "t2_us_caltech_test:dellos9_s0_script_exporter_task1_rtmon_a316e548_2589_4164_904e_5987275e9c33 ", + "expr": "t2_us_caltech_test:dellos9_s0_script_exporter_task1_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", "hide": false, "instant": false, "interval": "", @@ -843,19 +1371,19 @@ }, { "exemplar": true, - "expr": "t2_us_caltech_test:dellos9_s0_script_exporter_task2_rtmon_a316e548_2589_4164_904e_5987275e9c33 ", + "expr": "t2_us_caltech_test:dellos9_s0_script_exporter_task2_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", "hide": false, "instant": false, "interval": "", - "legendFormat": "contains T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org MAC Address", + "legendFormat": "contains T2_US_Caltech_Test:sandie-3.ultralight.org MAC Address", "refId": "B" }, { "exemplar": true, - "expr": "t2_us_caltech_test:dellos9_s0_script_exporter_task3_rtmon_a316e548_2589_4164_904e_5987275e9c33 ", + "expr": "t2_us_caltech_test:dellos9_s0_script_exporter_task3_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", "hide": false, "interval": "", - "legendFormat": "contains T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org MAC Address", + "legendFormat": "contains T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net MAC Address", "refId": "C" } ], @@ -863,3 +1391,201 @@ "transparent": true, "type": "state-timeline" }, + +{ + "datasource": null, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "fillOpacity": 70, + "lineWidth": 0 + }, + "mappings": [ + { + "options": { + "0": { + "color": "red", + "index": 0, + "text": "FAILURE" + }, + "1": { + "color": "green", + "index": 1, + "text": "SUCCESS" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 24, + "x": 0, + "y": 331 + }, + "id": 331, + "options": { + "alignValue": "center", + "legend": { + "displayMode": "list", + "placement": "bottom" + }, + "mergeValues": true, + "rowHeight": 0.9, + "showValue": "always", + "tooltip": { + "mode": "single" + } + }, + "pluginVersion": "8.2.3", + "targets": [ + { + "exemplar": true, + "expr": "t2_us_sdsc:sn3700_s0_script_exporter_task1_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "SNMP Exporter Active", + "refId": "A" + }, + { + "exemplar": true, + "expr": "t2_us_sdsc:sn3700_s0_script_exporter_task2_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "contains T2_US_Caltech_Test:sandie-3.ultralight.org MAC Address", + "refId": "B" + }, + { + "exemplar": true, + "expr": "t2_us_sdsc:sn3700_s0_script_exporter_task3_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", + "hide": false, + "interval": "", + "legendFormat": "contains T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net MAC Address", + "refId": "C" + } + ], + "title": "T2_US_SDSC:sn3700_s0 ARP/MAC Correlation", + "transparent": true, + "type": "state-timeline" + }, + +{ + "datasource": null, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "fillOpacity": 70, + "lineWidth": 0 + }, + "mappings": [ + { + "options": { + "0": { + "color": "red", + "index": 0, + "text": "FAILURE" + }, + "1": { + "color": "green", + "index": 1, + "text": "SUCCESS" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 24, + "x": 0, + "y": 332 + }, + "id": 332, + "options": { + "alignValue": "center", + "legend": { + "displayMode": "list", + "placement": "bottom" + }, + "mergeValues": true, + "rowHeight": 0.9, + "showValue": "always", + "tooltip": { + "mode": "single" + } + }, + "pluginVersion": "8.2.3", + "targets": [ + { + "exemplar": true, + "expr": "nrm_cenic:aristaeos_s0_script_exporter_task1_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "SNMP Exporter Active", + "refId": "A" + }, + { + "exemplar": true, + "expr": "nrm_cenic:aristaeos_s0_script_exporter_task2_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "contains T2_US_Caltech_Test:sandie-3.ultralight.org MAC Address", + "refId": "B" + }, + { + "exemplar": true, + "expr": "nrm_cenic:aristaeos_s0_script_exporter_task3_rtmon_e8a9a5a3_f6db_4a31_a6a6_a107d424a7a2 ", + "hide": false, + "interval": "", + "legendFormat": "contains T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net MAC Address", + "refId": "C" + } + ], + "title": "NRM_CENIC:aristaeos_s0 ARP/MAC Correlation", + "transparent": true, + "type": "state-timeline" + }, diff --git a/cloud/dynamic.py b/cloud/dynamic.py index e113770..6e5e5cd 100644 --- a/cloud/dynamic.py +++ b/cloud/dynamic.py @@ -236,6 +236,8 @@ def process_dict_list(dict_list): res = api(data, dashboard_name, lp) + if os.path.exists(dashboard_name): + os.remove(dashboard_name) return res diff --git a/cloud/main.py b/cloud/main.py index 5c0688e..3a48231 100644 --- a/cloud/main.py +++ b/cloud/main.py @@ -247,10 +247,14 @@ def main(): with open("node_data.json", 'w') as f: json.dump(siteMap, f, indent = 2) for idMap in siteMap.keys(): - baseURL = config['siterm_url_map'][f'{idMap}'] - api = SiteRMAPI(baseURL, node_data=siteMap[idMap]) - - api.test(siteMap[idMap]) + if idMap in config['siterm_url_map']: + baseURL = config['siterm_url_map'][f'{idMap}'] + api = SiteRMAPI(baseURL, node_data=siteMap[idMap]) + + api.test(siteMap[idMap]) + else: + print("\033[32m" + f'This Key: {idMap} does not exist in config.yml'+ "\033[0m") + print("Data Dispatched") except: @@ -304,10 +308,13 @@ def main(): with open("node_data.json", 'w') as f: json.dump(siteMap, f, indent = 2) for idMap in siteMap.keys(): - baseURL = config['siterm_url_map'][f'{idMap}'] - api = SiteRMAPI(baseURL, node_data=siteMap[idMap]) - - api.test(siteMap[idMap]) + if idMap in config['siterm_url_map']: + baseURL = config['siterm_url_map'][f'{idMap}'] + api = SiteRMAPI(baseURL, node_data=siteMap[idMap]) + + api.test(siteMap[idMap]) + else: + print("\033[31m" + f'This Key: {idMap} does not exist in config.yml'+ "\033[0m") print("Data Dispatched") except: diff --git a/cloud/nodePatch.py b/cloud/nodePatch.py index 3f84359..649a63e 100644 --- a/cloud/nodePatch.py +++ b/cloud/nodePatch.py @@ -77,6 +77,8 @@ def makeRequest(cls, url, params): #pprint.pprint(json.loads(out.text)) #print(json.loads(out.text)) # print(out) + if out.ok == False: + print("\033[31m" + f'{ver} : {url}' + "\033[0m") return json.loads(out.text), out.ok, out def debugActions(cls, dataIn, dataUpd): @@ -119,10 +121,13 @@ def test(self, node_data): # with open("test_node.json", 'w') as f: # json.dump(siteMap, f, indent=2) # for idMap in siteMap.keys(): -# baseURL = config['siterm_url_map'][f'{idMap}'] -# api = SiteRMAPI(baseURL, node_data=siteMap[idMap]) - -# api.test(siteMap[idMap]) +# if idMap in config['siterm_url_map']: +# baseURL = config['siterm_url_map'][f'{idMap}'] +# api = SiteRMAPI(baseURL, node_data=siteMap[idMap]) + +# api.test(siteMap[idMap]) +# else: +# print(f'This Key: {idMap} does not exist in config.yml') # print("Data Dispatched") diff --git a/cloud/test.yaml b/cloud/test.yaml index b645a04..79183fe 100644 --- a/cloud/test.yaml +++ b/cloud/test.yaml @@ -1,59 +1,97 @@ ## SECTION 1 GENERAL INFORMATION ## -flow: "rtmon-a316e548-2589-4164-904e-5987275e9c33 +flow: "rtmon-e8a9a5a3-f6db-4a31-a6a6-a107d424a7a2 " -title: TEST QRD +title: Caltech-SANDIE3-SDSC-4Gen1.T2 grafana_host: "http://dev2.virnao.com:3000" pushgateway: "http://dev2.virnao.com:9091" grafana_api_token: ## Section 2 Hosts & Switches all under nodes ## node: - - name: "T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org" + - name: "T2_US_Caltech_Test:sandie-3.ultralight.org" type: "host" arp: 'on' runtime: 610 interface: - - name: "mlx5p1s1" + - name: "mlx3p1s1" vlan: 'not used' - ip: 10.251.88.178 + ip: 10.251.89.179 - name: "T2_US_Caltech_Test:dellos9_s0" - vlan: 3614 + vlan: 3874 peer: - name: interface: - vlan: 3614 + vlan: 3874 - - name: "T2_US_Caltech_Test:sdn-dtn-1-7.ultralight.org" + - name: "T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net" type: "host" arp: 'on' runtime: 610 interface: - - name: "mlx4p1s1" + - name: "enp65s0np0" vlan: 'not used' - ip: 10.251.88.177 - - name: "T2_US_Caltech_Test:dellos9_s0" - vlan: 3614 + ip: 10.251.89.180 + - name: "T2_US_SDSC:sn3700_s0" + vlan: 3874 peer: - name: interface: - vlan: 3614 + vlan: 3874 - name: "T2_US_Caltech_Test:dellos9_s0" type: "switch" runtime: 610 interface: - - name: "hundredGigE_1-27" - vlan: 3614 + - name: "Port-channel_103" + vlan: 3874 + peer: + - name: "aristaeos_s0" + interface: "Port-Channel501" + vlan: 'not_used' + + - name: "fortyGigE_1-30-1" + vlan: 3874 + peer: + - name: "T2_US_Caltech_Test:sandie-3.ultralight.org" + interface: "mlx3p1s1" + vlan: 3874 + + + - name: "T2_US_SDSC:sn3700_s0" + type: "switch" + runtime: 610 + interface: + - name: "PortChannel501" + vlan: 3874 + peer: + - name: "aristaeos_s0" + interface: "Port-Channel502" + vlan: 'not_used' + + - name: "Ethernet104" + vlan: 3874 + peer: + - name: "T2_US_SDSC:k8s-gen4-01.sdsc.optiputer.net" + interface: "enp65s0np0" + vlan: 3874 + + + - name: "NRM_CENIC:aristaeos_s0" + type: "switch" + runtime: 610 + interface: + - name: "Port-Channel501" + vlan: 3874 peer: - - name: "T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org" - interface: "mlx5p1s1" - vlan: 3614 + - name: "dellos9_s0" + interface: "Port-channel_103" + vlan: 'not_used' - - name: "hundredGigE_1-23" - vlan: 3614 + - name: "Port-Channel502" + vlan: 3874 peer: - - name: "T2_US_Caltech_Test:sdn-dtn-2-11.ultralight.org" - interface: "mlx5p1s1" - vlan: 3614 + - name: "sn3700_s0" + interface: "PortChannel501" + vlan: 'not_used'