Index: head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in (nonexistent) +++ head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in (revision 431883) @@ -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 = ""; Property changes on: head/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in (nonexistent) +++ head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in (revision 431883) @@ -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); } Property changes on: head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/munin-node/Makefile =================================================================== --- head/sysutils/munin-node/Makefile (revision 431882) +++ head/sysutils/munin-node/Makefile (revision 431883) @@ -1,89 +1,90 @@ # Created by: Lupe Christoph # $FreeBSD$ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node MAINTAINER= mat@FreeBSD.org COMMENT= Node-specific part of Munin BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ p5-Net-Server>=0:net/p5-Net-Server \ bash:shells/bash RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ p5-Net-Server>=0:net/p5-Net-Server \ p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \ p5-libwww>=0:www/p5-libwww \ bash:shells/bash USES= gmake perl5 shebangfix cpe PKGMESSAGE= ${WRKDIR}/pkg-message REINPLACE_ARGS= -i "" SHEBANG_FILES= node/sbin/munin-node node/sbin/munin-sched \ node/sbin/munin-run node/sbin/munin-node-configure .include "${.CURDIR}/../munin-common/munin.mk" ALL_TARGET= build-node build-plugins build/node/_bin/munin-async build/node/_bin/munin-asyncd INSTALL_TARGET= install-node-prime install-async-prime install-plugins-prime NO_ARCH= yes OPTIONS_DEFINE= SNMP PERL JAVA OPTIONS_DEFAULT= SNMP PERL OPTIONS_SUB= yes SNMP_DESC= Include SNMP plugins PERL_DESC= Include all Perl modules (adds dependencies) JAVA_DESC= Include JAVA plugins SNMP_BUILD_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP SNMP_RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP PERL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg \ p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-XML-Parser>=0:textproc/p5-XML-Parser \ p5-XML-LibXML>=0:textproc/p5-XML-LibXML JAVA_USE= java=yes JAVA_INSTALL_TARGET= install-plugins-java JAVA_BUILD= yes JAVA_RUN= yes SUB_FILES= pkg-message plugins.conf USE_RC_SUBR= munin-asyncd munin-node munin-sched post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/node/sbin/munin-node \ ${WRKSRC}/node/sbin/munin-node-configure \ ${WRKSRC}/node/sbin/munin-run @${REINPLACE_CMD} \ -e 's|^\(BASH[[:space:]]*:=\).*|\1 ${bash_CMD}|' \ -e 's|^\(JAVARUN[[:space:]]*:=\).*|\1 ${java_CMD}|' \ -e 's|^\(PERL[[:space:]]*:=\).*|\1 ${perl_CMD}|' \ -e 's|^\(PYTHON[[:space:]]*:=\).*|\1 ${python_CMD}|' \ -e 's|^\(RUBY[[:space:]]*:=\).*|\1 ${ruby_CMD}|' \ ${WRKSRC}/Makefile.config @${FIND} ${WRKSRC}/node/sbin -type f -name "*.orig" -delete post-install: ${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state ${STAGEDIR}${SPOOLDIR}/async ${INSTALL_SCRIPT} ${.CURDIR}/plugins/* ${STAGEDIR}${DATADIR}/plugins/ ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \ ${STAGEDIR}${ETCDIR}/munin-node.conf.sample ${INSTALL_DATA} ${WRKDIR}/plugins.conf \ ${STAGEDIR}${ETCDIR}/plugins.conf.sample (cd ${WRKSRC}/node/blib/bindoc; \ ${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 munin-sched.1 munindoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \ ) (cd ${WRKSRC}/build/doc; \ ${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \ ${INSTALL_MAN} munin.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \ ) ${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-node.newsyslog .include Index: head/sysutils/munin-node/files/plugins.conf.in =================================================================== --- head/sysutils/munin-node/files/plugins.conf.in (revision 431882) +++ head/sysutils/munin-node/files/plugins.conf.in (revision 431883) @@ -1,82 +1,85 @@ # $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: # # user # Set the user to run the plugin as # group # Set the group to run the plugin as # command # Run instead of the plugin. %c # expands to what would normally be run. # env. # Sets in the plugin's environment, see the # individual plugins to find out which variables they # care about. # # Note that many of the environment variables are just guesses # because the port maintainer did not bother to install all the # software that the Munin plugins can monitor. Please don't hesitate # to file a PR against the munin-node port if you find an error. # The logtail program used by many plugins is installed with the # 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 [courier_*] env.logfile /var/log/maillog env.logtail %%LOCALBASE%%/bin/logtail [dhcp3] env.configfile %%LOCALBASE%%/etc/dhcpd.conf env.leasefile /var/db/dhcpd.leases [exim*] 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 [mysql*] 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 [sendmail*] 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