From: Marcin Krol Date: Tue, 7 Mar 2023 22:14:05 +0000 (+0100) Subject: - updated, master branch at 20230307 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;ds=sidebyside;p=packages%2Fmunin-plugins-contrib.git - updated, master branch at 20230307 --- diff --git a/munin-plugins-contrib-apache.patch b/munin-plugins-contrib-apache.patch index 8afa09a..c21ea4f 100644 --- a/munin-plugins-contrib-apache.patch +++ b/munin-plugins-contrib-apache.patch @@ -1,5 +1,6 @@ ---- munin-plugins/plugins/apache/apache_watch_~ 2008-11-30 01:59:30.000000000 +0100 -+++ munin-plugins/plugins/apache/apache_watch_ 2009-04-26 20:30:15.107587925 +0200 +diff -ur munin-monitoring-contrib.orig/plugins/apache/apache_watch_ munin-monitoring-contrib/plugins/apache/apache_watch_ +--- munin-monitoring-contrib.orig/plugins/apache/apache_watch_ 2023-03-07 18:41:34.000000000 +0100 ++++ munin-monitoring-contrib/plugins/apache/apache_watch_ 2023-03-07 22:33:01.400068121 +0100 @@ -95,7 +95,7 @@ print "graph_vlabel activity\n"; my $i = 0; diff --git a/munin-plugins-contrib-other.patch b/munin-plugins-contrib-other.patch deleted file mode 100644 index 2e16a16..0000000 --- a/munin-plugins-contrib-other.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- munin-plugins-muninexchange-20081128/plugins/ftp/vsftpd-rel~ 2008-11-29 13:19:37.000000000 +0100 -+++ munin-plugins-muninexchange-20081128/plugins/ftp/vsftpd-rel 2008-11-29 21:04:06.000000000 +0100 -@@ -37,10 +37,10 @@ - - install_ok() - { -- tempfile=$(which tempfile) -+ mktemp=$(which mktemp) - if [ ! -r ${LOGFILE} -o \ - -z "${LOGTAIL}" -o ! -x "${LOGTAIL}" -o \ -- -z "${tempfile}" -o ! -x "${tempfile}" ] -+ -z "${mktemp}" -o ! -x "${mktemp}" ] - then - return 1 - fi -@@ -50,7 +50,7 @@ - - if [ "$1" = "autoconf" ] - then -- tmpfile=`which tempfile` -+ tmpfile=`which mktemp` - if install_ok - then - echo yes -@@ -82,7 +82,7 @@ - test install_ok || exit 1 - - touch -d now-5minutes+30seconds $PIVOT --TEMP=`tempfile` -+TEMP=`mktemp` - trap "rm -f ${PIVOT} ${TEMP}" INT EXIT - - test -n "$TEMP" -a -w "$TEMP" || exit 1 ---- munin-plugins-muninexchange-20081128/plugins/nagios/nagiosstatus~ 2008-11-29 13:19:37.000000000 +0100 -+++ munin-plugins-muninexchange-20081128/plugins/nagios/nagiosstatus 2008-11-30 01:16:55.000000000 +0100 -@@ -113,10 +113,10 @@ - if($type) { - push(@{$values{$type}}, $_); - } -- if(/^host \{/) { -+ if(/^hoststatus \{/) { - $type = "host"; - } -- if(/^service \{/) { -+ if(/^servicestatus \{/) { - $type = "service"; - } - } ---- munin-plugins-muninexchange-20110326/plugins/mail/clamav~ 2011-03-29 11:24:10.645146427 +0200 -+++ munin-plugins-muninexchange-20110326/plugins/mail/clamav 2011-03-29 12:38:20.435562927 +0200 -@@ -1,7 +1,8 @@ - #!/bin/sh - #%# family=manual - #%# capabilities=autoconf --log=/var/log/clamav/clamd.log -+ -+log=${logfile:-/var/log/clamav/clamd.log} - - if [ "$1" = "autoconf" ]; then - if [ -r $log ]; then diff --git a/munin-plugins-contrib-passenger.patch b/munin-plugins-contrib-passenger.patch index 32c5beb..902c336 100644 --- a/munin-plugins-contrib-passenger.patch +++ b/munin-plugins-contrib-passenger.patch @@ -1,11 +1,12 @@ ---- munin-plugins-muninexchange-20110326/plugins/passenger/passenger_status~ 2011-03-31 13:50:53.205407638 +0200 -+++ munin-plugins-muninexchange-20110326/plugins/passenger/passenger_status 2011-03-31 13:51:08.129407638 +0200 +diff -ur munin-monitoring-contrib.orig/plugins/passenger/passenger_status munin-monitoring-contrib/plugins/passenger/passenger_status +--- munin-monitoring-contrib.orig/plugins/passenger/passenger_status 2023-03-07 18:41:34.000000000 +0100 ++++ munin-monitoring-contrib/plugins/passenger/passenger_status 2023-03-07 22:39:48.060066780 +0100 @@ -26,7 +26,7 @@ end - + def output_values - status = `sudo passenger-status` + status = `passenger-status` unless $?.success? - $stderr.puts "failed executing passenger-status" + warn 'failed executing passenger-status' exit 1 diff --git a/munin-plugins-contrib-php.patch b/munin-plugins-contrib-php.patch deleted file mode 100644 index 44ac261..0000000 --- a/munin-plugins-contrib-php.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur munin-monitoring-contrib.orig/plugins/php/php_eaccelerator munin-monitoring-contrib/plugins/php/php_eaccelerator ---- munin-monitoring-contrib.orig/plugins/php/php_eaccelerator 2015-09-11 07:54:03.000000000 +0000 -+++ munin-monitoring-contrib/plugins/php/php_eaccelerator 2015-10-14 20:42:23.240042000 +0000 -@@ -32,7 +32,7 @@ - url = ENV['url'] || 'http://127.0.0.1/control.php' - - if ARGV[0]=="config" -- print "EAccelerator Monitoring\n" -+ print "graph_info EAccelerator Monitoring\n" - print "graph_title PHP Eaccelerator\n" - print "graph_category php-eaccelerator\n" - print "Memoryusagepercentage.label Memory Usage %\n" diff --git a/munin-plugins-contrib-postfix.patch b/munin-plugins-contrib-postfix.patch deleted file mode 100644 index 3e9633b..0000000 --- a/munin-plugins-contrib-postfix.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- munin-plugins-muninexchange-20081128/plugins/mail/dkimproxy_mails 2008-11-29 13:19:37.000000000 +0100 -+++ munin/plugins/mail/dkimproxy_mails 2008-11-29 13:19:43.000000000 +0100 -@@ -47,7 +47,7 @@ - if [ "$1" = "config" ]; then - echo 'graph_title DKIM Proxy mails' - echo 'graph_order dkimnone dkimpass dkiminvalid dkimfail' -- echo 'graph_category mail' -+ echo 'graph_category postfix' - echo 'graph_vlabel Count' - echo 'graph_args --base 1000 -l 0' - # echo 'graph_total total' ---- munin-plugins-muninexchange-20081128/plugins/mail/postfix_filtered 2008-11-29 13:19:37.000000000 +0100 -+++ munin/plugins/mail/postfix_filtered 2008-11-29 13:19:43.000000000 +0100 -@@ -60,7 +60,7 @@ - else - echo 'graph_order allowed rbl policy helo client sender recipient relay' - fi -- echo 'graph_category mail' -+ echo 'graph_category postfix' - echo 'graph_vlabel Mails per second' - echo 'graph_args --base 1000 -l 0' - ---- munin-plugins-muninexchange-20081128/plugins/mail/postfix_mailfiltered 2008-11-29 13:19:37.000000000 +0100 -+++ munin/plugins/mail/postfix_mailfiltered 2008-11-29 13:19:43.000000000 +0100 -@@ -30,7 +30,7 @@ - if [ "$1" = "config" ]; then - echo 'graph_title Postfix daily filtering' - echo 'graph_order relay rbl helo client sender recipient' -- echo 'graph_category mail' -+ echo 'graph_category postfix' - echo 'graph_vlabel Count' - echo 'graph_args --base 1000 -l 0' - echo 'graph_total total' ---- munin-plugins-muninexchange-20081128/plugins/mail/postfix-policyd 2008-11-29 13:19:37.000000000 +0100 -+++ munin/plugins/mail/postfix-policyd 2008-11-29 13:19:43.000000000 +0100 -@@ -25,7 +25,7 @@ - if [ "$1" = "config" ]; then - echo 'graph_title Postfix-Policyd daily filtering' - echo 'graph_order delayed passed whitelisted' -- echo 'graph_category mail' -+ echo 'graph_category postfix' - echo 'graph_vlabel Count' - echo 'graph_scale no' - ---- munin-plugins-muninexchange-20081128/plugins/mail/postfix_stats 2008-11-29 13:19:37.000000000 +0100 -+++ munin/plugins/mail/postfix_stats 2008-11-29 13:19:43.000000000 +0100 -@@ -19,7 +19,7 @@ - system.type COUNTER - graph_title Postfix statistics - graph_vlabel Postfix statistics --graph_category Mail -+graph_category postfix - graph_total Total - received.label received - delivered.label delivered ---- munin-plugins-muninexchange-20081128/plugins/mail/postgrey 2008-11-29 13:19:37.000000000 +0100 -+++ munin/plugins/mail/postgrey 2008-11-29 13:19:43.000000000 +0100 -@@ -30,7 +30,7 @@ - if [ "$1" = "config" ]; then - echo 'graph_title Postgrey daily filtering' - echo 'graph_order delayed passed whitelisted' -- echo 'graph_category mail' -+ echo 'graph_category postfix' - echo 'graph_vlabel Count' - echo 'graph_scale no' - ---- munin-plugins-muninexchange-20110326/plugins/mail/postfix_filtered_awk~ 2011-03-26 15:54:42.725320884 +0100 -+++ munin-plugins-muninexchange-20110326/plugins/mail/postfix_filtered_awk 2011-03-26 15:57:20.174320884 +0100 -@@ -50,7 +50,7 @@ - if [ "$1" = "config" ]; then - echo 'graph_title Postfix message filtering' - -- echo 'graph_category mail' -+ echo 'graph_category postfix' - echo 'graph_vlabel Mails per second' - # echo 'graph_args --base 1000 --logarithmic' - echo 'graph_args --base 1000 -l 0' ---- munin-plugins-muninexchange-20110326/plugins/mail/postgrey-new~ 2011-03-26 15:54:42.787320884 +0100 -+++ munin-plugins-muninexchange-20110326/plugins/mail/postgrey-new 2011-03-26 15:58:43.796320879 +0100 -@@ -59,7 +59,7 @@ - if(defined $ARGV[0] and $ARGV[0] eq "config") { - print "graph_title Postgrey Actions\n"; - print "graph_order greylisted retry_early passed passed_w\n"; -- print "graph_category mail\n"; -+ print "graph_category postfix\n"; - print "graph_vlabel Count\n"; - print "graph_scale no\n"; - diff --git a/munin-plugins-contrib.spec b/munin-plugins-contrib.spec index 0061dbc..f047a0f 100644 --- a/munin-plugins-contrib.spec +++ b/munin-plugins-contrib.spec @@ -1,19 +1,14 @@ -%include /usr/lib/rpm/macros.perl Summary: 3rd-party Munin plugins Summary(pl.UTF-8): Nieoficjalne wtyczki munina Name: munin-plugins-contrib -Version: 20160322 +Version: 20230307 Release: 1 License: GPL Group: Daemons Source0: https://github.com/munin-monitoring/contrib/tarball/master/%{name}-%{version}.tar.gz -# Source0-md5: 43c3331de9ffd87c1590374b0815468c -Patch0: %{name}-postfix.patch -Patch1: %{name}-other.patch -Patch2: %{name}-php.patch -Patch3: %{name}-apache.patch -Patch4: %{name}-passenger.patch -Patch5: xen.patch +# Source0-md5: e2ee06588f56d58df9a44860f743f7fd +Patch0: %{name}-apache.patch +Patch1: %{name}-passenger.patch URL: https://github.com/munin-monitoring/contrib/ BuildRequires: dos2unix BuildRequires: perl-devel @@ -53,19 +48,16 @@ znajdującym się na https://github.com/munin-monitoring/contrib/.\ %{nil} %prep -%setup -q -n munin-monitoring-contrib-0ecf76c +%setup -q -n munin-monitoring-contrib-05487ba find -type f -print0 | xargs -0 dos2unix %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 grep -r bin/env -l plugins/ | xargs sed -i -e '1{ s,#!.*bin/env ruby,#!%{__ruby}, + s,#!.*bin/env python3[^ ]*,#!%{__python3}, s,#!.*bin/env python[^ ]*,#!%{__python}, s,#!.*bin/env perl,#!%{__perl}, }' @@ -81,7 +73,6 @@ find plugins/ -type f | xargs sed -i -e '1{ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f %{__rm} -r plugins/asterisk/asterisk_*_fax_* -%{__rm} -r plugins/mail/dovecot for f in plugins/apache/apache_byprojects/byprojects_* ; do %{__mv} $f plugins/apache/apache_byprojects/apache_$(basename $f) @@ -116,121 +107,186 @@ done %clean rm -rf $RPM_BUILD_ROOT +%contrib_package 2wire +%contrib_package accounting +%contrib_package adguardhome +%contrib_package amavis %contrib_package amr %contrib_package amule %contrib_package apache %contrib_package apt %contrib_package arangodb %contrib_package aris +%contrib_package arp +%contrib_package assp %contrib_package asterisk %contrib_package audit %contrib_package backup %contrib_package backuppc %contrib_package bacula %contrib_package balanceng -%contrib_package beboxsync -%contrib_package bind9 -%contrib_package bitcoin +%contrib_package battery +%contrib_package bigbrother +%contrib_package bind +%contrib_package bird %contrib_package boinc +%contrib_package brocade +%contrib_package bsd %contrib_package cacti %contrib_package celery %contrib_package ceph -%contrib_package chassis +%contrib_package change.org %contrib_package chat %contrib_package cherokee +%contrib_package chilli +%contrib_package chrony +%contrib_package clamav +%contrib_package comet %contrib_package condor +%contrib_package coturn +%contrib_package courier %contrib_package cpan -%contrib_package currentcost +%contrib_package cpu +%contrib_package currency %contrib_package cyrus +%contrib_package darwin %contrib_package db2 +%contrib_package dd-wrt +%contrib_package debian +%contrib_package dhcp %contrib_package disk %contrib_package djabberd +%contrib_package dkim %contrib_package docker %contrib_package dovecot %contrib_package drbd %contrib_package drupal %contrib_package dspam %contrib_package dvb -%contrib_package dxtv %contrib_package ejabberd +%contrib_package emc +%contrib_package etherpadlite +%contrib_package exodus +%contrib_package fan %contrib_package fax %contrib_package firebird -%contrib_package forums +%contrib_package fr24 +%contrib_package freeradius %contrib_package ftp %contrib_package funkytown %contrib_package games %contrib_package gearman %contrib_package geowebcache +%contrib_package git %contrib_package glance %contrib_package glassfish %contrib_package google +%contrib_package gpsd %contrib_package gpu +%contrib_package groupwise %contrib_package gunicorn -%contrib_package hadoop %contrib_package haproxy %contrib_package harddisks -%contrib_package healthcheck +%contrib_package hdfs %contrib_package heimdal -%contrib_package hhvm -%contrib_package hp +%contrib_package horde %contrib_package http +%contrib_package hue +%contrib_package i2p +%contrib_package icecast +%contrib_package icinga +%contrib_package ilias +%contrib_package imapproxy +%contrib_package ip6 +%contrib_package ipmi %contrib_package ipvs +%contrib_package ircd +%contrib_package isp %contrib_package java -%contrib_package jchkmail_counters +%contrib_package jchkmail %contrib_package jenkins +%contrib_package jitsi +%contrib_package jmx %contrib_package joomla +%contrib_package jvm %contrib_package kamailio %contrib_package keystone +%contrib_package knot +%contrib_package libreoffice +%contrib_package libvirt %contrib_package licensing %contrib_package lighttpd +%contrib_package load %contrib_package logins +%contrib_package logs +%contrib_package luftdaten %contrib_package lustre %contrib_package lxc +%contrib_package lxd %contrib_package mail +%contrib_package mailman +%contrib_package mediawiki %contrib_package memcached -%contrib_package memcached_ext +%contrib_package memory %contrib_package minecraft +%contrib_package mixminion %contrib_package moblock -%contrib_package modem %contrib_package mod_jk %contrib_package mogilefs +%contrib_package moinmoin %contrib_package mongodb %contrib_package monit %contrib_package moodle %contrib_package mpd %contrib_package mssql +%contrib_package mumble %contrib_package munin %contrib_package mysql %contrib_package mythtv %contrib_package nagios +%contrib_package netapp +%contrib_package netscaler %contrib_package network %contrib_package newznab +%contrib_package nextcloud +%contrib_package nfs %contrib_package nfs-freebsd %contrib_package nginx -%contrib_package noaaport +%contrib_package nginx_unit %contrib_package nova %contrib_package nscd -%contrib_package nutcracker +%contrib_package nsd +%contrib_package ntp +%contrib_package omreport %contrib_package openfire %contrib_package openntpd -%contrib_package openvpn +%contrib_package openstack %contrib_package openvz +%contrib_package openwrt %contrib_package oracle %contrib_package ossec %contrib_package other %contrib_package passenger +%contrib_package pdns %contrib_package percona +%contrib_package pf %contrib_package php +%contrib_package ping +%contrib_package poseidon %contrib_package postfix %contrib_package postgresql +%contrib_package power %contrib_package power5 %contrib_package powermta %contrib_package printer -%contrib_package processes %contrib_package prosody +%contrib_package proxmox +%contrib_package puma +%contrib_package punbb %contrib_package puppet -%contrib_package qpid +%contrib_package qmail %contrib_package qpsmtpd +%contrib_package quake %contrib_package rabbitmq %contrib_package rackspace %contrib_package radiator @@ -239,61 +295,92 @@ rm -rf $RPM_BUILD_ROOT %contrib_package redis %contrib_package relayd %contrib_package requesttracker +%contrib_package rethinkdb %contrib_package riak +%contrib_package router +%contrib_package rsnapshot %contrib_package rsync %contrib_package rtorrent %contrib_package s3 %contrib_package sabnzbd %contrib_package samba %contrib_package san +%contrib_package sar %contrib_package scalix %contrib_package security +%contrib_package senderbase %contrib_package senderscore +%contrib_package sendmail %contrib_package sensors -%contrib_package services +%contrib_package sfsnmp %contrib_package sge +%contrib_package shorewall +%contrib_package shoutcast %contrib_package sickbeard -%contrib_package slony +%contrib_package smf %contrib_package smstools %contrib_package snmp +%contrib_package solar +%contrib_package solaris %contrib_package solr %contrib_package sourceds +%contrib_package spamassasin %contrib_package sphinx %contrib_package spotweb %contrib_package squeezebox %contrib_package squid +%contrib_package ssh %contrib_package ssl %contrib_package streaming +%contrib_package swap %contrib_package swift +%contrib_package syncthing +%contrib_package synology %contrib_package syslog %contrib_package system +%contrib_package systemd %contrib_package tarsnap +%contrib_package tcp %contrib_package teamspeak +%contrib_package tesla +%contrib_package thecus %contrib_package thin -%contrib_package time +%contrib_package tinydns %contrib_package tomcat +%contrib_package tor +%contrib_package torrent +%contrib_package tplink %contrib_package trafic_ro %contrib_package tv +%contrib_package twemproxy +%contrib_package ubiquiti %contrib_package ubuntu +%contrib_package udp %contrib_package ultramonkey %contrib_package unicorn -%contrib_package ups +%contrib_package user +%contrib_package uucp %contrib_package uwsgi %contrib_package varnish -%contrib_package varnish4 +%contrib_package vbulletin %contrib_package vdr -%contrib_package virtualization +%contrib_package virtualbox +%contrib_package vmware %contrib_package voip %contrib_package voldemort +%contrib_package vpn +%contrib_package vserver %contrib_package weather %contrib_package websphere -%contrib_package wiki +%contrib_package wifi +%contrib_package wordpress %contrib_package wowza %contrib_package wuala %contrib_package xastir %contrib_package xbnbt +%contrib_package xen %contrib_package yacy -%contrib_package zeo +%contrib_package yum %contrib_package zfs %contrib_package zimbra %contrib_package znc 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) - {