Support optionally disabling the table and index charts.

diff --git a/conf.d/python.d/postgres.conf b/conf.d/python.d/postgres.conf
index 903ea53d1abc8547e591c8082bf62e9e6c6de120..392c3fef009125b55cfb9844ae2e87312d66694a 100644 (file)
--- a/conf.d/python.d/postgres.conf
+++ b/conf.d/python.d/postgres.conf
@@ -63,6 +63,10 @@
 #     host: localhost
 #     port: 5432
 #
+# Additionally, the following options allow selective disabling of charts
+#
+#     table_stats: false
+#     index_stats: false
 # ----------------------------------------------------------------------
 
 # Attempt to connect via the Unix socket as the postgres user.

diff --git a/python.d/postgres.chart.py b/python.d/postgres.chart.py
index 7f0e6f64b6850101c09ef198255b0e2c0be8cb42..bd1d1008669006f2e19fe1ec6220ff318f7d04c1 100644 (file)
--- a/python.d/postgres.chart.py
+++ b/python.d/postgres.chart.py
@@ -199,19 +199,22 @@ class Service(SimpleService):
         super(self.__class__, self).__init__(configuration=configuration, name=name)
         self.order = ORDER
         self.definitions = CHARTS
+        self.table_stats = configuration.pop('table_stats', True)
+        self.index_stats = configuration.pop('index_stats', True)
         self.configuration = configuration
         self.connection = None
         self.data = {}
         self.old_data = {}
         self.databases = set()
 
-    def connect(self):
+    def _connect(self):
         params = dict(user='postgres',
                       database=None,
                       password=None,
                       host='localhost',
                       port=5432)
         params.update(self.configuration)
+
         if not self.connection:
             self.connection = psycopg2.connect(**params)
             self.connection.set_isolation_level(extensions.ISOLATION_LEVEL_AUTOCOMMIT)
@@ -219,23 +222,15 @@ class Service(SimpleService):
 
     def check(self):
         try:
-            self.connect()
-            self.discover_databases()
+            self._connect()
+            self._discover_databases()
             self._create_definitions()
             return True
         except Exception as e:
             self.error(e)
             return False
 
-    def _create_definitions(self):
-        for database_name in self.databases:
-            self.databases.add(database_name)
-            for chart_template_name in list(CHARTS):
-                if chart_template_name.startswith('db_stat'):
-                    self._add_database_stat_chart(chart_template_name, database_name)
-            self._add_database_lock_chart(database_name)
-
-    def discover_databases(self):
+    def _discover_databases(self):
         cursor = self.connection.cursor()
         cursor.execute("""
             SELECT datname
@@ -245,6 +240,14 @@ class Service(SimpleService):
         self.databases = set(r[0] for r in cursor)
         cursor.close()
 
+    def _create_definitions(self):
+        for database_name in self.databases:
+            self.databases.add(database_name)
+            for chart_template_name in list(CHARTS):
+                if chart_template_name.startswith('db_stat'):
+                    self._add_database_stat_chart(chart_template_name, database_name)
+            self._add_database_lock_chart(database_name)
+
     def _add_database_stat_chart(self, chart_template_name, database_name):
         chart_template = CHARTS[chart_template_name]
         chart_name = "{}_{}".format(database_name, chart_template_name)
@@ -290,7 +293,7 @@ class Service(SimpleService):
                 self.definitions[chart_name]['lines'].append([lock_id, label, 'absolute'])
 
     def _get_data(self):
-        self.connect()
+        self._connect()
 
         cursor = self.connection.cursor(cursor_factory=DictCursor)
         self.add_stats(cursor)
@@ -301,8 +304,10 @@ class Service(SimpleService):
     def add_stats(self, cursor):
         self.add_database_stats(cursor)
         self.add_backend_stats(cursor)
-        self.add_index_stats(cursor)
-        self.add_table_stats(cursor)
+        if self.index_stats:
+            self.add_index_stats(cursor)
+        if self.table_stats:
+            self.add_table_stats(cursor)
         self.add_lock_stats(cursor)
         self.add_bgwriter_stats(cursor)