MySQLService: queries can be defined in the module config file

diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
index 0482b9b8059de1c344142118e4f24e861184c091..34811c2477c239494cfdf99fa74145bfcaad0a86 100644 (file)
--- a/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@ -947,7 +947,7 @@ class MySQLService(SimpleService):
         SimpleService.__init__(self, configuration=configuration, name=name)
         self.__connection = None
         self.conn_properties = dict()
-        self.queries = dict()
+        self.queries = self.configuration.get('queries', dict())
 
     def __connect(self):
         try:
@@ -986,7 +986,7 @@ class MySQLService(SimpleService):
                 return all([isinstance(query, str),
                             query.startswith(('SELECT', 'select', 'SHOW', 'show'))])
 
-            if isinstance(raw_queries, dict) and raw_queries:
+            if hasattr(raw_queries, 'keys') and raw_queries:
                 valid_queries = dict([(n, q) for n, q in raw_queries.items() if is_valid_query(q)])
                 bad_queries = set(raw_queries) - set(valid_queries)