Merge pull request #158 from apel/v39-fixes

v39 fixes
apel · May 15, 2023 · 9467161 · 9467161
2 parents 6d2782a + 043f418
commit 9467161
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 98 deletions.
diff --git a/dashboards/iris/activity_view.json b/dashboards/iris/activity_view.json
@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 20,
+  "id": 4,
   "links": [
     {
       "asDropdown": false,
@@ -137,7 +137,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "9.5.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -358,7 +358,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "9.5.2",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -533,7 +533,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "9.5.2",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -646,8 +646,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -750,7 +749,9 @@
   "revision": 1,
   "schemaVersion": 38,
   "style": "dark",
-  "tags": [],
+  "tags": [
+    "main"
+  ],
   "templating": {
     "list": [
       {
@@ -929,6 +930,6 @@
   "timezone": "",
   "title": "Activity View",
   "uid": "TfxgjgJZk",
-  "version": 9,
+  "version": 3,
   "weekStart": ""
-}
+}
diff --git a/dashboards/iris/iris.json b/dashboards/iris/iris.json
@@ -25,7 +25,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 18,
+  "id": 2,
   "links": [
     {
       "asDropdown": false,
@@ -160,7 +160,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "9.5.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -2144,7 +2144,9 @@
   "revision": 1,
   "schemaVersion": 38,
   "style": "dark",
-  "tags": [],
+  "tags": [
+    "main"
+  ],
   "templating": {
     "list": [
       {
@@ -2239,6 +2241,34 @@
         "type": "query",
         "useTags": false
       },
+      {
+        "current": {
+          "selected": true,
+          "text": [
+            "All"
+          ],
+          "value": [
+            "$__all"
+          ]
+        },
+        "datasource": {
+          "type": "mysql",
+          "uid": "P4815E41304F4136B"
+        },
+        "definition": "SELECT VOGroup FROM VCombinedSummaries WHERE VO in ($VO)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Sub-Activity",
+        "multi": true,
+        "name": "VOGroup",
+        "options": [],
+        "query": "SELECT VOGroup FROM VCombinedSummaries WHERE VO in ($VO)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
       {
         "current": {
           "selected": true,
@@ -2275,36 +2305,47 @@
       {
         "current": {
           "selected": true,
-          "text": [
-            "All"
-          ],
-          "value": [
-            "$__all"
-          ]
-        },
-        "datasource": {
-          "type": "mysql",
-          "uid": "P4815E41304F4136B"
+          "text": "Both",
+          "value": "Both"
         },
-        "definition": "SELECT VOGroup FROM VCombinedSummaries WHERE VO in ($VO)",
+        "description": "Select which line series appear.",
         "hide": 0,
-        "includeAll": true,
-        "label": "Sub-Activity",
-        "multi": true,
-        "name": "VOGroup",
-        "options": [],
-        "query": "SELECT VOGroup FROM VCombinedSummaries WHERE VO in ($VO)",
-        "refresh": 1,
-        "regex": "",
+        "includeAll": false,
+        "label": "Line Series",
+        "multi": false,
+        "name": "LineSeries",
+        "options": [
+          {
+            "selected": true,
+            "text": "Both",
+            "value": "Both"
+          },
+          {
+            "selected": false,
+            "text": "Just Allocation",
+            "value": "Just Allocation"
+          },
+          {
+            "selected": false,
+            "text": "Just Capacity",
+            "value": "Just Capacity"
+          },
+          {
+            "selected": false,
+            "text": "Neither",
+            "value": "Neither"
+          }
+        ],
+        "query": "Both,Just Allocation,Just Capacity,Neither",
+        "queryValue": "",
         "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
+        "type": "custom"
       }
     ]
   },
   "time": {
-    "from": "2015-05-05T16:27:38.205Z",
-    "to": "2025-12-23T22:37:05.385Z"
+    "from": "2018-01-01T00:00:00.000Z",
+    "to": "now"
   },
   "timepicker": {
     "refresh_intervals": [
@@ -2323,6 +2364,6 @@
   "timezone": "",
   "title": "IRIS Accounting Dashboard",
   "uid": "feTpkMumk",
-  "version": 17,
+  "version": 8,
   "weekStart": ""
 }
diff --git a/dashboards/iris/provider_view.json b/dashboards/iris/provider_view.json
@@ -25,7 +25,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 19,
+  "id": 3,
   "links": [
     {
       "asDropdown": false,
@@ -92,7 +92,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "9.5.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -339,7 +339,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "9.5.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -565,7 +565,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "9.5.2",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -745,7 +745,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "9.5.2",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -929,7 +929,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.4.3",
+      "pluginVersion": "9.5.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1163,7 +1163,9 @@
   "revision": 1,
   "schemaVersion": 38,
   "style": "dark",
-  "tags": [],
+  "tags": [
+    "main"
+  ],
   "templating": {
     "list": [
       {
@@ -1342,6 +1344,6 @@
   "timezone": "",
   "title": "Provider View",
   "uid": "TEXgjgJZk",
-  "version": 11,
+  "version": 3,
   "weekStart": ""
-}
+}