updated configuration file

diff --git a/conf.d/python.d.conf b/conf.d/python.d.conf
index c70f8599b79f693804f10cb2f05c12fc8004e5cc..b467221116534cd753dbfae008c03284c0345ee0 100644 (file)
--- a/conf.d/python.d.conf
+++ b/conf.d/python.d.conf
@@ -1,11 +1,5 @@
 # This is the configuration for python.d.plugin
 
-# It sets custom configuration directory for python modules
-# plugins_config_dir=
-
-# This is a directory with python modules
-# plugins_dir=
-
 # By default python.d.plugin enables all modules stored in python.d
 # Modules can be disabled with setting "module_name = no"
 example: no

diff --git a/plugins.d/python.d.plugin b/plugins.d/python.d.plugin
index 5a0766781e639f23e55fade7e463358f7e88f9cb..a714dbda1defbed1b55fdef4c803b19e3d8ab304 100755 (executable)
--- a/plugins.d/python.d.plugin
+++ b/plugins.d/python.d.plugin
@@ -527,8 +527,6 @@ def run():
                 continue
             if v is False:
                 disabled.append(k)
-    else:
-        modules_conf = CONFIG_DIR + "python.d/"
 
     # parse passed command line arguments
     out = parse_cmdline(MODULES_DIR, *sys.argv)
@@ -537,7 +535,7 @@ def run():
         interval = out['interval']
 
     # run plugins
-    charts = PythonCharts(interval, modules, MODULES_DIR, modules_conf, disabled)
+    charts = PythonCharts(interval, modules, MODULES_DIR, CONFIG_DIR + "python.d/", disabled)
     charts.check()
     charts.create()
     charts.update()