Hi.
This updates munin to latest 2.0.12 version. It's a bugfix release, like
previous
2.0.11.1 release.
Full changelog: http://munin-monitoring.org/browser/munin/ChangeLog?rev=2.0.12
Also move MESSAGE-* to README-*, enable memory plugin from NetBSD and disable
FreeBSD's iostat plugin.
With input from rpe@ and tweaks from sthen@, thanks!
OK?
Attached patch is for safety.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 11 Mar 2013 11:35:49 -0000 1.30
+++ Makefile 22 Mar 2013 13:46:29 -0000
@@ -3,7 +3,7 @@
COMMENT-main = flexible network host monitoring, client
COMMENT-server =flexible network host monitoring, server
-V = 2.0.10
+V = 2.0.12
DISTNAME = munin-$V
PKGNAME-main = munin-node-$V
PKGNAME-server =munin-server-$V
@@ -70,9 +70,10 @@ SUBST_LIST += ${FILESDIR}/$i ${WRKSRC}/p
post-extract:
cp -Rp ${WRKSRC}/plugins/node.d.freebsd ${WRKSRC}/plugins/node.d.openbsd
cp -p ${WRKSRC}/plugins/node.d.netbsd/uptime.in
${WRKSRC}/plugins/node.d.openbsd
+ cp -p ${WRKSRC}/plugins/node.d.netbsd/memory.in
${WRKSRC}/plugins/node.d.openbsd
${SUBST_CMD} -c ${SUBST_LIST}
chmod -R +x ${WRKSRC}/plugins/node.d.openbsd
- rm ${WRKSRC}/plugins/node.d.openbsd/memory.in # not yet ported
+ rm ${WRKSRC}/plugins/node.d.openbsd/iostat.in # not yet ported
# Fixup hardcoded paths in plugins to use TRUEPREFIX/LOCALBASE as appropriate,
# there are far too many to handle this via patches/SUBST_CMD, and this method
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/munin/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 18 Jan 2013 12:23:24 -0000 1.7
+++ distinfo 22 Mar 2013 13:46:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.10.tar.gz) = ulM5YHpYSuX6XCo13kUvAkV06iVY695KT+7pXx/yGa8=
-SIZE (munin-2.0.10.tar.gz) = 1330859
+SHA256 (munin-2.0.12.tar.gz) = BkE5q2Ja+IT4fxtY9gCBVISLYuYTUu1ixiJkCR7CuAk=
+SIZE (munin-2.0.12.tar.gz) = 1331986
Index: pkg/MESSAGE-main
===================================================================
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- pkg/MESSAGE-main 28 Oct 2010 11:01:47 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-Install p5-Net-SNMP to use the optional SNMP-based monitors.
-
-Before starting munin-node, you should create symlinks in
-${SYSCONFDIR}/munin/plugins as described in the manual (manually or
-using the output from munin-node-configure --shell), adapt
-${SYSCONFDIR}/munin/munin-node.conf if necessary (e.g. if a remote
-server will query this node).
Index: pkg/MESSAGE-server
===================================================================
RCS file: pkg/MESSAGE-server
diff -N pkg/MESSAGE-server
--- pkg/MESSAGE-server 17 Nov 2009 11:11:20 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-After configuring at least one munin-node instance and adapting
-${SYSCONFDIR}/munin/munin.conf as desired, you may run the periodic
-tasks from cron with the following line:
-
-*/5 * * * * sudo -u _munin
/usr/local/bin/munin-cron
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/munin/pkg/PLIST-main,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST-main
--- pkg/PLIST-main 18 Jan 2013 12:23:24 -0000 1.12
+++ pkg/PLIST-main 22 Mar 2013 13:46:29 -0000
@@ -121,7 +121,6 @@ libexec/munin/plugins/if_errcoll_
libexec/munin/plugins/if_pps_
libexec/munin/plugins/ifx_concurrent_sessions_
libexec/munin/plugins/intr
-libexec/munin/plugins/iostat
@comment libexec/munin/plugins/ipac-ng
libexec/munin/plugins/ipmi_
libexec/munin/plugins/ipmi_sensor_
@@ -133,6 +132,7 @@ libexec/munin/plugins/mailman
libexec/munin/plugins/mailscanner
@comment libexec/munin/plugins/mbmon_
libexec/munin/plugins/memcached_
+libexec/munin/plugins/memory
libexec/munin/plugins/mhttping
libexec/munin/plugins/multiping
libexec/munin/plugins/multips
@@ -321,6 +321,7 @@ sbin/munin-run
sbin/munin-sched
share/doc/munin/
share/doc/munin/UPGRADING
+share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/munin/munin-node.conf
@sample ${SYSCONFDIR}/munin/munin-node.conf
share/examples/munin/plugin-conf.d/
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/net/munin/pkg/PLIST-server,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-server
--- pkg/PLIST-server 12 Oct 2012 09:46:46 -0000 1.4
+++ pkg/PLIST-server 22 Mar 2013 13:46:29 -0000
@@ -31,6 +31,7 @@ share/examples/munin/munin-cgi-graph.log
share/examples/munin/munin-cgi-html.log
@sample /var/log/munin/munin-cgi-html.log
@owner
+share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/munin/munin-conf.d/
@sample ${SYSCONFDIR}/munin/munin-conf.d/
share/examples/munin/munin.conf
Index: pkg/README-main
===================================================================
RCS file: pkg/README-main
diff -N pkg/README-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README-main 22 Mar 2013 13:46:29 -0000
@@ -0,0 +1,34 @@
+$OpenBSD: README,v 1.2 2012/12/09 22:05:25 rpe Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+munin-node is the "client" side of Munin; it runs on various hosts and
+accepts requests from a munin-server, and invokes various plugins to
+provide statistics about the host.
+
+Before starting munin-node, you will need to configure access controls
+and choose which plugins to use.
+
+Access controls are configured in ${SYSCONFDIR}/munin/munin-node.conf.
+
+Plugins are enabled by creating symlinks in ${SYSCONFDIR}/munin/plugins.
+Run "munin-node-configure --shell" to output a set of shell commands to
+enable plugins which can be auto-detected. (These commands are not run
+automatically, so you can easily choose which you would like to enable).
+
+Some plugins require access to log files which are normally readable only
+by root (a common example is /var/log/maillog), but by default the
+plugins are run by the "_munin-plugin" user.
+
+You can change permissions and ownership of the log files (and edit
+/etc/newsyslog.conf to match). If necessary you can configure the plugin
+to run as a different user with the "user" option (see
+${SYSCONFDIR}/munin/plugin-conf.d/openbsd-packages).
+
+SNMP-based monitors are also available; to use these, install the
+p5-Net-SNMP package.
+
+For further information, see
+http://munin-monitoring.org/wiki/Documentation
Index: pkg/README-server
===================================================================
RCS file: pkg/README-server
diff -N pkg/README-server
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README-server 22 Mar 2013 13:46:29 -0000
@@ -0,0 +1,11 @@
+$OpenBSD: README,v 1.2 2012/12/09 22:05:25 rpe Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+After configuring at least one munin-node instance and adapting
+$SYSCONFDIR}/munin/munin.conf as desired, you may run the periodic
+tasks from cron with the following line:
+
+*/5 * * * * sudo -u _munin
${TRUEPRIFIX}/bin/munin-cron
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 11 Mar 2013 11:35:49 -0000 1.30
+++ Makefile 22 Mar 2013 13:46:29 -0000
@@ -3,7 +3,7 @@
COMMENT-main = flexible network host monitoring, client
COMMENT-server =flexible network host monitoring, server
-V = 2.0.10
+V = 2.0.12
DISTNAME = munin-$V
PKGNAME-main = munin-node-$V
PKGNAME-server =munin-server-$V
@@ -70,9 +70,10 @@ SUBST_LIST += ${FILESDIR}/$i ${WRKSRC}/p
post-extract:
cp -Rp ${WRKSRC}/plugins/node.d.freebsd ${WRKSRC}/plugins/node.d.openbsd
cp -p ${WRKSRC}/plugins/node.d.netbsd/uptime.in ${WRKSRC}/plugins/node.d.openbsd
+ cp -p ${WRKSRC}/plugins/node.d.netbsd/memory.in ${WRKSRC}/plugins/node.d.openbsd
${SUBST_CMD} -c ${SUBST_LIST}
chmod -R +x ${WRKSRC}/plugins/node.d.openbsd
- rm ${WRKSRC}/plugins/node.d.openbsd/memory.in # not yet ported
+ rm ${WRKSRC}/plugins/node.d.openbsd/iostat.in # not yet ported
# Fixup hardcoded paths in plugins to use TRUEPREFIX/LOCALBASE as appropriate,
# there are far too many to handle this via patches/SUBST_CMD, and this method
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/munin/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 18 Jan 2013 12:23:24 -0000 1.7
+++ distinfo 22 Mar 2013 13:46:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.10.tar.gz) = ulM5YHpYSuX6XCo13kUvAkV06iVY695KT+7pXx/yGa8=
-SIZE (munin-2.0.10.tar.gz) = 1330859
+SHA256 (munin-2.0.12.tar.gz) = BkE5q2Ja+IT4fxtY9gCBVISLYuYTUu1ixiJkCR7CuAk=
+SIZE (munin-2.0.12.tar.gz) = 1331986
Index: pkg/MESSAGE-main
===================================================================
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- pkg/MESSAGE-main 28 Oct 2010 11:01:47 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-Install p5-Net-SNMP to use the optional SNMP-based monitors.
-
-Before starting munin-node, you should create symlinks in
-${SYSCONFDIR}/munin/plugins as described in the manual (manually or
-using the output from munin-node-configure --shell), adapt
-${SYSCONFDIR}/munin/munin-node.conf if necessary (e.g. if a remote
-server will query this node).
Index: pkg/MESSAGE-server
===================================================================
RCS file: pkg/MESSAGE-server
diff -N pkg/MESSAGE-server
--- pkg/MESSAGE-server 17 Nov 2009 11:11:20 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-After configuring at least one munin-node instance and adapting
-${SYSCONFDIR}/munin/munin.conf as desired, you may run the periodic
-tasks from cron with the following line:
-
-*/5 * * * * sudo -u _munin /usr/local/bin/munin-cron
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/munin/pkg/PLIST-main,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST-main
--- pkg/PLIST-main 18 Jan 2013 12:23:24 -0000 1.12
+++ pkg/PLIST-main 22 Mar 2013 13:46:29 -0000
@@ -121,7 +121,6 @@ libexec/munin/plugins/if_errcoll_
libexec/munin/plugins/if_pps_
libexec/munin/plugins/ifx_concurrent_sessions_
libexec/munin/plugins/intr
-libexec/munin/plugins/iostat
@comment libexec/munin/plugins/ipac-ng
libexec/munin/plugins/ipmi_
libexec/munin/plugins/ipmi_sensor_
@@ -133,6 +132,7 @@ libexec/munin/plugins/mailman
libexec/munin/plugins/mailscanner
@comment libexec/munin/plugins/mbmon_
libexec/munin/plugins/memcached_
+libexec/munin/plugins/memory
libexec/munin/plugins/mhttping
libexec/munin/plugins/multiping
libexec/munin/plugins/multips
@@ -321,6 +321,7 @@ sbin/munin-run
sbin/munin-sched
share/doc/munin/
share/doc/munin/UPGRADING
+share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/munin/munin-node.conf
@sample ${SYSCONFDIR}/munin/munin-node.conf
share/examples/munin/plugin-conf.d/
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/net/munin/pkg/PLIST-server,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-server
--- pkg/PLIST-server 12 Oct 2012 09:46:46 -0000 1.4
+++ pkg/PLIST-server 22 Mar 2013 13:46:29 -0000
@@ -31,6 +31,7 @@ share/examples/munin/munin-cgi-graph.log
share/examples/munin/munin-cgi-html.log
@sample /var/log/munin/munin-cgi-html.log
@owner
+share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/munin/munin-conf.d/
@sample ${SYSCONFDIR}/munin/munin-conf.d/
share/examples/munin/munin.conf
Index: pkg/README-main
===================================================================
RCS file: pkg/README-main
diff -N pkg/README-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README-main 22 Mar 2013 13:46:29 -0000
@@ -0,0 +1,34 @@
+$OpenBSD: README,v 1.2 2012/12/09 22:05:25 rpe Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+munin-node is the "client" side of Munin; it runs on various hosts and
+accepts requests from a munin-server, and invokes various plugins to
+provide statistics about the host.
+
+Before starting munin-node, you will need to configure access controls
+and choose which plugins to use.
+
+Access controls are configured in ${SYSCONFDIR}/munin/munin-node.conf.
+
+Plugins are enabled by creating symlinks in ${SYSCONFDIR}/munin/plugins.
+Run "munin-node-configure --shell" to output a set of shell commands to
+enable plugins which can be auto-detected. (These commands are not run
+automatically, so you can easily choose which you would like to enable).
+
+Some plugins require access to log files which are normally readable only
+by root (a common example is /var/log/maillog), but by default the
+plugins are run by the "_munin-plugin" user.
+
+You can change permissions and ownership of the log files (and edit
+/etc/newsyslog.conf to match). If necessary you can configure the plugin
+to run as a different user with the "user" option (see
+${SYSCONFDIR}/munin/plugin-conf.d/openbsd-packages).
+
+SNMP-based monitors are also available; to use these, install the
+p5-Net-SNMP package.
+
+For further information, see
+http://munin-monitoring.org/wiki/Documentation
Index: pkg/README-server
===================================================================
RCS file: pkg/README-server
diff -N pkg/README-server
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README-server 22 Mar 2013 13:46:29 -0000
@@ -0,0 +1,11 @@
+$OpenBSD: README,v 1.2 2012/12/09 22:05:25 rpe Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+After configuring at least one munin-node instance and adapting
+$SYSCONFDIR}/munin/munin.conf as desired, you may run the periodic
+tasks from cron with the following line:
+
+*/5 * * * * sudo -u _munin ${TRUEPRIFIX}/bin/munin-cron
