Change version around

 * change version
 * add version get method

diff --git a/karesansui/__init__.py b/karesansui/__init__.py
index 8b45926..019b9bb 100644 (file)
--- a/karesansui/__init__.py
+++ b/karesansui/__init__.py
@@ -17,10 +17,11 @@
           Kazuya Hayashi <kazuya@karesansui-project.info>
           Taizo ITO <taizo@karesansui-project.info>
           Kazuhiro Ogura <rgoura@karesansui-project.info>
+          Keisuke Fukawa <keisuke@karesansui-project.info>
 """
 
 __author__ = "Kei Funagayama <kei@karesansui-project.info>"
-__version__ = '1.1'
+__version__ = '1.2'
 __release__ = '0'
 __app__ = 'karesansui'
 

diff --git a/karesansui/gadget/hostby1watch.py b/karesansui/gadget/hostby1watch.py
index 7ce803e..bd5b217 100644 (file)
--- a/karesansui/gadget/hostby1watch.py
+++ b/karesansui/gadget/hostby1watch.py
@@ -29,7 +29,8 @@ from karesansui.db.access.watch import \
 from karesansui.db.access.watchdetail import \
     new as wd_new, save as wd_save
 
-from karesansui.lib.utils import is_param
+from karesansui.lib.utils import is_param, get_karesansui_version, \
+    get_collectd_version
 
 from karesansui.lib.collectd.utils import  create_plugin_selector, \
     create_value_selector
@@ -199,8 +200,8 @@ class HostBy1Watch(Rest):
                        name=self.input.watch_name,
                        plugin=plugin,
                        plugin_selector=plugin_selector,
-                       karesansui_version="1.2.0",
-                       collectd_version="4.9.1",
+                       karesansui_version=get_karesansui_version(),
+                       collectd_version=get_collectd_version(),
                        is_deleted=False,
                        )
         w_save(self.orm, _watch)

diff --git a/karesansui/lib/collectd/utils.py b/karesansui/lib/collectd/utils.py
index 4262f3a..893cbbf 100644 (file)
--- a/karesansui/lib/collectd/utils.py
+++ b/karesansui/lib/collectd/utils.py
@@ -14,7 +14,10 @@
 import karesansui
 from karesansui import KaresansuiLibException
 from karesansui.lib.utils import comma_split
+from karesansui.lib.const import COLLECTD_VERSION
 
+def get_collectd_version():
+    return COLLECTD_VERSION
 
 def create_plugin_selector(plugin_instance=None, type=None, type_instance=None):
     selector = ""

diff --git a/karesansui/lib/const.py b/karesansui/lib/const.py
index 96a5a7c..7b78cc5 100644 (file)
--- a/karesansui/lib/const.py
+++ b/karesansui/lib/const.py
@@ -306,6 +306,8 @@ BUS_KVM_TYPE = {"IDE":"ide",
 BUS_XEN_TYPE = {"XEN":"xen",}
 
 # Collectd
+COLLECTD_VERSION = "4.9.1"
+
 COLLECTD_PLUGIN_CPU = "cpu"
 COLLECTD_PLUGIN_DF = "df"
 COLLECTD_PLUGIN_DISK = "disk"

diff --git a/karesansui/lib/utils.py b/karesansui/lib/utils.py
index e47b631..9903592 100644 (file)
--- a/karesansui/lib/utils.py
+++ b/karesansui/lib/utils.py
@@ -2470,3 +2470,7 @@ def php_array_to_python_dict(string=""):
             raise
 
     return retval
+
+def get_karesansui_version():
+    import karesansui
+    return karesansui.__version__ + '.' + karesansui.__release__