[packages/munin-plugins-muninexchange] - finished update to current version - remove duplicate plugins in prep - migrate xen plugins to xl
baggins
baggins at pld-linux.org
Fri Aug 23 23:28:27 CEST 2013
commit 7e840f71e78e22b0406929c28cc355ac20092127
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Aug 23 23:25:43 2013 +0200
- finished update to current version
- remove duplicate plugins in prep
- migrate xen plugins to xl
- finegrained packages are back (now possible again)
- all packages are autogenerated, removed obsoletes - if we try to keep
upgradeability here this package will become total mess
munin-plugins-muninexchange-apache.patch | 4 +-
munin-plugins-muninexchange-openvpn.patch | 11 -
munin-plugins-muninexchange-other.patch | 12 +-
munin-plugins-muninexchange-passenger.patch | 4 +-
munin-plugins-muninexchange-php.patch | 4 +-
munin-plugins-muninexchange-postfix.patch | 32 +--
munin-plugins-muninexchange-samba.patch | 13 +-
munin-plugins-muninexchange-vserver.patch | 11 -
munin-plugins-muninexchange.spec | 378 ++++++++++++++--------------
xen.patch | 164 ++++++++++++
10 files changed, 379 insertions(+), 254 deletions(-)
---
diff --git a/munin-plugins-muninexchange.spec b/munin-plugins-muninexchange.spec
index 18d6305..e3ce7dc 100644
--- a/munin-plugins-muninexchange.spec
+++ b/munin-plugins-muninexchange.spec
@@ -6,19 +6,18 @@ Summary: Munin plugins from MuninExchange
Summary(pl.UTF-8): Wtyczki munina z MuninExchange
Name: munin-plugins-muninexchange
Version: 20130823
-Release: 0.1
+Release: 1
License: GPL
Group: Daemons
Source0: https://github.com/munin-monitoring/contrib/tarball/master/%{name}.tar.gz
# Source0-md5: d0b1caf2e18a0edc349184f51d7d0cb5
-Patch0: %{name}-vserver.patch
-Patch1: %{name}-postfix.patch
-Patch2: %{name}-other.patch
-Patch3: %{name}-php.patch
-Patch4: %{name}-openvpn.patch
-Patch5: %{name}-samba.patch
-Patch6: %{name}-apache.patch
-Patch7: %{name}-passenger.patch
+Patch0: %{name}-postfix.patch
+Patch1: %{name}-other.patch
+Patch2: %{name}-php.patch
+Patch3: %{name}-samba.patch
+Patch4: %{name}-apache.patch
+Patch5: %{name}-passenger.patch
+Patch6: xen.patch
URL: http://exchange.munin-monitoring.org/
BuildRequires: dos2unix
BuildRequires: perl-devel
@@ -30,11 +29,11 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
This package contains plugins for Munin from MuninExchange repository
-located at <http://muninexchange.projects.linpro.no/>.
+located at https://github.com/munin-monitoring/contrib/.
%description -l pl.UTF-8
Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,
-znajdującym się na <http://muninexchange.projects.linpro.no/>.
+znajdującym się na https://github.com/munin-monitoring/contrib/>.
%define contrib_package()\
%package %1\
@@ -42,7 +41,6 @@ Summary: Munin plugins from MuninExchange - %1\
Summary(pl.UTF-8): Wtyczki munina z MuninExchange - %1\
Group: Daemons\
Requires: munin-node\
-Obsoletes: %*\
\
%description %1\
This package contains plugins for Munin from MuninExchange repository\
@@ -56,155 +54,6 @@ znajdującym się na https://github.com/munin-monitoring/contrib/.\
%defattr(644,root,root,755)\
%{nil}
-%package databases
-Summary: Munin plugins from MuninExchange - databases
-Summary(pl.UTF-8): Wtyczki munina z MuninExchange - databases
-Group: Daemons
-Requires: munin-node
-Obsoletes: munin-plugins-muninexchange-mysql
-
-%description databases
-This package contains plugins for Munin from MuninExchange repository
-located at <http://muninexchange.projects.linpro.no/>.
-
-%description databases -l pl.UTF-8
-Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,
-znajdującym się na <http://muninexchange.projects.linpro.no/>.
-
-%package network
-Summary: Munin plugins from MuninExchange - network
-Summary(pl.UTF-8): Wtyczki munina z MuninExchange - network
-Group: Daemons
-Requires: munin-node
-Obsoletes: munin-plugins-muninexchange-powerdns
-
-%description network
-This package contains plugins for Munin from MuninExchange repository
-located at <http://muninexchange.projects.linpro.no/>.
-
-%description network -l pl.UTF-8
-Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,
-znajdującym się na <http://muninexchange.projects.linpro.no/>.
-
-%package other
-Summary: Munin plugins from MuninExchange - other
-Summary(pl.UTF-8): Wtyczki munina z MuninExchange - other
-Group: Daemons
-Requires: munin-node
-Obsoletes: munin-plugins-muninexchange-amavis
-Obsoletes: munin-plugins-muninexchange-amule
-Obsoletes: munin-plugins-muninexchange-apache
-Obsoletes: munin-plugins-muninexchange-apt
-Obsoletes: munin-plugins-muninexchange-asterisk
-Obsoletes: munin-plugins-muninexchange-bacula
-Obsoletes: munin-plugins-muninexchange-bind
-Obsoletes: munin-plugins-muninexchange-boinc
-Obsoletes: munin-plugins-muninexchange-condor
-Obsoletes: munin-plugins-muninexchange-disk
-Obsoletes: munin-plugins-muninexchange-flashmediaserver
-Obsoletes: munin-plugins-muninexchange-freeradius
-Obsoletes: munin-plugins-muninexchange-games
-Obsoletes: munin-plugins-muninexchange-groupwise
-Obsoletes: munin-plugins-muninexchange-heimdal
-Obsoletes: munin-plugins-muninexchange-icecast
-Obsoletes: munin-plugins-muninexchange-iperf
-Obsoletes: munin-plugins-muninexchange-java
-Obsoletes: munin-plugins-muninexchange-mediawiki
-Obsoletes: munin-plugins-muninexchange-memcache
-Obsoletes: munin-plugins-muninexchange-mysql
-Obsoletes: munin-plugins-muninexchange-mythtv
-Obsoletes: munin-plugins-muninexchange-nfs
-Obsoletes: munin-plugins-muninexchange-openldap
-Obsoletes: munin-plugins-muninexchange-openvpn
-Obsoletes: munin-plugins-muninexchange-oracle
-Obsoletes: munin-plugins-muninexchange-php
-Obsoletes: munin-plugins-muninexchange-postfix
-Obsoletes: munin-plugins-muninexchange-postgresql
-Obsoletes: munin-plugins-muninexchange-printing
-Obsoletes: munin-plugins-muninexchange-processes
-Obsoletes: munin-plugins-muninexchange-proftpd
-Obsoletes: munin-plugins-muninexchange-puppet
-Obsoletes: munin-plugins-muninexchange-pure-ftpd
-Obsoletes: munin-plugins-muninexchange-qmail
-Obsoletes: munin-plugins-muninexchange-radiator
-Obsoletes: munin-plugins-muninexchange-rtorrent
-Obsoletes: munin-plugins-muninexchange-samba
-Obsoletes: munin-plugins-muninexchange-scalix
-Obsoletes: munin-plugins-muninexchange-sensors
-Obsoletes: munin-plugins-muninexchange-squid
-Obsoletes: munin-plugins-muninexchange-teamspeak
-Obsoletes: munin-plugins-muninexchange-time
-Obsoletes: munin-plugins-muninexchange-tor
-Obsoletes: munin-plugins-muninexchange-ups
-Obsoletes: munin-plugins-muninexchange-varnish
-Obsoletes: munin-plugins-muninexchange-vmware
-Obsoletes: munin-plugins-muninexchange-vserver
-Obsoletes: munin-plugins-muninexchange-xen
-Obsoletes: munin-plugins-muninexchange-yum
-Obsoletes: munin-plugins-muninexchange-zyxel
-
-%description other
-This package contains plugins for Munin from MuninExchange repository
-located at <http://muninexchange.projects.linpro.no/>.
-
-%description other -l pl.UTF-8
-Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,
-znajdującym się na <http://muninexchange.projects.linpro.no/>.
-
-%package services
-Summary: Munin plugins from MuninExchange - services
-Summary(pl.UTF-8): Wtyczki munina z MuninExchange - services
-Group: Daemons
-Requires: munin-node
-Obsoletes: munin-plugins-muninexchange-icecast
-Obsoletes: munin-plugins-muninexchange-postfix
-Obsoletes: munin-plugins-muninexchange-proftpd
-Obsoletes: munin-plugins-muninexchange-pure-ftpd
-Obsoletes: munin-plugins-muninexchange-sensors
-Obsoletes: munin-plugins-muninexchange-squid
-Obsoletes: munin-plugins-muninexchange-time
-Obsoletes: munin-plugins-muninexchange-varnish
-
-%description services
-This package contains plugins for Munin from MuninExchange repository
-located at <http://muninexchange.projects.linpro.no/>.
-
-%description services -l pl.UTF-8
-Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,
-znajdującym się na <http://muninexchange.projects.linpro.no/>.
-
-%package system
-Summary: Munin plugins from MuninExchange - system
-Summary(pl.UTF-8): Wtyczki munina z MuninExchange - system
-Group: Daemons
-Requires: munin-node
-Obsoletes: munin-plugins-muninexchange-disk
-
-%description system
-This package contains plugins for Munin from MuninExchange repository
-located at <http://muninexchange.projects.linpro.no/>.
-
-%description system -l pl.UTF-8
-Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,
-znajdującym się na <http://muninexchange.projects.linpro.no/>.
-
-%package web-servers
-Summary: Munin plugins from MuninExchange - web servers
-Summary(pl.UTF-8): Wtyczki munina z MuninExchange - web servers
-Group: Daemons
-Requires: munin-node
-Obsoletes: munin-plugins-muninexchange-apache
-Obsoletes: munin-plugins-muninexchange-nginx
-Obsoletes: munin-plugins-muninexchange-tomcat
-
-%description web-servers
-This package contains plugins for Munin from MuninExchange repository
-located at <http://muninexchange.projects.linpro.no/>.
-
-%description web-servers -l pl.UTF-8
-Ten pakiet zawera wtyczki dla Munina z repozytorium MuninExchange,
-znajdującym się na <http://muninexchange.projects.linpro.no/>.
-
%prep
%setup -q -n munin-monitoring-contrib-538cdc9
@@ -216,55 +65,198 @@ find -type f -print0 | xargs -0 dos2unix
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p0
-%patch7 -p1
+%patch6 -p1
-grep -r bin/env -l . | xargs sed -i -e '1{
+grep -r bin/env -l plugins/ | xargs sed -i -e '1{
s,#!.*bin/env ruby,#!%{__ruby},
s,#!.*bin/env python[^ ]*,#!%{__python},
s,#!.*bin/env perl,#!%{__perl},
}'
-sed -i -e 's|#!.*/usr/local/bin/|#!/usr/bin/|' */*
+find plugins/ -type f | xargs sed -i -e 's|#!.*/usr/local/bin/|#!/usr/bin/|'
# cleanup backups after patching
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)
+done
+for f in plugins/nginx/nginx_byprojects/byprojects_* ; do
+ %{__mv} $f plugins/nginx/nginx_byprojects/nginx_$(basename $f)
+done
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/munin/plugins/
-for i in *; do
+for i in plugins/*; do
[ -d $i ] || continue
- echo "%defattr(644,root,root,755)" > $i.list
- (cd $i; for f in *; do echo "%attr(755,root,root) %{_datadir}/munin/plugins/$f"; done) >> $i.list
+ j=$(basename $i)
+ >$j.list
+ find $i/* -type f | while read f ; do
+ if file $f | grep -qs script ; then
+ ff=$(basename $f)
+ echo "%{_datadir}/munin/plugins/$ff" >>$j.list
+ install -p $f $RPM_BUILD_ROOT%{_datadir}/munin/plugins/
+ fi
+ done
done
-cp -a */* $RPM_BUILD_ROOT%{_datadir}/munin/plugins/
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/munin/plugins/*
-
-touch $RPM_BUILD_ROOT/dupa
-echo /dupa >dupa.list
-
%clean
rm -rf $RPM_BUILD_ROOT
-%files databases -f databases.list
-%defattr(644,root,root,755)
-
-%files network -f network.list
-%defattr(644,root,root,755)
-
-%files other -f other.list
-%defattr(644,root,root,755)
-
-%files services -f services.list
-%defattr(644,root,root,755)
-
-%files system -f system.list
-%defattr(644,root,root,755)
-
-%files web-servers -f web-servers.list
-%defattr(644,root,root,755)
-
-%contrib_package dupa a b c
+%contrib_package amule
+%contrib_package apache
+%contrib_package apt
+%contrib_package aris
+%contrib_package asterisk
+%contrib_package audit
+%contrib_package backuppc
+%contrib_package bacula
+%contrib_package beboxsync
+%contrib_package boinc
+%contrib_package cacti
+%contrib_package celery
+%contrib_package ceph
+%contrib_package chassis
+%contrib_package cherokee
+%contrib_package condor
+%contrib_package cpan
+%contrib_package currentcost
+%contrib_package cyrus
+%contrib_package db2
+%contrib_package disk
+%contrib_package djabberd
+%contrib_package dovecot
+%contrib_package drbd
+%contrib_package drupal
+%contrib_package dspam
+%contrib_package dvb
+%contrib_package dxtv
+%contrib_package ejabberd
+%contrib_package fax
+%contrib_package firebird
+%contrib_package forums
+%contrib_package ftp
+%contrib_package funkytown
+%contrib_package games
+%contrib_package geowebcache
+%contrib_package glance
+%contrib_package glassfish
+%contrib_package google
+%contrib_package gpu
+%contrib_package gunicorn
+%contrib_package hadoop
+%contrib_package haproxy
+%contrib_package healthcheck
+%contrib_package heimdal
+%contrib_package http
+%contrib_package ipvs
+%contrib_package java
+%contrib_package joomla
+%contrib_package kamailio
+%contrib_package keystone
+%contrib_package licensing
+%contrib_package lighttpd
+%contrib_package logins
+%contrib_package lustre
+%contrib_package mail
+%contrib_package memcached
+%contrib_package minecraft
+%contrib_package moblock
+%contrib_package mod_jk
+%contrib_package mogilefs
+%contrib_package mongodb
+%contrib_package monit
+%contrib_package mpd
+%contrib_package mssql
+%contrib_package munin
+%contrib_package mysql
+%contrib_package mythtv
+%contrib_package nagios
+%contrib_package network
+%contrib_package newznab
+%contrib_package nfs-freebsd
+%contrib_package nginx
+%contrib_package noaaport
+%contrib_package nova
+%contrib_package openvpn
+%contrib_package openvz
+%contrib_package oracle
+%contrib_package ossec
+%contrib_package other
+%contrib_package passenger
+%contrib_package php
+%contrib_package postgresql
+%contrib_package power5
+%contrib_package powermta
+%contrib_package printer
+%contrib_package processes
+%contrib_package prosody
+%contrib_package puppet
+%contrib_package qpid
+%contrib_package qpsmtpd
+%contrib_package rabbitmq
+%contrib_package rackspace
+%contrib_package radiator
+%contrib_package reddit_karma
+%contrib_package redis
+%contrib_package relayd
+%contrib_package requesttracker
+%contrib_package riak
+%contrib_package rsync
+%contrib_package rtorrent
+%contrib_package s3
+%contrib_package sabnzbd
+%contrib_package samba
+%contrib_package san
+%contrib_package scalix
+%contrib_package security
+%contrib_package senderscore
+%contrib_package sensors
+%contrib_package services
+%contrib_package sge
+%contrib_package sickbeard
+%contrib_package slony
+%contrib_package smstools
+%contrib_package snmp
+%contrib_package solr
+%contrib_package sourceds
+%contrib_package sphinx
+%contrib_package spotweb
+%contrib_package squeezebox
+%contrib_package squid
+%contrib_package streaming
+%contrib_package swift
+%contrib_package syslog
+%contrib_package system
+%contrib_package teamspeak
+%contrib_package thin
+%contrib_package time
+%contrib_package tomcat
+%contrib_package trafic_ro
+%contrib_package tv
+%contrib_package ubuntu
+%contrib_package ultramonkey
+%contrib_package unicorn
+%contrib_package ups
+%contrib_package varnish
+%contrib_package vdr
+%contrib_package virtualization
+%contrib_package voip
+%contrib_package voldemort
+%contrib_package weather
+%contrib_package websphere
+%contrib_package wiki
+%contrib_package wowza
+%contrib_package wuala
+%contrib_package xastir
+%contrib_package xbnbt
+%contrib_package yacy
+%contrib_package zeo
+%contrib_package zfs
+%contrib_package zimbra
+%contrib_package zope
diff --git a/munin-plugins-muninexchange-apache.patch b/munin-plugins-muninexchange-apache.patch
index 7891fbd..8afa09a 100644
--- a/munin-plugins-muninexchange-apache.patch
+++ b/munin-plugins-muninexchange-apache.patch
@@ -1,5 +1,5 @@
---- ./other/apache_watch_~ 2008-11-30 01:59:30.000000000 +0100
-+++ ./other/apache_watch_ 2009-04-26 20:30:15.107587925 +0200
+--- 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
@@ -95,7 +95,7 @@
print "graph_vlabel activity\n";
my $i = 0;
diff --git a/munin-plugins-muninexchange-openvpn.patch b/munin-plugins-muninexchange-openvpn.patch
deleted file mode 100644
index 6a4e148..0000000
--- a/munin-plugins-muninexchange-openvpn.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- munin-plugins-muninexchange-20081128/other/openvpn_clients~ 2008-11-29 13:19:37.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/other/openvpn_clients 2008-11-30 01:43:48.000000000 +0100
-@@ -42,7 +42,7 @@
-
- use strict;
-
--my $statuslogfile = "/etc/openvpn/openvpn-status.log";
-+my $statuslogfile = $ENV{'logfile'} || "/etc/openvpn/openvpn-status.log";
- my $clients = 0;
-
- if($ARGV[0] and $ARGV[0] eq "autoconf" ) {
diff --git a/munin-plugins-muninexchange-other.patch b/munin-plugins-muninexchange-other.patch
index 47cc97f..2e16a16 100644
--- a/munin-plugins-muninexchange-other.patch
+++ b/munin-plugins-muninexchange-other.patch
@@ -1,5 +1,5 @@
---- munin-plugins-muninexchange-20081128/other/vsftpd-rel~ 2008-11-29 13:19:37.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/other/vsftpd-rel 2008-11-29 21:04:06.000000000 +0100
+--- 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()
@@ -31,8 +31,8 @@
trap "rm -f ${PIVOT} ${TEMP}" INT EXIT
test -n "$TEMP" -a -w "$TEMP" || exit 1
---- munin-plugins-muninexchange-20081128/other/nagiosstatus~ 2008-11-29 13:19:37.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/other/nagiosstatus 2008-11-30 01:16:55.000000000 +0100
+--- 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}}, $_);
@@ -46,8 +46,8 @@
$type = "service";
}
}
---- munin-plugins-muninexchange-20110326/other/clamav~ 2011-03-29 11:24:10.645146427 +0200
-+++ munin-plugins-muninexchange-20110326/other/clamav 2011-03-29 12:38:20.435562927 +0200
+--- 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
diff --git a/munin-plugins-muninexchange-passenger.patch b/munin-plugins-muninexchange-passenger.patch
index 9ddb81a..32c5beb 100644
--- a/munin-plugins-muninexchange-passenger.patch
+++ b/munin-plugins-muninexchange-passenger.patch
@@ -1,5 +1,5 @@
---- munin-plugins-muninexchange-20110326/web-servers/passenger_status~ 2011-03-31 13:50:53.205407638 +0200
-+++ munin-plugins-muninexchange-20110326/web-servers/passenger_status 2011-03-31 13:51:08.129407638 +0200
+--- 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
@@ -26,7 +26,7 @@
end
diff --git a/munin-plugins-muninexchange-php.patch b/munin-plugins-muninexchange-php.patch
index baa875c..cb88226 100644
--- a/munin-plugins-muninexchange-php.patch
+++ b/munin-plugins-muninexchange-php.patch
@@ -1,5 +1,5 @@
---- munin-plugins-muninexchange-20081128/other/php_eaccelerator~ 2008-11-29 13:19:37.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/other/php_eaccelerator 2008-11-30 00:47:00.000000000 +0100
+--- munin-plugins-muninexchange-20081128/plugins/php/php_eaccelerator~ 2008-11-29 13:19:37.000000000 +0100
++++ munin-plugins-muninexchange-20081128/plugins/php/php_eaccelerator 2008-11-30 00:47:00.000000000 +0100
@@ -32,7 +32,7 @@
url = ENV['url'] || 'http://127.0.0.1/control.php'
diff --git a/munin-plugins-muninexchange-postfix.patch b/munin-plugins-muninexchange-postfix.patch
index 8e5162b..3e9633b 100644
--- a/munin-plugins-muninexchange-postfix.patch
+++ b/munin-plugins-muninexchange-postfix.patch
@@ -1,5 +1,5 @@
---- munin-plugins-muninexchange-20081128/other/dkimproxy_mails 2008-11-29 13:19:37.000000000 +0100
-+++ munin/other/dkimproxy_mails 2008-11-29 13:19:43.000000000 +0100
+--- 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'
@@ -9,8 +9,8 @@
echo 'graph_vlabel Count'
echo 'graph_args --base 1000 -l 0'
# echo 'graph_total total'
---- munin-plugins-muninexchange-20081128/services/postfix_filtered 2008-11-29 13:19:37.000000000 +0100
-+++ munin/services/postfix_filtered 2008-11-29 13:19:43.000000000 +0100
+--- 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'
@@ -20,8 +20,8 @@
echo 'graph_vlabel Mails per second'
echo 'graph_args --base 1000 -l 0'
---- munin-plugins-muninexchange-20081128/other/postfix_mailfiltered 2008-11-29 13:19:37.000000000 +0100
-+++ munin/other/postfix_mailfiltered 2008-11-29 13:19:43.000000000 +0100
+--- 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'
@@ -31,8 +31,8 @@
echo 'graph_vlabel Count'
echo 'graph_args --base 1000 -l 0'
echo 'graph_total total'
---- munin-plugins-muninexchange-20081128/other/postfix-policyd 2008-11-29 13:19:37.000000000 +0100
-+++ munin/other/postfix-policyd 2008-11-29 13:19:43.000000000 +0100
+--- 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'
@@ -42,8 +42,8 @@
echo 'graph_vlabel Count'
echo 'graph_scale no'
---- munin-plugins-muninexchange-20081128/other/postfix_stats 2008-11-29 13:19:37.000000000 +0100
-+++ munin/other/postfix_stats 2008-11-29 13:19:43.000000000 +0100
+--- 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
@@ -53,8 +53,8 @@
graph_total Total
received.label received
delivered.label delivered
---- munin-plugins-muninexchange-20081128/other/postgrey 2008-11-29 13:19:37.000000000 +0100
-+++ munin/other/postgrey 2008-11-29 13:19:43.000000000 +0100
+--- 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'
@@ -64,8 +64,8 @@
echo 'graph_vlabel Count'
echo 'graph_scale no'
---- munin-plugins-muninexchange-20110326/services/postfix_filtered_awk~ 2011-03-26 15:54:42.725320884 +0100
-+++ munin-plugins-muninexchange-20110326/services/postfix_filtered_awk 2011-03-26 15:57:20.174320884 +0100
+--- 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'
@@ -75,8 +75,8 @@
echo 'graph_vlabel Mails per second'
# echo 'graph_args --base 1000 --logarithmic'
echo 'graph_args --base 1000 -l 0'
---- munin-plugins-muninexchange-20110326/other/postgrey-new~ 2011-03-26 15:54:42.787320884 +0100
-+++ munin-plugins-muninexchange-20110326/other/postgrey-new 2011-03-26 15:58:43.796320879 +0100
+--- 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";
diff --git a/munin-plugins-muninexchange-samba.patch b/munin-plugins-muninexchange-samba.patch
index b53f711..626628d 100644
--- a/munin-plugins-muninexchange-samba.patch
+++ b/munin-plugins-muninexchange-samba.patch
@@ -1,16 +1,7 @@
---- munin-plugins-muninexchange-20081128/other/samba_users~ 2008-11-30 01:58:28.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/other/samba_users 2008-12-02 00:28:40.000000000 +0100
+--- munin-plugins-muninexchange-20081128/plugins/samba/samba_users~ 2008-11-30 01:58:28.000000000 +0100
++++ munin-plugins-muninexchange-20081128/plugins/samba/samba_users 2008-12-02 00:28:40.000000000 +0100
@@ -36,3 +36,4 @@
echo -n "samba_users.value "
smbstatus -b 2> /dev/null | grep -c -v -e "^Samba" -e "^---" -e "^PID" -e ^$
+exit 0
---- munin-plugins-muninexchange-20081128/other/samba_locked~ 2008-11-30 01:58:28.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/other/samba_locked 2008-12-02 00:28:33.000000000 +0100
-@@ -36,5 +36,4 @@
-
- echo -n "samba_locked.value "
- smbstatus -L 2> /dev/null | grep -c DENY_
--
--
-+exit 0
diff --git a/munin-plugins-muninexchange-vserver.patch b/munin-plugins-muninexchange-vserver.patch
deleted file mode 100644
index a936cf0..0000000
--- a/munin-plugins-muninexchange-vserver.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- munin-plugins-muninexchange-20091204/other/vserver_procs~ 2010-01-28 09:10:25.827081278 +0100
-+++ munin-plugins-muninexchange-20091204/other/vserver_procs 2010-01-31 19:40:18.466259880 +0100
-@@ -19,7 +19,7 @@
- echo 'graph_title Vserver Process Overview'
- echo 'graph_args --base 1000 -l 0 '
- echo 'graph_vlabel number of processes'
-- echo 'graph_category processes'
-+ echo 'graph_category vserver'
- echo 'graph_info This graph shows the number of processes in each vserver context.'
-
- for vserver in `vserver-stat | sed 1d | awk '{print $8}'`; do
diff --git a/xen.patch b/xen.patch
new file mode 100644
index 0000000..b8c25ab
--- /dev/null
+++ b/xen.patch
@@ -0,0 +1,164 @@
+--- 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
+@@ -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 xen'
+ 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
+--- 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
+@@ -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;
+--- 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
+@@ -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
+
+--- 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
+@@ -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) } \
+--- 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
+@@ -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 xen'
+- 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 .- __ )
+--- 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
+@@ -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
+@@ -90,9 +90,9 @@
+ @stats = split (/\n/, pop(@chunks));
+
+ shift(@stats);
+-shift(@stats);
+-shift(@stats);
+-shift(@stats);
++#shift(@stats);
++#shift(@stats);
++#shift(@stats);
+
+ foreach $domain (@stats)
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/munin-plugins-muninexchange.git/commitdiff/7e840f71e78e22b0406929c28cc355ac20092127
More information about the pld-cvs-commit
mailing list