Fix for bug 1396 - Error creating dashboard with same name in two different users

[osm/MON.git] / osm_mon / dashboarder / dashboarder.py

diff --git a/osm_mon/dashboarder/dashboarder.py b/osm_mon/dashboarder/dashboarder.py
index bb2935a..22aa1bf 100644 (file)
--- a/osm_mon/dashboarder/dashboarder.py
+++ b/osm_mon/dashboarder/dashboarder.py
@@ -23,18 +23,63 @@
 import logging
 import time
 import socket
-import peewee
+import asyncio
 
 from osm_mon.dashboarder.service import DashboarderService
 from osm_mon.core.config import Config
+from osm_mon.core.message_bus_client import MessageBusClient
 
 log = logging.getLogger(__name__)
 
 
 class Dashboarder:
-    def __init__(self, config: Config):
+    def __init__(self, config: Config, loop=None):
         self.conf = config
         self.service = DashboarderService(config)
+        if not loop:
+            loop = asyncio.get_event_loop()
+        self.loop = loop
+        self.msg_bus = MessageBusClient(config)
+
+    # run consumer for grafana user management
+    def run(self):
+        self.loop.run_until_complete(self.start())
+
+    async def start(self):
+        topics = ["users", "project"]
+        await self.msg_bus.aioread(topics, self._user_msg)
+
+    async def _user_msg(self, topic, key, values):
+        log.debug("Message from kafka bus received: topic: %s and values: %s and key: %s", topic, values, key)
+        try:
+            if topic == "users" and key == "created":
+                log.debug("Received message from kafka for creating user")
+                user = values['username']
+                self.service.create_grafana_user(user)
+            elif topic == "users" and key == "deleted":
+                log.debug("Received message from kafka for deleting user")
+                user = values['username']
+                self.service.delete_grafana_user(user)
+            elif topic == "users" and key == "edited":
+                log.debug("Received message from kafka for associating user to team")
+                user_id = values["_id"]
+                project_data = values["changes"]["project_role_mappings"]
+                self.service.create_grafana_team_member(project_data, user_id)
+            elif topic == "project" and key == "created":
+                log.debug("Received message from kafka for creating team")
+                team_name = values["name"]
+                self.service.create_grafana_team(team_name)
+            elif topic == "project" and key == "deleted":
+                log.debug("Received message from kafka for deleting team")
+                project_name = values["name"]
+                self.service.delete_grafana_team(project_name)
+            elif topic == "project" and key == "edited":
+                log.debug("Received message from kafka for team name update")
+                project_old_name = values["original"]["name"]
+                project_new_name = values["changes"]["name"]
+                self.service.update_grafana_team(project_new_name, project_old_name)
+        except Exception:
+            log.exception("Exception processing message: ")
 
     def dashboard_forever(self):
         log.debug('dashboard_forever')
@@ -49,9 +94,6 @@ class Dashboarder:
             try:
                 self.create_dashboards()
                 time.sleep(int(self.conf.get('dashboarder', 'interval')))
-            except peewee.PeeweeException:
-                log.exception("Database error consuming message: ")
-                raise
             except Exception:
                 log.exception("Error creating dashboards")