svn commit: r377445 - in head/sysutils: munin-common/files munin-node munin-node/files
Mathieu Arnold
mat at FreeBSD.org
Mon Jan 19 17:47:49 UTC 2015
Author: mat
Date: Mon Jan 19 17:47:47 2015
New Revision: 377445
URL: https://svnweb.freebsd.org/changeset/ports/377445
QAT: https://qat.redports.org/buildarchive/r377445/
Log:
Fix the iostat plugin to report the correct unit. [1]
Fix common plugins PATH problems by adding LOCALBASE/{bin,sbin} to the default
PATH. Fix a " that should not have been there. Fix a few permissions
problems. [2]
PR: 196504 [1]
Submitted by: Vlad "Blackflow" K.
PR: 196739 [2]
Submitted by: darius dons net au
Sponsored by: Absolight
Modified:
head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in
head/sysutils/munin-node/Makefile
head/sysutils/munin-node/files/plugins.conf.in (contents, props changed)
Modified: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in
==============================================================================
--- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in Mon Jan 19 17:45:17 2015 (r377444)
+++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in Mon Jan 19 17:47:47 2015 (r377445)
@@ -1,5 +1,14 @@
--- plugins/node.d.freebsd/iostat.in.orig 2014-11-24 21:46:24 UTC
+++ plugins/node.d.freebsd/iostat.in
+@@ -41,7 +41,7 @@ fi
+ if [ "$1" = "config" ]; then
+ echo 'graph_title IOstat by bytes'
+ echo 'graph_args --base 1024 -l 0'
+- echo 'graph_vlabel MB per ${graph_period} read+written'
++ echo 'graph_vlabel kB per ${graph_period} read+written'
+ echo 'graph_category disk'
+ echo 'graph_info This graph shows the I/O to and from block devices'
+ # We don't give a XXXX about device or extended
@@ -56,13 +56,11 @@ if [ "$1" = "config" ]; then
for d in $drives; do
echo "${d}_read.label ${d}"
Modified: head/sysutils/munin-node/Makefile
==============================================================================
--- head/sysutils/munin-node/Makefile Mon Jan 19 17:45:17 2015 (r377444)
+++ head/sysutils/munin-node/Makefile Mon Jan 19 17:47:47 2015 (r377445)
@@ -3,7 +3,7 @@
PORTNAME= munin
PORTVERSION= ${MUNIN_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils perl5
MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -node
Modified: head/sysutils/munin-node/files/plugins.conf.in
==============================================================================
--- head/sysutils/munin-node/files/plugins.conf.in Mon Jan 19 17:45:17 2015 (r377444)
+++ head/sysutils/munin-node/files/plugins.conf.in Mon Jan 19 17:47:47 2015 (r377445)
@@ -1,3 +1,10 @@
+# $FreeBSD$
+#
+######################################################################
+# This file is installed by the sysutils/munin-node port, you should #
+# not change it, you should create a local.conf file in the same #
+# directory with your local changes. #
+######################################################################
#
# This file contains configuration options for the plugins. Three
# options are understood by munin-node itself:
@@ -19,6 +26,9 @@
# port security/logcheck. The munin-node port has no dependency on
# that port because most plugins do not require it.
+[*]
+env.PATH %%LOCALBASE%%/sbin:%%LOCALBASE%%/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
[amavis]
env.amavislog /var/log/maillog
env.logtail %%LOCALBASE%%/bin/logtail
@@ -36,10 +46,12 @@ group mail
env.exim %%LOCALBASE%%/sbin/exim
[smart_*]
+user root
group operator
-env.smartctl %%LOCALBASE%%/sbin/smartctl
+env.smartpath %%LOCALBASE%%/sbin/smartctl
[hddtemp_smartctl]
+user root
group operator
env.smartctl %%LOCALBASE%%/sbin/smartctl
@@ -56,6 +68,7 @@ user root
env.logfile /var/log/maillog
[sendmail*]
+group wheel
env.mspqueue /var/spool/clientmqueue
env.mailstats /usr/sbin/mailstats
@@ -65,4 +78,5 @@ env.client %%LOCALBASE%%/bin/fail2ban-cl
[nut*]
env.upsc %%LOCALBASE%%/bin/upsc
-env.upsconf %%LOCALBASE%%/etc/nut/ups.conf"
+env.upsconf %%LOCALBASE%%/etc/nut/ups.conf
+
More information about the svn-ports-head
mailing list