diff --git a/grafana/main/overview.json b/grafana/main/overview.json index 8d30ec7..43a3b6d 100644 --- a/grafana/main/overview.json +++ b/grafana/main/overview.json @@ -676,7 +676,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -693,7 +694,7 @@ "x": 0, "y": 25 }, - "id": 44, + "id": 51, "options": { "footer": { "countRows": false, @@ -720,14 +721,14 @@ "root_selector": "", "source": "url", "type": "json", - "url": "http://127.0.0.1:8003/ecopcr.json", + "url": "http://127.0.0.1:8003/assignxl.json", "url_options": { "data": "", "method": "GET" } } ], - "title": "Ecopcr Queue", + "title": "Assign Queue", "type": "table" }, { @@ -749,7 +750,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -766,7 +768,7 @@ "x": 12, "y": 25 }, - "id": 49, + "id": 44, "options": { "footer": { "countRows": false, @@ -793,14 +795,14 @@ "root_selector": "", "source": "url", "type": "json", - "url": "http://127.0.0.1:8003/blast.json", + "url": "http://127.0.0.1:8003/ecopcr.json", "url_options": { "data": "", "method": "GET" } } ], - "title": "Blast Queue", + "title": "Ecopcr Queue", "type": "table" }, { @@ -822,7 +824,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -839,7 +842,7 @@ "x": 0, "y": 33 }, - "id": 45, + "id": 49, "options": { "footer": { "countRows": false, @@ -866,14 +869,14 @@ "root_selector": "", "source": "url", "type": "json", - "url": "http://127.0.0.1:8003/ac.json", + "url": "http://127.0.0.1:8003/blast.json", "url_options": { "data": "", "method": "GET" } } ], - "title": "AncestralClust Queue", + "title": "Blast Queue", "type": "table" }, { @@ -895,7 +898,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -912,7 +916,7 @@ "x": 12, "y": 33 }, - "id": 48, + "id": 45, "options": { "footer": { "countRows": false, @@ -939,14 +943,14 @@ "root_selector": "", "source": "url", "type": "json", - "url": "http://127.0.0.1:8003/newick.json", + "url": "http://127.0.0.1:8003/ac.json", "url_options": { "data": "", "method": "GET" } } ], - "title": "Newick Queue", + "title": "AncestralClust Queue", "type": "table" }, { @@ -968,7 +972,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1022,6 +1027,80 @@ "title": "Tronko Queue", "type": "table" }, + { + "datasource": { + "type": "yesoreyeram-infinity-datasource", + "uid": "_-FiBOIIz" + }, + "fieldConfig": { + "defaults": { + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 41 + }, + "id": 48, + "options": { + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "9.4.3", + "targets": [ + { + "columns": [], + "datasource": { + "type": "yesoreyeram-infinity-datasource", + "uid": "_-FiBOIIz" + }, + "filters": [], + "format": "table", + "global_query_id": "", + "refId": "A", + "root_selector": "", + "source": "url", + "type": "json", + "url": "http://127.0.0.1:8003/newick.json", + "url_options": { + "data": "", + "method": "GET" + } + } + ], + "title": "Newick Queue", + "type": "table" + }, { "collapsed": false, "gridPos": { @@ -1131,146 +1210,26 @@ { "datasource": { "type": "prometheus", - "uid": "newick01" + "uid": "ecopcr03" }, "editorMode": "code", "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", "hide": false, - "legendFormat": "newick01", + "legendFormat": "ecopcr03", "range": true, "refId": "B" }, { "datasource": { "type": "prometheus", - "uid": "newick02" + "uid": "assign00" }, "editorMode": "code", "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", "hide": false, - "legendFormat": "newick02", + "legendFormat": "assign00", "range": true, "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast13" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast13", - "range": true, - "refId": "D" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast14" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast14", - "range": true, - "refId": "E" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast15" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast15", - "range": true, - "refId": "F" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast16" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast16", - "range": true, - "refId": "G" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast17" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast17", - "range": true, - "refId": "H" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast18" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast18", - "range": true, - "refId": "I" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast19" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast19", - "range": true, - "refId": "J" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast20" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast20", - "range": true, - "refId": "K" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast21" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast21", - "range": true, - "refId": "L" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast22" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast22", - "range": true, - "refId": "M" } ], "title": "CPU Usage", @@ -1342,160 +1301,40 @@ { "datasource": { "type": "prometheus", - "uid": "newick01" + "uid": "ecopcr03" }, "editorMode": "code", "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", "hide": false, - "legendFormat": "newick01", + "legendFormat": "ecopcr03", "range": true, "refId": "B" }, { "datasource": { "type": "prometheus", - "uid": "newick02" + "uid": "assign00" }, "editorMode": "code", "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", "hide": false, - "legendFormat": "newick02", + "legendFormat": "assign00", "range": true, "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast13" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast13", - "range": true, - "refId": "D" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast14" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast14", - "range": true, - "refId": "E" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast15" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast15", - "range": true, - "refId": "F" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast16" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast16", - "range": true, - "refId": "G" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast17" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast17", - "range": true, - "refId": "H" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast18" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast18", - "range": true, - "refId": "I" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast19" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast19", - "range": true, - "refId": "J" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast20" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast20", - "range": true, - "refId": "K" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast21" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast21", - "range": true, - "refId": "L" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast22" - }, - "editorMode": "code", - "expr": "100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\"}[5m])) * 100)", - "hide": false, - "legendFormat": "blast22", - "range": true, - "refId": "M" - } - ], - "title": "CPU Usage", - "type": "gauge" - }, - { - "datasource": { - "type": "datasource", - "uid": "-- Mixed --" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" + } + ], + "title": "CPU Usage", + "type": "gauge" + }, + { + "datasource": { + "type": "datasource", + "uid": "-- Mixed --" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" }, "custom": { "axisCenteredZero": false, @@ -1583,146 +1422,26 @@ { "datasource": { "type": "prometheus", - "uid": "newick01" + "uid": "ecopcr03" }, "editorMode": "code", "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", "hide": false, - "legendFormat": "newick01", + "legendFormat": "ecopcr03", "range": true, "refId": "B" }, { "datasource": { "type": "prometheus", - "uid": "newick02" + "uid": "assign00" }, "editorMode": "code", "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", "hide": false, - "legendFormat": "newick02", + "legendFormat": "assign00", "range": true, "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast13" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast13", - "range": true, - "refId": "D" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast14" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast14", - "range": true, - "refId": "E" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast15" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast15", - "range": true, - "refId": "F" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast16" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast16", - "range": true, - "refId": "G" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast17" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast17", - "range": true, - "refId": "H" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast18" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast18", - "range": true, - "refId": "I" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast19" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast19", - "range": true, - "refId": "J" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast20" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast20", - "range": true, - "refId": "K" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast21" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast21", - "range": true, - "refId": "L" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast22" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast22", - "range": true, - "refId": "M" } ], "title": "Memory Usage", @@ -1794,190 +1513,70 @@ { "datasource": { "type": "prometheus", - "uid": "newick01" + "uid": "ecopcr03" }, "editorMode": "code", "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", "hide": false, - "legendFormat": "newick01", + "legendFormat": "ecopcr03", "range": true, "refId": "B" }, { "datasource": { "type": "prometheus", - "uid": "newick02" + "uid": "assign00" }, "editorMode": "code", "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", "hide": false, - "legendFormat": "newick02", + "legendFormat": "assign00", "range": true, "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast13" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast13", - "range": true, - "refId": "D" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast14" + } + ], + "title": "Memory Usage", + "type": "gauge" + }, + { + "datasource": { + "type": "datasource", + "uid": "-- Mixed --" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast14", - "range": true, - "refId": "E" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast15" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast15", - "range": true, - "refId": "F" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast16" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast16", - "range": true, - "refId": "G" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast17" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast17", - "range": true, - "refId": "H" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast18" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast18", - "range": true, - "refId": "I" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast19" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast19", - "range": true, - "refId": "J" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast20" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast20", - "range": true, - "refId": "K" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast21" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast21", - "range": true, - "refId": "L" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast22" - }, - "editorMode": "code", - "expr": "(1 - node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes) * 100", - "hide": false, - "legendFormat": "blast22", - "range": true, - "refId": "M" - } - ], - "title": "Memory Usage", - "type": "gauge" - }, - { - "datasource": { - "type": "datasource", - "uid": "-- Mixed --" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } }, "mappings": [], "max": 100, @@ -2035,146 +1634,26 @@ { "datasource": { "type": "prometheus", - "uid": "newick01" + "uid": "ecopcr03" }, "editorMode": "code", "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", "hide": false, - "legendFormat": "newick01", + "legendFormat": "ecopcr03", "range": true, "refId": "B" }, { "datasource": { "type": "prometheus", - "uid": "newick02" + "uid": "assign00" }, "editorMode": "code", "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", "hide": false, - "legendFormat": "newick02", + "legendFormat": "assign00", "range": true, "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast13" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast13", - "range": true, - "refId": "D" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast14" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast14", - "range": true, - "refId": "E" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast15" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast15", - "range": true, - "refId": "F" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast16" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast16", - "range": true, - "refId": "G" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast17" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast17", - "range": true, - "refId": "H" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast18" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast18", - "range": true, - "refId": "I" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast19" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast19", - "range": true, - "refId": "J" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast20" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast20", - "range": true, - "refId": "K" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast21" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast21", - "range": true, - "refId": "L" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast22" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast22", - "range": true, - "refId": "M" } ], "title": "FileSystem Usage", @@ -2246,146 +1725,26 @@ { "datasource": { "type": "prometheus", - "uid": "newick01" + "uid": "ecopcr03" }, "editorMode": "code", "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", "hide": false, - "legendFormat": "newick01", + "legendFormat": "ecopcr03", "range": true, "refId": "B" }, { "datasource": { "type": "prometheus", - "uid": "newick02" + "uid": "assign00" }, "editorMode": "code", "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", "hide": false, - "legendFormat": "newick02", + "legendFormat": "assign00", "range": true, "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast13" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast13", - "range": true, - "refId": "D" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast14" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast14", - "range": true, - "refId": "E" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast15" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast15", - "range": true, - "refId": "F" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast16" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast16", - "range": true, - "refId": "G" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast17" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast17", - "range": true, - "refId": "H" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast18" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast18", - "range": true, - "refId": "I" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast19" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast19", - "range": true, - "refId": "J" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast20" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast20", - "range": true, - "refId": "K" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast21" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast21", - "range": true, - "refId": "L" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast22" - }, - "editorMode": "code", - "expr": "(1 - node_filesystem_avail_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * 100", - "hide": false, - "legendFormat": "blast22", - "range": true, - "refId": "M" } ], "title": "FileSystem Usage", @@ -2430,204 +1789,85 @@ }, "thresholdsStyle": { "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 74 - }, - "id": 26, - "options": { - "legend": { - "calcs": [ - "mean", - "lastNotNull", - "max", - "min" - ], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "newick00" - }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "newick00 - {{device}}", - "range": true, - "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "newick01" - }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "newick01 - {{device}}", - "range": true, - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "newick02" - }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "newick02 - {{device}}", - "range": true, - "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast13" - }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "blast13 - {{device}}", - "range": true, - "refId": "D" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast14" - }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "blast14 - {{device}}", - "range": true, - "refId": "E" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast15" - }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "blast15 - {{device}}", - "range": true, - "refId": "F" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast16" - }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "blast16 - {{device}}", - "range": true, - "refId": "G" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast17" - }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "blast17 - {{device}}", - "range": true, - "refId": "H" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast18" + } }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "blast18 - {{device}}", - "range": true, - "refId": "I" + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } }, - { - "datasource": { - "type": "prometheus", - "uid": "blast19" - }, - "editorMode": "code", - "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", - "hide": false, - "legendFormat": "blast19 - {{device}}", - "range": true, - "refId": "J" + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 74 + }, + "id": 26, + "options": { + "legend": { + "calcs": [ + "mean", + "lastNotNull", + "max", + "min" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ { "datasource": { "type": "prometheus", - "uid": "blast20" + "uid": "newick00" }, "editorMode": "code", "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", "hide": false, - "legendFormat": "blast20 - {{device}}", + "legendFormat": "newick00 - {{device}}", "range": true, - "refId": "K" + "refId": "A" }, { "datasource": { "type": "prometheus", - "uid": "blast21" + "uid": "ecopcr03" }, "editorMode": "code", "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", "hide": false, - "legendFormat": "blast21 - {{device}}", + "legendFormat": "ecopcr03 - {{device}}", "range": true, - "refId": "L" + "refId": "B" }, { "datasource": { "type": "prometheus", - "uid": "blast22" + "uid": "assign00" }, "editorMode": "code", "expr": "node_network_up{instance=\"localhost:9100\",job=\"node_export\"}", "hide": false, - "legendFormat": "blast22 - {{device}}", + "legendFormat": "assign00 - {{device}}", "range": true, - "refId": "M" + "refId": "C" } ], "title": "Network Operational Status", @@ -2678,7 +1918,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2742,134 +1983,24 @@ { "datasource": { "type": "prometheus", - "uid": "newick01" + "uid": "ecopcr03" }, "editorMode": "code", "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "newick01", + "legendFormat": "ecopcr03", "range": true, "refId": "B" }, { "datasource": { "type": "prometheus", - "uid": "newick02" + "uid": "assign00" }, "editorMode": "code", "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "newick02", + "legendFormat": "assign00", "range": true, "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast13" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast13", - "range": true, - "refId": "D" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast14" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast14", - "range": true, - "refId": "E" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast15" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast15", - "range": true, - "refId": "F" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast16" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast16", - "range": true, - "refId": "G" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast17" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast17", - "range": true, - "refId": "H" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast18" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast18", - "range": true, - "refId": "I" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast19" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast19", - "range": true, - "refId": "J" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast20" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast20", - "range": true, - "refId": "K" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast21" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast21", - "range": true, - "refId": "L" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast22" - }, - "editorMode": "code", - "expr": "irate(node_network_transmit_errs_total{instance=\"localhost:9100\",job=\"node_export\",device=\"enp1s0\"}[$__rate_interval])", - "legendFormat": "blast22", - "range": true, - "refId": "M" } ], "title": "Network Traffic Errors", @@ -3002,146 +2133,26 @@ { "datasource": { "type": "prometheus", - "uid": "newick01" + "uid": "ecopcr03" }, "editorMode": "code", "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", "hide": false, - "legendFormat": "newick01 - {{device}}", + "legendFormat": "ecopcr03 - {{device}}", "range": true, "refId": "B" }, { "datasource": { "type": "prometheus", - "uid": "newick02" + "uid": "assign00" }, "editorMode": "code", "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", "hide": false, - "legendFormat": "newick02 - {{device}}", + "legendFormat": "assign00 - {{device}}", "range": true, "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast13" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast13 - {{device}}", - "range": true, - "refId": "D" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast14" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast14 - {{device}}", - "range": true, - "refId": "E" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast15" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast15 - {{device}}", - "range": true, - "refId": "F" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast16" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast16 - {{device}}", - "range": true, - "refId": "G" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast17" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast17 - {{device}}", - "range": true, - "refId": "H" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast18" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast18 - {{device}}", - "range": true, - "refId": "I" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast19" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast19 - {{device}}", - "range": true, - "refId": "J" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast20" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast20 - {{device}}", - "range": true, - "refId": "K" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast21" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast21 - {{device}}", - "range": true, - "refId": "L" - }, - { - "datasource": { - "type": "prometheus", - "uid": "blast22" - }, - "editorMode": "code", - "expr": "irate(node_network_receive_bytes_total{device=\"enp1s0\"}[$__rate_interval])", - "hide": false, - "legendFormat": "blast22 - {{device}}", - "range": true, - "refId": "M" } ], "title": "Network Traffic", @@ -3157,13 +2168,13 @@ "list": [] }, "time": { - "from": "now-24h", + "from": "now-1h", "to": "now" }, "timepicker": {}, "timezone": "", "title": "overview", "uid": "overview", - "version": 1733, + "version": 1927, "weekStart": "" } \ No newline at end of file diff --git a/scheduler/supabase/benparser.py b/scheduler/supabase/benparser.py index d1c0604..f491364 100644 --- a/scheduler/supabase/benparser.py +++ b/scheduler/supabase/benparser.py @@ -1,7 +1,7 @@ import os import json -QUEUES=["/etc/ben/queue/qc.ini", "/etc/ben/queue/assign.ini", "/etc/ben/queue/ecopcr.ini", "/etc/ben/queue/blast.ini", "/etc/ben/queue/ac.ini", "/etc/ben/queue/newick.ini", "/etc/ben/queue/tronko.ini"] +QUEUES=["/etc/ben/queue/qc.ini", "/etc/ben/queue/assign.ini", "/etc/ben/queue/assignxl.ini", "/etc/ben/queue/ecopcr.ini", "/etc/ben/queue/blast.ini", "/etc/ben/queue/ac.ini", "/etc/ben/queue/newick.ini", "/etc/ben/queue/tronko.ini"] OUTDIR="/etc/ben/json" for queue in QUEUES: jobs = [] diff --git a/scheduler/supabase/supabase_ben.py b/scheduler/supabase/supabase_ben.py index 141496d..fc57c22 100644 --- a/scheduler/supabase/supabase_ben.py +++ b/scheduler/supabase/supabase_ben.py @@ -5,18 +5,18 @@ from configparser import ConfigParser sensitive_patterns = [ - r'AWS_ACCESS_KEY_ID=[\w-]+', - r'AWS_SECRET_ACCESS_KEY=[\w-]+', - r'AWS_DEFAULT_REGION=[\w-]+', - r'AWS_S3_ACCESS_KEY_ID=[\w-]+', - r'AWS_S3_SECRET_ACCESS_KEY=[\w-]+', - r'AWS_S3_DEFAULT_REGION=[\w-]+', - r'AWS_S3_BUCKET=[\w-]+' + r'(AWS_ACCESS_KEY_ID=)([^\s]+)', + r'(AWS_SECRET_ACCESS_KEY=)([^\s]+)', + r'(AWS_DEFAULT_REGION=)([^\s]+)', + r'(AWS_S3_ACCESS_KEY_ID=)([^\s]+)', + r'(AWS_S3_SECRET_ACCESS_KEY=)([^\s]+)', + r'(AWS_S3_DEFAULT_REGION=)([^\s]+)', + r'(AWS_S3_BUCKET=)([^\s]+)' ] def scrub_command(command, sensitive_patterns): for pattern in sensitive_patterns: - command = re.sub(pattern, "REDACTED", command) + command = re.sub(pattern, r'\1REDACTED', command) return command def config(filename='database.ini', section='postgresql'):