Date: Thu, 19 Jan 2017 15:45:22 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431883 - in head/sysutils: munin-common/files munin-node munin-node/files Message-ID: <201701191545.v0JFjMf4003960@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Jan 19 15:45:22 2017 New Revision: 431883 URL: https://svnweb.freebsd.org/changeset/ports/431883 Log: Tell plugins they can use awk and do not need gawk. While there, make ipmi_ plugins easier to use, and sort the plugins.conf file. Submitted by: bcr Sponsored by: Absolight Added: head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in (contents, props changed) Modified: head/sysutils/munin-node/Makefile (contents, props changed) head/sysutils/munin-node/files/plugins.conf.in Added: head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in Thu Jan 19 15:45:22 2017 (r431883) @@ -0,0 +1,11 @@ +--- plugins/node.d/ipmi_.in.orig 2017-01-18 20:25:20 UTC ++++ plugins/node.d/ipmi_.in +@@ -73,7 +73,7 @@ export CONFIG MEASURE + + #### Work is done in this awk script + +-ipmitool sensor | gawk -F'|' ' ++ipmitool sensor | awk -F'|' ' + BEGIN { + FANS = ""; + TEMPS = ""; Added: head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in Thu Jan 19 15:45:22 2017 (r431883) @@ -0,0 +1,11 @@ +--- plugins/node.d/multips_memory.in.orig 2017-01-18 20:25:20 UTC ++++ plugins/node.d/multips_memory.in +@@ -137,7 +137,7 @@ fi + for name in $names; do + fieldname="$(clean_fieldname "$name")" + +- ps -eo $monitor,comm | gawk ' ++ ps -eo $monitor,comm | awk ' + BEGIN { total = "U"; } # U = Unknown. + /grep/ { next; } + $2 ~ /^'"$name"'$/ { total = total + ($1*1024); } Modified: head/sysutils/munin-node/Makefile ============================================================================== --- head/sysutils/munin-node/Makefile Thu Jan 19 15:44:53 2017 (r431882) +++ head/sysutils/munin-node/Makefile Thu Jan 19 15:45:22 2017 (r431883) @@ -3,6 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} +PORTREVISION= 1 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 Thu Jan 19 15:44:53 2017 (r431882) +++ head/sysutils/munin-node/files/plugins.conf.in Thu Jan 19 15:45:22 2017 (r431883) @@ -45,16 +45,18 @@ env.leasefile /var/db/dhcpd.leases group mail env.exim %%LOCALBASE%%/sbin/exim -[smart_*] +[fail2ban*] user root -group operator -env.smartpath %%LOCALBASE%%/sbin/smartctl +env.client %%LOCALBASE%%/bin/fail2ban-client [hddtemp_smartctl] user root group operator env.smartctl %%LOCALBASE%%/sbin/smartctl +[ipmi_*] +user root + [mbmon*] env.mbmon %%LOCALBASE%%/bin/mbmon @@ -63,6 +65,10 @@ env.mysql %%LOCALBASE%%/bin/mysql env.mysqladmin %%LOCALBASE%%/bin/mysqladmin env.mysqlshow %%LOCALBASE%%/bin/mysqlshow +[nut*] +env.upsc %%LOCALBASE%%/bin/upsc +env.upsconf %%LOCALBASE%%/etc/nut/ups.conf + [postfix*] user root env.logfile maillog @@ -72,11 +78,8 @@ group wheel env.mspqueue /var/spool/clientmqueue env.mailstats /usr/sbin/mailstats -[fail2ban*] +[smart_*] user root -env.client %%LOCALBASE%%/bin/fail2ban-client - -[nut*] -env.upsc %%LOCALBASE%%/bin/upsc -env.upsconf %%LOCALBASE%%/etc/nut/ups.conf +group operator +env.smartpath %%LOCALBASE%%/sbin/smartctl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701191545.v0JFjMf4003960>