MySQLService: queries can be defined in the module config file
Ilya committed
Mar 10, 2017 at 13:26 UTC
64a7270ca2bb1dd080af7f49995be3ba8bf276c8
1 file changed
+2
-2
python.d/python_modules/base.py
+2
-2
@@ -947,7 +947,7 @@ class MySQLService(SimpleService):
947
SimpleService.__init__(self, configuration=configuration, name=name)
948
self.__connection = None
949
self.conn_properties = dict()
950
- self.queries = dict()
950
+ self.queries = self.configuration.get('queries', dict())
951
952
def __connect(self):
953
try:
@@ -986,7 +986,7 @@ class MySQLService(SimpleService):
986
return all([isinstance(query, str),
987
query.startswith(('SELECT', 'select', 'SHOW', 'show'))])
988
989
- if isinstance(raw_queries, dict) and raw_queries:
989
+ if hasattr(raw_queries, 'keys') and raw_queries:
990
valid_queries = dict([(n, q) for n, q in raw_queries.items() if is_valid_query(q)])
991
bad_queries = set(raw_queries) - set(valid_queries)
992