Merged changes and fixed python xen bindings

diff --git a/debian/changelog b/debian/changelog
index 6e8a7bb..dab529f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,20 @@
-xvm-munin-config (0.0.14dvorak42) precise; urgency=low
+xvm-munin-config (0.0.15) precise; urgency=low
+
+  * Added fix for python xen bindings to host xen_cpu script.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Thu, 20 Jun 2013 14:21:09 -0400
+
+xvm-munin-config (0.0.14.1~dvorak42) precise; urgency=low
 
   * Bumped version for precise-dev.
 
  -- Steven Valdez <dvorak42@mit.edu>  Mon, 17 Jun 2013 20:43:37 -0400
 
-xvm-munin-config (0.0.14~dvorak) precise; urgency=low
+xvm-munin-config (0.0.14~dvorak42) unstable; urgency=low
 
-  * Added ::ffff:$IP to list of allowed IPs
+  * Added ::ffff:$IP mapped IPv4 address to allowed list.
 
- -- Steven Valdez <dvorak42@mit.edu>  Mon, 17 Jun 2013 19:54:55 -0400
+ -- Steven Valdez <dvorak42@mit.edu>  Mon, 17 Jun 2013 20:07:02 -0400
 
 xvm-munin-config (0.0.14) unstable; urgency=low
 

diff --git a/host/usr/share/xvm-munin-host-config/plugins/xen_cpu b/host/usr/share/xvm-munin-host-config/plugins/xen_cpu
index 06850cf..988ad0f 100755 (executable)
--- a/host/usr/share/xvm-munin-host-config/plugins/xen_cpu
+++ b/host/usr/share/xvm-munin-host-config/plugins/xen_cpu
@@ -1,5 +1,6 @@
 #!/usr/bin/python
-
+import sys
+sys.path.append('/usr/lib/xen-default/lib/python/')
 from xen.xm.main import SERVER_LEGACY_XMLRPC, SERVER_XEN_API, parseServer, parseAuthentication
 from xen.xend import sxp
 import atexit

diff --git a/templatize-munin-config b/templatize-munin-config
index 72ccf45..af362d2 100755 (executable)
--- a/templatize-munin-config
+++ b/templatize-munin-config
@@ -21,7 +21,7 @@ END {
   print <<'EOF';
 % for host in cfg.get('monitoring', []):
 allow ^${host.ip.replace('.', '\.')}$
-allow allow ^::ffff:${host.ip.replace('.', '\.')}$
+allow ^::ffff:${host.ip.replace('.', '\.')}$
 % endfor
 EOF
 }