projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for bug 1433 - Exception when checking kafka status
[osm/MON.git]
/
osm_mon
/
dashboarder
/
dashboarder.py
diff --git
a/osm_mon/dashboarder/dashboarder.py
b/osm_mon/dashboarder/dashboarder.py
index
30f27d1
..
a6ff5bc
100644
(file)
--- a/
osm_mon/dashboarder/dashboarder.py
+++ b/
osm_mon/dashboarder/dashboarder.py
@@
-1,6
+1,6
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
-# Copyright 20
18
Whitestack, LLC
+# Copyright 20
21
Whitestack, LLC
# *************************************************************
# This file is part of OSM Monitoring module
# *************************************************************
# This file is part of OSM Monitoring module
@@
-18,12
+18,12
@@
# License for the specific language governing permissions and limitations
# under the License.
# For those usages not covered by the Apache License, Version 2.0 please
# License for the specific language governing permissions and limitations
# under the License.
# For those usages not covered by the Apache License, Version 2.0 please
-# contact:
bdiaz
@whitestack.com or glavado@whitestack.com
+# contact:
fbravo
@whitestack.com or glavado@whitestack.com
##
##
+
import logging
import time
import socket
import logging
import time
import socket
-import peewee
import asyncio
from osm_mon.dashboarder.service import DashboarderService
import asyncio
from osm_mon.dashboarder.service import DashboarderService
@@
-61,7
+61,6
@@
class Dashboarder:
log.debug("Received message from kafka for deleting user")
user = values['username']
self.service.delete_grafana_user(user)
log.debug("Received message from kafka for deleting user")
user = values['username']
self.service.delete_grafana_user(user)
- log.info("Grafana user deleted: %s", user)
elif topic == "users" and key == "edited":
log.debug("Received message from kafka for associating user to team")
user_id = values["_id"]
elif topic == "users" and key == "edited":
log.debug("Received message from kafka for associating user to team")
user_id = values["_id"]
@@
-96,12
+95,9
@@
class Dashboarder:
try:
self.create_dashboards()
time.sleep(int(self.conf.get('dashboarder', 'interval')))
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")
def create_dashboards(self):
self.service.create_dashboards()
except Exception:
log.exception("Error creating dashboards")
def create_dashboards(self):
self.service.create_dashboards()
- log.debug('
I just called the dashboarder service
!')
+ log.debug('
Dashboarder Service > create_dashboards called
!')