Frontend team

mercury/forms.py

@@ -51,7 +51,7 @@ class Meta:
         fields = ["gf_name", "gf_host", "gf_token"]
         labels = {
             "gf_name": "Label (e.g. remote, local)",
-            "gf_host": "Hostname (e.g. https://abc123.grafana.net, localhost:3000)",
+            "gf_host": "Hostname (e.g. https://abc123.grafana.net, http://localhost:3000)",
             "gf_token": "API Token",
         }
 

mercury/grafanaAPI/grafana_api.py

@@ -31,7 +31,7 @@ def __init__(self, gf_config=None):
         if gf_config:
             self.hostname = gf_config.gf_host
             self.api_token = gf_config.gf_token
-            self.database_hostname = gf_config.gf_host
+            self.database_hostname = gf_config.gf_db_host
             self.database_name = gf_config.gf_db_name
             self.database_username = gf_config.gf_db_username
             self.database_password = gf_config.gf_db_pw
@@ -85,6 +85,23 @@ def validate_credentials(self):
 
         return True
 
+    def get_dashboard_by_event_name(self, event_name):
+        """
+        :param event_name: Event name used for the target dashboard.
+        :return: Returns True if a dashboard was found with this name, False otherwise.
+        """
+        # If there are spaces in the name, the GF API will replace them with dashes
+        # to generate the "slug". A slug can be used to query the API.
+        endpoint = os.path.join(
+            self.hostname, "api/dashboards/db", event_name.lower().replace(" ", "-"),
+        )
+        response = requests.get(url=endpoint, auth=("api_key", self.api_token))
+
+        if "dashboard" in response.json():
+            return response.json()
+        else:
+            return None
+
     def get_dashboard_with_uid(self, uid):
         """
         :param uid: uid of the target dashboard
@@ -313,18 +330,19 @@ def delete_datasource_by_name(self, name):
         except KeyError:
             return False
 
-    def add_panel(self, sensor, event, dashboard_uid):
+    def add_panel(self, sensor, event):
         """
 
         Adds a new panel for the sensor based on its SensorType.
         The database for the new panel will be whichever database is currently in
-        GFConfig. The panel will be placed in the next available slot on the dashboard.
+        GFConfig. The dashboard for the new panel will be the dashboard with the
+        same name as the event.
+        The panel will be placed in the next available slot on the dashboard.
 
         :param sensor: AGSensor object for this panel (panel will only display sensor
          data for this sensor type.
         :param event: Event object for this panel (panel will only display sensor
         data for this event)
-        :param dashboard_uid: UID of the target dashboard
 
         :return: New panel with SQL query based on sensor type
         will be added to dashboard.
@@ -338,11 +356,11 @@ def add_panel(self, sensor, event, dashboard_uid):
         for field in field_dict:
             field_array.append(field)
 
-        # Retrieve current dashboard structure
-        dashboard_info = self.get_dashboard_with_uid(dashboard_uid)
+        # Find dashboard uid for event
+        dashboard_info = self.get_dashboard_by_event_name(event.name)
 
         if dashboard_info is None:
-            raise ValueError("Dashboard uid not found.")
+            raise ValueError("Dashboard not found for this event.")
 
         # Retrieve current panels
         try:

mercury/migrations/0018_remove_gfconfig_gf_db_grafana_name.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.10 on 2020-03-30 16:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mercury", "0017_agevent"),
+    ]
+
+    operations = [
+        migrations.RemoveField(model_name="gfconfig", name="gf_db_grafana_name",),
+    ]

mercury/models.py

@@ -15,7 +15,6 @@ class GFConfig(models.Model):
     )  # token only, without the prefix "Bearer "
     gf_dashboard_uid = models.CharField(max_length=64)
     gf_db_host = models.CharField(max_length=128)
-    gf_db_grafana_name = models.CharField(max_length=64)
     gf_db_name = models.CharField(max_length=64)
     gf_db_username = models.CharField(max_length=64)
     gf_db_pw = models.CharField(max_length=256)

mercury/static/mercury/js/sensor.js

@@ -130,6 +130,9 @@ function selectView() {
         editSensorsButton.style.backgroundColor = 'var(--light-accent)';
         editSensorTypesButton.style.backgroundColor = 'var(--green)';
     }
+    else {
+        displayCurrentSensors()
+    }
 }
 
 function displayCurrentSensors() {