Merge ~lihuiguo/charm-grafana:bug/1928616-refactor into charm-grafana:master

[Linda Guo]

    changed panel type from timeseries to graph

    timeseries plugin is unavailable on vesion < 7.5.6

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d27cf3b174bf5322c62dd0c68e8479420918a987
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/26/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/92/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/298/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/26//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:b4c0bf0ab574169f36f51da4e3ee342eabeffba3
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/27/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/93/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/299/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/27//rebuild

review: Approve (continuous-integration)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision bc68c3faa5ef7fba9eb9ccc68c740881f89d638b

diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
index 47d0169..a5cc94b 100644
--- a/src/reactive/grafana.py
+++ b/src/reactive/grafana.py
@@ -886,8 +886,9 @@ def generate_prometheus_dashboards(gf_adminpasswd, ds):
             "Exception while trying to reach prometheus API: {}".format(e),
             "ERROR",
         )
-        hookenv.status_set("blocked", "Exception reaching prometheus API whilst "
-                                      "updating dashboards")
+        hookenv.status_set(
+            "blocked", "Exception reaching prometheus API whilst " "updating dashboards"
+        )
         return
 
     if response.status_code != 200:
diff --git a/src/templates/dashboards/prometheus/IpmiSensor.json.j2 b/src/templates/dashboards/prometheus/IpmiSensor.json.j2
index e3acbba..7c7b044 100644
--- a/src/templates/dashboards/prometheus/IpmiSensor.json.j2
+++ b/src/templates/dashboards/prometheus/IpmiSensor.json.j2
@@ -125,7 +125,6 @@
           "mode": "single"
         }
       },
-      "pluginVersion": "7.5.6",
       "targets": [
         {
           "exemplar": true,
@@ -138,7 +137,7 @@
         }
       ],
       "title": "Temperature",
-      "type": "timeseries"
+      "type": "graph"
     },
     {
       "datasource": "<< datasource >>",
@@ -199,7 +198,6 @@
           "mode": "single"
         }
       },
-      "pluginVersion": "7.5.6",
       "targets": [
         {
           "exemplar": true,
@@ -212,8 +210,82 @@
           "refId": "PSU1"
         }
       ],
-      "title": "PSU",
-      "type": "timeseries"
+      "title": "Power(watts)",
+      "type": "graph"
+    },
+    {
+      "datasource": "<< datasource >>",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "volt"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 8
+      },
+      "id": 7,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "ipmi_sensor{unit=\"volts\", host=~\"$host\"}",
+          "format": "time_series",
+          "instant": false,
+          "interval": "",
+          "legendFormat": "{{name}}",
+          "queryType": "randomWalk",
+          "refId": "PSU2"
+        }
+      ],
+      "title": "Power(volts)",
+      "type": "graph"
     },
     {
       "datasource": "<< datasource >>",
@@ -257,7 +329,7 @@
               }
             ]
           },
-          "unit": "percent"
+          "unit": "rpm"
         },
         "overrides": []
       },
@@ -278,11 +350,10 @@
           "mode": "single"
         }
       },
-      "pluginVersion": "7.5.6",
       "targets": [
         {
           "exemplar": true,
-          "expr": "ipmi_sensor{unit=\"percent\", host=~\"$host\"}",
+          "expr": "ipmi_sensor{unit=\"rpm\", host=~\"$host\"}",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -292,7 +363,7 @@
         }
       ],
       "title": "Fan",
-      "type": "timeseries"
+      "type": "graph"
     }
   ],
   "refresh": false,
@@ -314,10 +385,7 @@
         "multi": true,
         "name": "host",
         "options": [],
-        "query": {
-          "query": "label_values(ipmi_sensor, host)",
-          "refId": "HostA"
-        },
+        "query": "label_values(ipmi_sensor, host)",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
@@ -329,6 +397,11 @@
         "useTags": false
       },
       {
+        "current": {
+          "selected": false,
+          "text": "degrees_c",
+          "value": "degrees_c"
+        },
         "description": null,
         "error": null,
         "hide": 2,