X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmunin-plugins-contrib.git;a=blobdiff_plain;f=xen.patch;fp=xen.patch;h=0000000000000000000000000000000000000000;hp=88a0826a26b5959f0110b03b4935b6fca5436341;hb=2394ea8f5377d743cb122c6889808685bf9b5fed;hpb=d50a79dc9c2999e07f25a3f53686f05305cc26bb

diff --git a/xen.patch b/xen.patch
deleted file mode 100644
index 88a0826..0000000
--- a/xen.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen munin-monitoring-contrib/plugins/virtualization/xen
---- munin-monitoring-contrib.orig/plugins/virtualization/xen	2015-09-11 07:54:03.000000000 +0000
-+++ munin-monitoring-contrib/plugins/virtualization/xen	2015-10-14 20:47:08.051042000 +0000
-@@ -18,11 +18,11 @@
- statefile="/var/lib/munin/plugin-state/munin-plugin-xen.state"
- 
- if [ "$1" = "autoconf" ]; then
--        if which xm > /dev/null ; then
-+        if which xl > /dev/null ; then
-                 echo yes
-                 exit 0
-         fi
--        echo "no (xm not found)"
-+        echo "no (xl not found)"
-         exit 1
- fi
- 
-@@ -39,7 +39,7 @@
-         echo 'graph_category Virtualization'
-         echo 'graph_info This graph shows how many percent of the CPU time was used by each domain'
- 
--	xm list | grep -v "^Name .* Time(s)$" | \
-+	xl list | grep -v "^Name\s.*\sTime(s)$" | \
-         while read name domid mem cpu state time console; do
-                 name=`echo $name | sed -e"s/[-.]/_/g"`
- 		TEST=`less $statefile | grep "^${name}$" | wc -l`
-@@ -66,7 +66,7 @@
-         exit 0
- fi
- 
--xm list | grep -v "^Name .* Time(s)$" | \
-+xl list | grep -v "^Name\s.*\sTime(s)$" | \
- while read name domid mem cpu state time console; do
-         name=`echo $name | sed -e "s/[-.]/_/g"`
- 	# only seconds
-diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_cpu_v2 munin-monitoring-contrib/plugins/virtualization/xen_cpu_v2
---- munin-monitoring-contrib.orig/plugins/virtualization/xen_cpu_v2	2015-09-11 07:54:03.000000000 +0000
-+++ munin-monitoring-contrib/plugins/virtualization/xen_cpu_v2	2015-10-14 20:47:08.052042000 +0000
-@@ -25,10 +25,10 @@
- use POSIX;
- 
- # Define where to find xm tools
--my $XM = '/usr/sbin/xm';
-+my $XM = '/usr/sbin/xl';
- my $XMTOP = '/usr/sbin/xentop';
- my $curtime = time();
--my $basename = `/usr/bin/basename $0`; chop ($basename);
-+my $basename = `/bin/basename $0`; chop ($basename);
- my $TEMPFILE = "/tmp/$basename";
- 
- my $debug = 0;
-diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_memory munin-monitoring-contrib/plugins/virtualization/xen_memory
---- munin-monitoring-contrib.orig/plugins/virtualization/xen_memory	2015-09-11 07:54:03.000000000 +0000
-+++ munin-monitoring-contrib/plugins/virtualization/xen_memory	2015-10-14 20:47:08.052042000 +0000
-@@ -12,14 +12,14 @@
- #     autoconf  (optional - used by munin-config)
- #
- 
--XM='/usr/sbin/xm'
-+XM='/usr/sbin/xl'
- 
- if [ "$1" = "autoconf" ]; then
-         if [ -e $XM ]; then
-                 echo yes
-                 exit 0
-         fi
--        echo "no (xm not found)"
-+        echo "no (xl not found)"
-         exit 1
- fi
- 
-Only in munin-monitoring-contrib/plugins/virtualization: xen.orig
-diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_traffic_ munin-monitoring-contrib/plugins/virtualization/xen_traffic_
---- munin-monitoring-contrib.orig/plugins/virtualization/xen_traffic_	2015-09-11 07:54:03.000000000 +0000
-+++ munin-monitoring-contrib/plugins/virtualization/xen_traffic_	2015-10-14 20:47:08.052042000 +0000
-@@ -11,10 +11,10 @@
- NAME=$( echo $DOMAIN | sed -e's/-/_/g' ) 
- 
- if [ "$1" = "autoconf" ]; then
--    if which xm > /dev/null ; then
-+    if which xl > /dev/null ; then
-         echo yes
-     else
--        echo "no (xm not found)"
-+        echo "no (xl not found)"
-         exit 1
-     fi
-     if [ -r /proc/net/dev ]; then
-@@ -27,7 +27,7 @@
- fi
- 
- if [ "$1" = "suggest" ]; then
--    xm list | awk '{print $1}' | egrep -v "^(Name|Domain-0)"
-+    xl list | awk '{print $1}' | egrep -v "^(Name|Domain-0)"
-     exit 0
- fi
- 
-@@ -47,7 +47,7 @@
-     exit 0
- fi
- 
--dev=$( xm network-list $DOMAIN | egrep "^[0-9]+" | sed 's@^.*vif/\([0-9]*\)/\([0-9]*\).*$@vif\1.\2@')
-+dev=$( xl network-list $DOMAIN | egrep "^[0-9]+" | sed 's@^.*vif/\([0-9]*\)/\([0-9]*\).*$@vif\1.\2@')
- 
- awk -v interface="$dev" \
-     'BEGIN { gsub(/\./, "\\.", interface) } \
-diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_traffic_all munin-monitoring-contrib/plugins/virtualization/xen_traffic_all
---- munin-monitoring-contrib.orig/plugins/virtualization/xen_traffic_all	2015-09-11 07:54:03.000000000 +0000
-+++ munin-monitoring-contrib/plugins/virtualization/xen_traffic_all	2015-10-14 20:49:36.783042000 +0000
-@@ -10,10 +10,10 @@
- #%# capabilities=autoconf
- 
- if [ "$1" = "autoconf" ]; then
--    if which xm > /dev/null ; then
-+    if which xl > /dev/null ; then
-         echo yes
-     else
--        echo "no (xm not found)"
-+        echo "no (xl not found)"
-         exit 1
-     fi
-     if [ -r /proc/net/dev ]; then
-@@ -30,7 +30,7 @@
-     echo 'graph_vlabel bits received (-) / sent (+) per ${graph_period}'
-     echo 'graph_args --base 1024 -l 0'
-     echo 'graph_category Virtualization'
--    DOMAINS=$(xm list | awk '{print $1}' | egrep -v "^(Name|Domain-0)")
-+    DOMAINS=$(xl list | awk '{print $1}' | egrep -v "^(Name|Domain-0|\(null)")
-     for dom in $DOMAINS; do
-         name=$( echo $dom | tr .- __ )
-         #echo $name"UP.label $name"
-@@ -48,11 +48,11 @@
-     exit 0
- fi
- 
--DOMAINS=$(xm list | awk '{print $1}' | egrep -v "^(Name|Domain-0)")
-+DOMAINS=$(xl list | awk '{print $1}' | egrep -v "^(Name|Domain-0|\(null)")
- for dom in $DOMAINS; do
--		dev=$( xm list $dom --long | awk '/vifname / { print $2 }' | sed 's/)//' )
-+		dev=$( xl list $dom --long | awk '/vifname / { print $2 }' | sed 's/)//' )
- 		if [ "$dev" = "" ]; then
--	    dev=$( xm network-list $dom |\
-+	    dev=$( xl network-list $dom |\
- 	        egrep "^[0-9]+" | sed 's@^.*vif/\([0-9]*\)/\([0-9]*\).*$@vif\1.\2@')
- 		fi
-     name=$( echo $dom | tr .- __ ) 
-diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_vbd munin-monitoring-contrib/plugins/virtualization/xen_vbd
---- munin-monitoring-contrib.orig/plugins/virtualization/xen_vbd	2015-09-11 07:54:03.000000000 +0000
-+++ munin-monitoring-contrib/plugins/virtualization/xen_vbd	2015-10-14 20:47:08.054042000 +0000
-@@ -13,7 +13,7 @@
- #%# capabilities=autoconf
- 
- # Location of xm tools
--$XM = '/usr/sbin/xm';
-+$XM = '/usr/sbin/xl';
- $XMTOP = '/usr/sbin/xentop';
- 
- # ah, parameters coming in 
-@@ -48,6 +48,7 @@
-                 
-                 @domains = `$XM list`;
-                 shift(@domains); # we don't need the header line
-+                shift(@domains); # we don't need the header line
-                 
-                 foreach $domain ( @domains )
-                 {
-@@ -90,9 +91,9 @@
- @stats = split (/\n/, pop(@chunks));
- 
- shift(@stats);
--shift(@stats);
--shift(@stats);
--shift(@stats);
-+#shift(@stats);
-+#shift(@stats);
-+#shift(@stats);
- 
- foreach $domain (@stats)
- {