From 64a7270ca2bb1dd080af7f49995be3ba8bf276c8 Mon Sep 17 00:00:00 2001 From: Ilya Date: Fri, 10 Mar 2017 13:26:31 +0900 Subject: [PATCH] MySQLService: queries can be defined in the module config file --- python.d/python_modules/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py index 0482b9b8..34811c24 100644 --- 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) -- 2.39.2