------ BUGFIX ------

------ BUGZILLA ------

------ TRAC ------

------ IMPROVEMENT ------

------ CREATE ------

------ COMMENT ------
define paths for collectd.

diff --git a/karesansui/lib/collectd/config.py b/karesansui/lib/collectd/config.py
index 23929aa..bd6ce84 100644 (file)
--- a/karesansui/lib/collectd/config.py
+++ b/karesansui/lib/collectd/config.py
@@ -20,12 +20,29 @@ from karesansui.lib.conf import read_conf, write_conf
 from karesansui.lib.utils import uniq_sort
 from karesansui.lib.utils import preprint_r
 from karesansui.lib.collectd.utils import create_plugin_selector, plugin_selector_to_dict
-from karesansui.lib.const import COUNTUP_DATABASE_PATH, COLLECTD_LOG_DIR
+from karesansui.lib.const import VENDOR_PREFIX, KARESANSUI_PREFIX, \
+                                 VENDOR_DATA_DIR, \
+                                 COUNTUP_DATABASE_PATH, COLLECTD_LOG_DIR
+
+from karesansui.lib.parser.collectdplugin import PARSER_COLLECTD_PLUGIN_DIR
 
 MODULE = "collectd"
 
 DictOp = None
 
+DEFAULT_KARESANSUI_CONF = "/etc/opt/karesansui/application.conf"
+
+COLLECTD_PLUGIN_DIR = "%s/lib64/collectd" % VENDOR_PREFIX
+if os.path.exists(COLLECTD_PLUGIN_DIR):
+    COLLECTD_PLUGIN_DIR = "%s/lib/collectd" % VENDOR_PREFIX
+
+COLLECTD_SHARE_DIR         = "%s/share/collectd" % VENDOR_PREFIX
+KARESANSUI_PYTHON_PATH     = "%s/lib/python" % KARESANSUI_PREFIX
+COLLECTD_PYTHON_MODULE_DIR = "%s/karesansui/lib/collectd" % KARESANSUI_PYTHON_PATH
+
+COLLECTD_DATA_DIR          = "%s/collectd" % VENDOR_DATA_DIR
+COLLECTD_PID_FILE          = "/var/run/hde-collectd.pid"
+
 def _get_collectd_config(webobj=None, host=None):
     modules = ["collectd","collectdplugin"]
 
@@ -251,7 +268,7 @@ def switch_python_plugin(flag=True, dop=None, webobj=None, host=None):
     _keys = [configName,"Plugin","python"]
 
     keys = _keys + ["ModulePath"]
-    value = "\"/opt/karesansui/lib/python/karesansui/lib/collectd\""
+    value = "\"%s\"" % COLLECTD_PYTHON_MODULE_DIR
     dop.cdp_set("collectdplugin",keys,value,multiple_file=True)
 
     keys = _keys + ["Encoding"]
@@ -292,7 +309,7 @@ def switch_python_plugin(flag=True, dop=None, webobj=None, host=None):
     try:
         envs.append("KARESANSUI_CONF=%s" % os.environ["KARESANSUI_CONF"])
     except:
-        envs.append("KARESANSUI_CONF=%s" % "/etc/opt/karesansui/application.conf")
+        envs.append("KARESANSUI_CONF=%s" % DEFAULT_KARESANSUI_CONF)
         pass
     value = "\"" + "\" \"".join(envs) + "\""
     dop.cdp_set("collectdplugin",keys,value,multiple_file=True)
@@ -406,7 +423,7 @@ def switch_logfile_plugin(flag=True, dop=None, webobj=None, host=None):
     dop.cdp_set("collectdplugin",keys,value,multiple_file=True)
 
     keys = _keys + ["File"]
-    value = "\"/var/log/hde-collectd/collectd.log\""
+    value = "\"%s/collectd.log\"" % COLLECTD_LOG_DIR
     dop.cdp_set("collectdplugin",keys,value,multiple_file=True)
 
     keys = _keys + ["PrintSeverity"]
@@ -463,7 +480,7 @@ def switch_rrdtool_plugin(flag=True, dop=None, webobj=None, host=None):
     _keys = [configName,"Plugin","rrdtool"]
 
     keys = _keys + ["DataDir"]
-    value = "\"/var/opt/hde/collectd\""
+    value = "\"%s\"" % COLLECTD_DATA_DIR
     dop.cdp_set("collectdplugin",keys,value,multiple_file=True)
 
     keys = _keys + ["CacheTimeout"]
@@ -523,7 +540,7 @@ def switch_rrdcached_plugin(flag=True, dop=None, webobj=None, host=None):
     _keys = [configName,"Plugin","rrdcached"]
 
     keys = _keys + ["DataDir"]
-    value = "\"/var/opt/hde/collectd\""
+    value = "\"%s\"" % COLLECTD_DATA_DIR
     dop.cdp_set("collectdplugin",keys,value,multiple_file=True)
 
     keys = _keys + ["DaemonAddress"]
@@ -1364,11 +1381,11 @@ def initialize_collectd_settings(dop=None, webobj=None, host=None, force=False,
     default_params = {
               "Hostname"   :"\"localhost\"",
               "FQDNLookup" :"true",
-              "BaseDir"    :"\"/var/opt/hde/collectd\"",
-              "PIDFile"    :"\"/var/run/hde-collectd.pid\"",
-              "PluginDir"  :"\"/opt/hde/lib64/collectd\"",
-              "TypesDB"    :"\"/opt/hde/share/collectd/types.db\"",
-              "Include"    :"\"/etc/opt/hde/collectd.d/*.conf\"",
+              "BaseDir"    :"\"%s\"" % COLLECTD_DATA_DIR,
+              "PIDFile"    :"\"%s\"" % COLLECTD_PID_FILE,
+              "PluginDir"  :"\"%s\"" % COLLECTD_PLUGIN_DIR,
+              "TypesDB"    :"\"%s/types.db\"" % COLLECTD_SHARE_DIR,
+              "Include"    :"\"%s/*.conf\"" % PARSER_COLLECTD_PLUGIN_DIR,
               "Interval"   :"3",
               "ReadThreads":"5",
               }

diff --git a/karesansui/lib/collectd/notification.py b/karesansui/lib/collectd/notification.py
index a6df9e4..450cdbf 100644 (file)
--- a/karesansui/lib/collectd/notification.py
+++ b/karesansui/lib/collectd/notification.py
@@ -32,7 +32,7 @@ Example: collectd.d/python.conf
         Import "notification"
 
         <Module "notification">
-                CountupDBPath "/var/tmp/notify_count.db"
+                CountupDBPath "/var/opt/karesansui/notify_count.db"
                 LogFile "/var/log/hde-collectd/notification.log"
                 # 0 none, 1 errors, 2 informations, 4 debug, 7 all
                 LogLevel 1