- really updated

diff --git a/xen.patch b/xen.patch
index 1503bf45fd0c156c06ec2091b3d71546f4672914..88a0826a26b5959f0110b03b4935b6fca5436341 100644 (file)
--- a/xen.patch
+++ b/xen.patch
@@ -1,5 +1,6 @@
---- munin.orig/plugins/virtualization/xen      2013-08-23 21:31:56.610001695 +0200
-+++ munin/plugins/virtualization/xen   2013-08-23 21:36:22.120001621 +0200
+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"
  
@@ -32,8 +33,9 @@
  while read name domid mem cpu state time console; do
          name=`echo $name | sed -e "s/[-.]/_/g"`
        # only seconds
---- munin.orig/plugins/virtualization/xen_cpu_v2       2013-08-23 21:31:56.613334934 +0200
-+++ munin/plugins/virtualization/xen_cpu_v2    2013-08-23 21:40:07.360001590 +0200
+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;
  
@@ -47,8 +49,9 @@
  my $TEMPFILE = "/tmp/$basename";
  
  my $debug = 0;
---- munin.orig/plugins/virtualization/xen_memory       2013-08-23 21:31:56.613334934 +0200
-+++ munin/plugins/virtualization/xen_memory    2013-08-23 21:41:06.290001570 +0200
+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)
  #
@@ -66,8 +69,10 @@
          exit 1
  fi
  
---- munin.orig/plugins/virtualization/xen_traffic_     2013-08-23 21:31:56.616668173 +0200
-+++ munin/plugins/virtualization/xen_traffic_  2013-08-23 23:17:57.023334928 +0200
+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' ) 
  
@@ -99,8 +104,9 @@
  
  awk -v interface="$dev" \
      'BEGIN { gsub(/\./, "\\.", interface) } \
---- munin.orig/plugins/virtualization/xen_traffic_all  2013-08-23 21:31:56.616668173 +0200
-+++ munin/plugins/virtualization/xen_traffic_all       2013-08-23 21:45:30.156668240 +0200
+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
  
@@ -117,7 +123,7 @@
 @@ -30,7 +30,7 @@
      echo 'graph_vlabel bits received (-) / sent (+) per ${graph_period}'
      echo 'graph_args --base 1024 -l 0'
-     echo 'graph_category xen'
+     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
@@ -132,14 +138,15 @@
  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
+               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 .- __ ) 
---- munin.orig/plugins/virtualization/xen_vbd  2013-08-23 21:31:56.620001488 +0200
-+++ munin/plugins/virtualization/xen_vbd       2013-08-23 23:19:52.040001471 +0200
+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
  
@@ -157,7 +164,7 @@
                  
                  foreach $domain ( @domains )
                  {
-@@ -90,9 +90,9 @@
+@@ -90,9 +91,9 @@
  @stats = split (/\n/, pop(@chunks));
  
  shift(@stats);