From: Steven Valdez Date: Thu, 20 Jun 2013 18:22:42 +0000 (-0400) Subject: Merged changes and fixed python xen bindings X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-munin-config.git/commitdiff_plain/cb8a19dba620492a95d321a36a473d2048e45eb4?hp=5fdb887ce03ea45d8d0676b632bb67ee94076d24 Merged changes and fixed python xen bindings --- diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2cc73e1 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +all: munin-node.conf.xvm.mako + +munin-node.conf.xvm.mako: + ./templatize-munin-config < /etc/munin/munin-node.conf > $@ + +clean: + rm -f munin-node.conf.xvm.mako + +.PHONY: clean diff --git a/debian/changelog b/debian/changelog index a538b6c..dab529f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,21 +1,28 @@ -xvm-munin-config (0.0.14.1~dvorak42) precise; urgency=low +xvm-munin-config (0.0.15) precise; urgency=low - * Bumped version for precise-dev. + * Added fix for python xen bindings to host xen_cpu script. - -- Steven Valdez Mon, 17 Jun 2013 20:43:37 -0400 + -- Steven Valdez Thu, 20 Jun 2013 14:21:09 -0400 -xvm-munin-config (0.0.14~dvorak) precise; urgency=low +xvm-munin-config (0.0.14.1~dvorak42) precise; urgency=low - * Bumped version number. + * Bumped version for precise-dev. - -- Steven Valdez Mon, 17 Jun 2013 20:23:19 -0400 + -- Steven Valdez Mon, 17 Jun 2013 20:43:37 -0400 -xvm-munin-config (0.0.13~dvorak42) unstable; urgency=low +xvm-munin-config (0.0.14~dvorak42) unstable; urgency=low * Added ::ffff:$IP mapped IPv4 address to allowed list. -- Steven Valdez Mon, 17 Jun 2013 20:07:02 -0400 +xvm-munin-config (0.0.14) unstable; urgency=low + + * Switch to dh7 + * Bump standards version + + -- Alexander Chernyakhovsky Sat, 01 Jun 2013 15:02:55 -0400 + xvm-munin-config (0.0.13) unstable; urgency=low * Ensure that UUIDs begin with a letter and not a number, to work around diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 996e1da..61e9d4d 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: xvm-munin-config Section: servers Priority: extra Maintainer: SIPB XVM Project -Build-Depends: cdbs, debhelper (>= 5), config-package-dev, munin-node -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 7), config-package-dev (>= 5.0~), munin-node +Standards-Version: 3.9.3 Package: xvm-munin-host-config Architecture: all diff --git a/debian/rules b/debian/rules index 92796aa..3c8e24d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,3 @@ #!/usr/bin/make -f - -DEB_DIVERT_EXTENSION = .xvm - -DEB_DIVERT_FILES_xvm-munin-host-config += \ - /etc/munin/munin-node.conf.xvm -DEB_DIVERT_FILES_xvm-munin-master-config += \ - /etc/munin/munin-node.conf.xvm -DEB_DIVERT_FILES_xvm-munin-remote-config += \ - /etc/munin/munin-node.conf.xvm -DEB_DIVERT_FILES_xvm-munin-console-config += \ - /etc/munin/munin-node.conf.xvm - -include /usr/share/cdbs/1/rules/config-package.mk -include /usr/share/cdbs/1/rules/debhelper.mk - -common-build-indep:: debian/munin-node.conf.xvm.mako - -binary-post-install/%:: - mkdir -p $(DEB_DESTDIR)/etc/munin - touch $(DEB_DESTDIR)/etc/munin/munin-node.conf.xvm - -debian/munin-node.conf.xvm.mako: $(call debian_check_files,/etc/munin/munin-node.conf) - debian/transform_munin-node.conf.xvm.mako < $< > $@ - -clean:: - rm -f debian/munin-node.conf.xvm.mako +%: + dh $@ --with config-package diff --git a/debian/xvm-munin-console-config.displace b/debian/xvm-munin-console-config.displace new file mode 100644 index 0000000..bd6957b --- /dev/null +++ b/debian/xvm-munin-console-config.displace @@ -0,0 +1 @@ +/etc/munin/munin-node.conf.xvm diff --git a/debian/xvm-munin-host-config.displace b/debian/xvm-munin-host-config.displace new file mode 100644 index 0000000..bd6957b --- /dev/null +++ b/debian/xvm-munin-host-config.displace @@ -0,0 +1 @@ +/etc/munin/munin-node.conf.xvm diff --git a/debian/xvm-munin-master-config.displace b/debian/xvm-munin-master-config.displace new file mode 100644 index 0000000..bd6957b --- /dev/null +++ b/debian/xvm-munin-master-config.displace @@ -0,0 +1 @@ +/etc/munin/munin-node.conf.xvm diff --git a/debian/xvm-munin-remote-config.displace b/debian/xvm-munin-remote-config.displace new file mode 100644 index 0000000..bd6957b --- /dev/null +++ b/debian/xvm-munin-remote-config.displace @@ -0,0 +1 @@ +/etc/munin/munin-node.conf.xvm 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 --- 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/debian/transform_munin-node.conf.xvm.mako b/templatize-munin-config similarity index 100% rename from debian/transform_munin-node.conf.xvm.mako rename to templatize-munin-config