Skip to content

Commit

Permalink
-adjusting dashboards
Browse files Browse the repository at this point in the history
  • Loading branch information
@nick-harder
nick-harder committed Sep 25, 2023
1 parent 40cb44b commit 4fbf820
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 76 deletions.
2 changes: 1 addition & 1 deletion docker_configs/dashboard-definitions/ASSUME Comparison.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2329,7 +2329,7 @@
},
"timepicker": {},
"timezone": "",
"title": "ASSUME Comparison",
"title": "ASSUME: Compare scenarios",
"uid": "vP8U8-q4k",
"version": 2,
"weekStart": ""
Expand Down
95 changes: 42 additions & 53 deletions docker_configs/dashboard-definitions/ASSUME.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,8 @@
"mode": "absolute",
"steps": [
{
"color": "green"
"color": "green",
"value": null
},
{
"color": "red",
Expand All @@ -381,7 +382,7 @@
"h": 9,
"w": 12,
"x": 0,
"y": 296
"y": 20
},
"id": 19,
"options": {
Expand Down Expand Up @@ -558,7 +559,7 @@
"h": 9,
"w": 12,
"x": 12,
"y": 296
"y": 20
},
"id": 20,
"options": {
Expand Down Expand Up @@ -678,7 +679,7 @@
"h": 1,
"w": 24,
"x": 0,
"y": 305
"y": 29
},
"id": 74,
"panels": [],
Expand Down Expand Up @@ -767,7 +768,7 @@
"h": 12,
"w": 10,
"x": 0,
"y": 306
"y": 30
},
"id": 72,
"options": {
Expand Down Expand Up @@ -901,7 +902,7 @@
"h": 12,
"w": 9,
"x": 10,
"y": 306
"y": 30
},
"id": 76,
"options": {
Expand Down Expand Up @@ -986,7 +987,7 @@
"h": 12,
"w": 5,
"x": 19,
"y": 306
"y": 30
},
"id": 7,
"options": {
Expand Down Expand Up @@ -1079,7 +1080,7 @@
"h": 3,
"w": 24,
"x": 0,
"y": 318
"y": 42
},
"id": 22,
"options": {
Expand Down Expand Up @@ -1134,7 +1135,7 @@
"h": 1,
"w": 24,
"x": 0,
"y": 321
"y": 45
},
"id": 41,
"panels": [],
Expand Down Expand Up @@ -1205,7 +1206,7 @@
"h": 9,
"w": 18,
"x": 0,
"y": 322
"y": 46
},
"id": 24,
"options": {
Expand Down Expand Up @@ -1306,8 +1307,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -1322,7 +1322,7 @@
"h": 9,
"w": 6,
"x": 18,
"y": 322
"y": 46
},
"id": 26,
"options": {
Expand Down Expand Up @@ -1423,8 +1423,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -1453,7 +1452,7 @@
"h": 8,
"w": 12,
"x": 0,
"y": 331
"y": 55
},
"id": 70,
"options": {
Expand Down Expand Up @@ -1616,8 +1615,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -1661,7 +1659,7 @@
"h": 8,
"w": 12,
"x": 12,
"y": 331
"y": 55
},
"id": 78,
"options": {
Expand Down Expand Up @@ -1844,7 +1842,7 @@
"h": 9,
"w": 24,
"x": 0,
"y": 339
"y": 63
},
"id": 82,
"options": {
Expand Down Expand Up @@ -1941,7 +1939,7 @@
"h": 1,
"w": 24,
"x": 0,
"y": 348
"y": 72
},
"id": 39,
"panels": [],
Expand Down Expand Up @@ -2009,7 +2007,7 @@
"h": 9,
"w": 18,
"x": 0,
"y": 349
"y": 73
},
"id": 36,
"options": {
Expand Down Expand Up @@ -2109,8 +2107,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -2125,7 +2122,7 @@
"h": 9,
"w": 6,
"x": 18,
"y": 349
"y": 73
},
"id": 37,
"options": {
Expand Down Expand Up @@ -2255,7 +2252,7 @@
"h": 9,
"w": 12,
"x": 0,
"y": 358
"y": 82
},
"id": 89,
"options": {
Expand Down Expand Up @@ -2418,8 +2415,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -2463,7 +2459,7 @@
"h": 9,
"w": 12,
"x": 12,
"y": 358
"y": 82
},
"id": 90,
"options": {
Expand Down Expand Up @@ -2647,7 +2643,7 @@
"h": 9,
"w": 24,
"x": 0,
"y": 367
"y": 91
},
"id": 86,
"options": {
Expand Down Expand Up @@ -2743,7 +2739,7 @@
"h": 1,
"w": 24,
"x": 0,
"y": 376
"y": 100
},
"id": 44,
"panels": [],
Expand Down Expand Up @@ -2811,7 +2807,7 @@
"h": 9,
"w": 18,
"x": 0,
"y": 377
"y": 101
},
"id": 65,
"options": {
Expand Down Expand Up @@ -2911,8 +2907,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -2927,7 +2922,7 @@
"h": 9,
"w": 6,
"x": 18,
"y": 377
"y": 101
},
"id": 47,
"options": {
Expand Down Expand Up @@ -3043,7 +3038,7 @@
"h": 9,
"w": 24,
"x": 0,
"y": 386
"y": 110
},
"id": 80,
"options": {
Expand Down Expand Up @@ -3192,7 +3187,7 @@
"h": 9,
"w": 12,
"x": 0,
"y": 395
"y": 119
},
"id": 91,
"options": {
Expand Down Expand Up @@ -3355,8 +3350,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -3400,7 +3394,7 @@
"h": 9,
"w": 12,
"x": 12,
"y": 395
"y": 119
},
"id": 92,
"options": {
Expand Down Expand Up @@ -3584,7 +3578,7 @@
"h": 9,
"w": 24,
"x": 0,
"y": 404
"y": 128
},
"id": 84,
"options": {
Expand Down Expand Up @@ -3684,21 +3678,21 @@
{
"current": {
"selected": false,
"text": "example_01a_base",
"value": "example_01a_base"
"text": "example_01_rl_base",
"value": "example_01_rl_base"
},
"datasource": {
"type": "postgres",
"uid": "P7B13B9DF907EC40C"
},
"definition": "-- this construct is needed to execute a join query if rl_params exist\n-- else execute a query without a join on rl_params\nCREATE OR REPLACE FUNCTION get_simulation_data()\nRETURNS TABLE (\n market_simulation TEXT\n) AS $$\nBEGIN\n IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'rl_params') THEN\n -- Table rl_params exists, execute the join query\n RETURN QUERY EXECUTE '\n SELECT DISTINCT\n m.simulation AS market_simulation\n FROM \n market_meta m\n LEFT OUTER JOIN\n rl_params o\n ON\n m.simulation = o.simulation\n WHERE\n o.learning_mode is not true\n ';\n ELSE\n -- Table rl_params doesn't exist, execute the query for market_meta only\n RETURN QUERY EXECUTE '\n SELECT DISTINCT\n simulation AS market_simulation\n FROM \n market_meta\n ';\n END IF;\nEND;\n$$ LANGUAGE plpgsql;\n\nSELECT * FROM get_simulation_data();\n",
"definition": "SELECT simulation\nFROM market_meta",
"description": "Can choose which simulation we want to show ",
"hide": 0,
"includeAll": false,
"multi": false,
"name": "simulation",
"options": [],
"query": "-- this construct is needed to execute a join query if rl_params exist\n-- else execute a query without a join on rl_params\nCREATE OR REPLACE FUNCTION get_simulation_data()\nRETURNS TABLE (\n market_simulation TEXT\n) AS $$\nBEGIN\n IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'rl_params') THEN\n -- Table rl_params exists, execute the join query\n RETURN QUERY EXECUTE '\n SELECT DISTINCT\n m.simulation AS market_simulation\n FROM \n market_meta m\n LEFT OUTER JOIN\n rl_params o\n ON\n m.simulation = o.simulation\n WHERE\n o.learning_mode is not true\n ';\n ELSE\n -- Table rl_params doesn't exist, execute the query for market_meta only\n RETURN QUERY EXECUTE '\n SELECT DISTINCT\n simulation AS market_simulation\n FROM \n market_meta\n ';\n END IF;\nEND;\n$$ LANGUAGE plpgsql;\n\nSELECT * FROM get_simulation_data();\n",
"query": "SELECT simulation\nFROM market_meta",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
Expand Down Expand Up @@ -3813,21 +3807,16 @@
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
"1h"
]
},
"timezone": "",
"title": "ASSUME",
"title": "ASSUME: Main overview",
"uid": "mQ3Lvkr4k",
"version": 12,
"version": 3,
"weekStart": ""
}
Loading

0 comments on commit 4fbf820

Please sign in to comment.