diff options
86 files changed, 877 insertions, 3609 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 50f2c182145..8dbd29c9ed6 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.830 2019/09/07 18:29:03 tnn Exp $ +# $NetBSD: Makefile,v 1.831 2019/09/09 12:21:44 tm Exp $ # COMMENT= System utilities @@ -391,9 +391,9 @@ SUBDIR+= mtools SUBDIR+= mtoolsfm SUBDIR+= mtscan SUBDIR+= mtx -SUBDIR+= munin-doc +SUBDIR+= munin-common +SUBDIR+= munin-master SUBDIR+= munin-node -SUBDIR+= munin-server SUBDIR+= nautilus SUBDIR+= nautilus-sendto SUBDIR+= nbase diff --git a/sysutils/munin-doc/DESCR b/sysutils/munin-common/DESCR index 73db8f915b5..b8c39d5aee5 100644 --- a/sysutils/munin-doc/DESCR +++ b/sysutils/munin-common/DESCR @@ -6,4 +6,5 @@ nodes at regular intervals, and asks them for data. It then stores the data in RRD-files, and (if needed) updates the graphs. One of the main goals has been ease of creating own "plugins" (graphs). -This package contains the documentation. +This package manages the common components used by both master and +node munin packages. diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile new file mode 100644 index 00000000000..faf5d726627 --- /dev/null +++ b/sysutils/munin-common/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1 2019/09/09 12:21:44 tm Exp $ +# + +PKGNAME= ${DISTNAME:S/munin/munin-common/} +COMMENT= Common components between a munin node and master + +.include "../../sysutils/munin-common/Makefile.common" + +# Adjust WRKSRC for the Perl module framework, but keep the same +# patch base directory +WRKSRC= ${WRKDIR}/${DISTNAME}/common +PATCH_ARGS= -d ${WRKSRC}/.. --forward -E ${PATCH_STRIP} + +PERL5_MODULE_TYPE= Module::Build +PERL5_PACKLIST= auto/Munin/Common/.packlist + +SUBST_CLASSES+= paths +SUBST_STAGE.paths= pre-configure +SUBST_FILES.paths= lib/Munin/Common/Defaults.pm +SUBST_VARS.paths= PKG_SYSCONFDIR MUNIN_DBDIR MUNIN_LIBDIR \ + MUNIN_LOGDIR MUNIN_STATEDIR MUNIN_WWWDIR \ + MUNIN_PLUGSTATE PERL5 + +.include "../../lang/perl5/module.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/munin-common/Makefile.common b/sysutils/munin-common/Makefile.common new file mode 100644 index 00000000000..ecc6cff3c2d --- /dev/null +++ b/sysutils/munin-common/Makefile.common @@ -0,0 +1,79 @@ +# $NetBSD: Makefile.common,v 1.1 2019/09/09 12:21:44 tm Exp $ +# +# used by sysutils/munin-common/Makefile +# used by sysutils/munin-master/Makefile +# used by sysutils/munin-node/Makefile + +VERSION= 2.0.49 +DISTNAME= munin-${VERSION} +CATEGORIES= sysutils +MASTER_SITES= http://downloads.munin-monitoring.org/munin/stable/${VERSION}/ + +MAINTAINER= tm@NetBSD.org +HOMEPAGE= http://munin-monitoring.org/ +LICENSE= gnu-gpl-v2 + +BUILD_DEPENDS+= p5-CPAN-Meta>=2.141170:../../devel/p5-CPAN-Meta +BUILD_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build +BUILD_DEPENDS+= p5-Time-HiRes>=0:../../time/p5-Time-HiRes +DEPENDS= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay + +DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo +PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/patches + +.include "../../mk/bsd.prefs.mk" + +USE_LANGUAGES= # none +USE_TOOLS+= gmake bash:run perl:run + +BUILD_DEFS+= VARBASE + +MUNIN_GROUP?= munin +MUNIN_USER?= munin + +MUNIN_DBDIR?= ${VARBASE}/munin +MUNIN_LIBDIR= ${PREFIX}/lib/munin +MUNIN_LOGDIR?= ${VARBASE}/log/munin +MUNIN_PLUGSTATE?= ${MUNIN_DBDIR}/plugin-state +MUNIN_SPOOLDIR?= ${VARBASE}/spool/munin +MUNIN_STATEDIR?= ${VARBASE}/run/munin +MUNIN_WWWDIR?= ${PREFIX}/www + +PKG_GROUPS_VARS+= MUNIN_GROUP +PKG_USERS_VARS+= MUNIN_USER +PKG_GROUPS= ${MUNIN_GROUP} +PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP} +PKG_GECOS.${MUNIN_USER}= Munin user +PKG_HOME.${MUNIN_USER}= ${MUNIN_DBDIR} +PKG_SHELL.${MUNIN_USER}= ${BASH} + +PKG_SYSCONFSUBDIR?= munin + +EGDIR= ${PREFIX}/share/examples/munin + +REPLACE_PERL= master/_bin/munin-update.in + +FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP} +FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q} +FILES_SUBST+= MUNIN_USER=${MUNIN_USER} +FILES_SUBST+= PERL=${PERL5:Q} +FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +FILES_SUBST+= STATEDIR=${STATEDIR} + +MAKE_ENV+= PERL_USE_UNSAFE_INC=1 +MAKE_ENV+= BASH=${BASH:Q} +MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} +MAKE_ENV+= MUNIN_DBDIR=${MUNIN_DBDIR} +MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} +MAKE_ENV+= MUNIN_LOGDIR=${MUNIN_LOGDIR} +MAKE_ENV+= MUNIN_PLUGSTATE=${MUNIN_PLUGSTATE} +MAKE_ENV+= MUNIN_SPOOLDIR=${MUNIN_SPOOLDIR} +MAKE_ENV+= MUNIN_STATEDIR=${MUNIN_STATEDIR} +MAKE_ENV+= MUNIN_USER=${MUNIN_USER} +MAKE_ENV+= MUNIN_WWWDIR=${MUNIN_WWWDIR} +MAKE_ENV+= PERL5=${PERL5:Q} +MAKE_ENV+= PREFIX=${PREFIX} +MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} +MAKE_ENV+= RUBY=${RUBY:Q} + +MESSAGE_SUBST+= MUNIN_USER=${MUNIN_USER} diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo new file mode 100644 index 00000000000..093431c2504 --- /dev/null +++ b/sysutils/munin-common/distinfo @@ -0,0 +1,11 @@ +$NetBSD: distinfo,v 1.1 2019/09/09 12:21:44 tm Exp $ + +SHA1 (munin-2.0.49.tar.gz) = 48531b84c4382983cf4fe64a7c3ad22a86cbdc2e +RMD160 (munin-2.0.49.tar.gz) = 0e13eb4dfd01ea122476d041f51233612db00cfd +SHA512 (munin-2.0.49.tar.gz) = 20f1f27aa1ff39ed92c967a13581ae199930323f5d2b62b62ce0a548a4cf561595e85d069e836b156c05d4a94c66328009aba56cb1b06c4b2719fbd9e1061ca4 +Size (munin-2.0.49.tar.gz) = 2252353 bytes +SHA1 (patch-MANIFEST) = 538cec30723a6d41b732c9dc4a175472fb821609 +SHA1 (patch-Makefile) = 725b2fbac05ec89882fec295b8d38fc183bb310a +SHA1 (patch-Makefile.config) = ce29e172ddf3303e6539c269622e3c0d9e10e099 +SHA1 (patch-common_Build.PL) = 7d7f5afde978d0e5641f931d3f2585651ff40c1a +SHA1 (patch-lib_Munin_Common_Defaults.pm) = 2f6ffe9fe1b91361e35b9bfcac239252ba789482 diff --git a/sysutils/munin-common/patches/patch-MANIFEST b/sysutils/munin-common/patches/patch-MANIFEST new file mode 100644 index 00000000000..08b80ec3762 --- /dev/null +++ b/sysutils/munin-common/patches/patch-MANIFEST @@ -0,0 +1,30 @@ +$NetBSD: patch-MANIFEST,v 1.1 2019/09/09 12:21:44 tm Exp $ + +Add missing MANIFEST file so that Munin::Common becomes manageable +by the Perl module framework. + +--- /dev/null 2011-01-09 11:43:05.000000000 +0000 ++++ common/MANIFEST +@@ -0,0 +1,22 @@ ++Build.PL ++lib/Munin/Common/Config.pm ++lib/Munin/Common/Defaults.pm ++lib/Munin/Common/Timeout.pm ++lib/Munin/Common/TLS.pm ++lib/Munin/Common/TLSClient.pm ++lib/Munin/Common/TLSServer.pm ++MANIFEST This list of files ++t/critic.t ++t/munin_common_config.t ++t/munin_common_defaults.t ++t/munin_common_timeout.t ++t/munin_common_tls.t ++t/pod-coverage.t ++t/pod.t ++t/tls/CA/ca_cert.pem ++t/tls/master_cert.pem ++t/tls/master_key.pem ++t/tls/node_cert.pem ++t/tls/node_key.pem ++t/tls/openssl.cnf ++t/tls/README diff --git a/sysutils/munin-common/patches/patch-Makefile b/sysutils/munin-common/patches/patch-Makefile new file mode 100644 index 00000000000..6a580b83670 --- /dev/null +++ b/sysutils/munin-common/patches/patch-Makefile @@ -0,0 +1,107 @@ +$NetBSD: patch-Makefile,v 1.1 2019/09/09 12:21:44 tm Exp $ + +Installation fixed to use all essential files, populate +PKG_SYSCONFDIR as expected by the Munin scripts. Gets +configured man3ext from Perl instead of assuming 3pm suffix. + +--- Makefile.orig Thu May 9 03:45:43 2019 ++++ Makefile Wed Aug 14 12:38:00 2019 +@@ -33,8 +33,9 @@ + PODMAN8 := build/master/doc/munin-cron master/doc/munin master/doc/munin-check + PODMAN5 := build/master/doc/munin.conf node/doc/munin-node.conf + PYTHON_LINT_CALL ?= python3 -m flake8 ++MAN3EXT := $(shell $(PERL) -e 'use Config; print $$Config{man3ext};') + CONFVAR_SUBSTITUTION_FILES = \ +- master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.3pm \ ++ master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.$(MAN3EXT) \ + master/blib/lib/Munin/Master/HTMLOld.pm \ + node/blib/sbin/munin-node-configure \ + node/blib/sbin/munin-node \ +@@ -94,50 +95,37 @@ + install: install-master-prime install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-man install-async-prime + + install-pre: $(MAKEFILES) +- @$(CHECKUSER) +- mkdir -p $(LOGDIR) +- mkdir -p $(STATEDIR) +- mkdir -p $(SPOOLDIR) +- mkdir -p $(CONFDIR) +- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) ++ mkdir -p $(EGDIR) + + install-master-prime: $(INFILES_MASTER) install-pre install-master +- mkdir -p $(CONFDIR)/templates +- mkdir -p $(CONFDIR)/static +- mkdir -p $(CONFDIR)/templates/partial +- mkdir -p $(CONFDIR)/munin-conf.d ++ mkdir -p $(EGDIR)/templates ++ mkdir -p $(EGDIR)/static ++ mkdir -p $(EGDIR)/templates/partial ++ mkdir -p $(EGDIR)/munin-conf.d + mkdir -p $(LIBDIR) + mkdir -p $(BINDIR) + mkdir -p $(PERLLIB) + mkdir -p $(PERLLIB)/Munin/Master + mkdir -p $(HTMLDIR) +- mkdir -p $(DBDIR) +- mkdir -p $(DBDIR)/cgi-tmp + mkdir -p $(CGIDIR) + +- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) +- $(CHMOD) 0755 $(DBDIR) +- +- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp +- $(CHMOD) 0755 $(DBDIR)/cgi-tmp +- + for p in master/www/*.tmpl ; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(EGDIR)/templates/ ; \ + done + + for p in master/static/* ; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(EGDIR)/static/ ; \ + done + + for p in master/www/partial/*.tmpl; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(EGDIR)/templates/partial/ ; \ + done + + $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/ + $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/ + +- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess +- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ ++ $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess ++ $(INSTALL) -m 0644 build/master/munin.conf $(EGDIR)/ + + $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ +@@ -156,17 +144,8 @@ + install-node-plugins: install-plugins-prime + + install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES) +- @$(CHECKGROUP) +- +- mkdir -p $(CONFDIR)/plugins +- mkdir -p $(CONFDIR)/plugin-conf.d + mkdir -p $(LIBDIR)/plugins +- mkdir -p $(PLUGSTATE) + +- $(CHOWN) root:root $(PLUGSTATE) +- $(CHMOD) 0755 $(PLUGSTATE) +- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d +- + @# Process the OS specific plugins at the end. Otherwise they would be overridden by the + @# generic ones. + for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ +@@ -205,7 +184,7 @@ + install-node-prime: install-node-pre install-node + + install-node-pre: build/node/munin-node.conf install-pre +- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ ++ $(INSTALL) -m 0644 build/node/munin-node.conf $(EGDIR)/ + + + install-common-prime: build-common install-common diff --git a/sysutils/munin-common/patches/patch-Makefile.config b/sysutils/munin-common/patches/patch-Makefile.config new file mode 100644 index 00000000000..486bcf9ff55 --- /dev/null +++ b/sysutils/munin-common/patches/patch-Makefile.config @@ -0,0 +1,159 @@ +$NetBSD: patch-Makefile.config,v 1.1 2019/09/09 12:21:44 tm Exp $ + +Define proper default locations and tools. Really need Bash for plugins +despite what upstream says. + +--- Makefile.config.orig 2019-01-17 12:20:47.528006286 +0000 ++++ Makefile.config +@@ -17,35 +17,38 @@ + # + # the base of the Munin installation. + # +-PREFIX = $(DESTDIR)/opt/munin ++UPREFIX = $(DESTDIR)$(PREFIX) + + # Where Munin keeps its configurations (server.conf, client.conf, ++) +-CONFDIR = $(DESTDIR)/etc/opt/munin ++# CONFDIR = $(UPREFIX)/etc/munin ++ ++# Where pkgsrc installs example config files ++EGDIR = $(UPREFIX)/share/examples/munin + + # Server only - where to put munin-cron +-BINDIR = $(PREFIX)/bin ++BINDIR = $(UPREFIX)/bin + + # Client only - where to put munin-node, munin-node-configure, and munin-run +-SBINDIR = $(PREFIX)/sbin ++SBINDIR = $(UPREFIX)/sbin + + # Where to put text and html documentation +-DOCDIR = $(PREFIX)/doc ++DOCDIR = $(UPREFIX)/share/doc/munin + + # Where to put man pages +-MANDIR = $(PREFIX)/man ++MANDIR = $(UPREFIX)/$(PKGMANDIR) + + # Where to put internal binaries and plugin repository +-LIBDIR = $(PREFIX)/lib ++LIBDIR = $(UPREFIX)/lib/munin + + # Server only - Output directory +-HTMLDIR = $(PREFIX)/www/docs +-CGIDIR = $(PREFIX)/www/cgi ++HTMLDIR = $(DESTDIR)/$(MUNIN_WWWDIR)/munin/data ++CGIDIR = $(DESTDIR)/$(MUNIN_WWWDIR)/cgi-bin + + # Where to put internal data for master (RRD, internal files, ...) +-DBDIR = $(DESTDIR)/var/opt/munin ++DBDIR = $(MUNIN_DBDIR) + + # Where to put internal data for node (plugin state, ...) +-DBDIRNODE = $(DESTDIR)/var/opt/munin-node ++DBDIRNODE = $(DBDIR) + + # Client only - Where the spool files are written. Must be writable by + # group "munin", and should be preserved between reboots +@@ -56,23 +59,23 @@ SPOOLDIR = $(DBDIR)/spool + PLUGSTATE = $(DBDIRNODE)/plugin-state + + # Where Munin should place its logs. +-LOGDIR = $(PREFIX)/log/munin ++LOGDIR = $(MUNIN_LOGDIR) + + # Location of PID files and other statefiles. On the server, must be + # writable by the user "munin". +-STATEDIR = $(DESTDIR)/var/run/munin ++STATEDIR = $(MUNIN_STATEDIR) + + # The perl interpreter to use +-PERL := $(shell which perl) ++PERL := $(PERL5) + + # The python interpreter to use (used by some plugins) +-PYTHON := /usr/bin/env python3 ++PYTHON := $(PYTHONBIN) + + # The ruby interpreter to use (used by some plugins) +-RUBY := /usr/bin/env ruby ++RUBY := $(RUBY) + + # The java runtime to use (used by some plugins) +-JAVARUN := /usr/bin/java ++JAVARUN := $(JAVA_HOME)/bin/java + + # The java library dir to use (used by some plugins) + # this is needed in order to be able to install +@@ -89,13 +92,14 @@ JAVALIBDIR = $(LIBDIR) + # On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh + # In general: bash or ksh will work + # +-GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` LANG=C sh -c 'type sh | sed "s/.* //"') ++GOODSH := $(BASH) + + # Path of bash for bash specific plugins +-BASH := /bin/bash ++BASH := $(BASH) + + # Server only - Where to install the perl libraries +-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) ++PERLVENDORLIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2) ++PERLLIB = $(DESTDIR)$(PERLVENDORLIB) + + # Client only - Install plugins for this architecture + # the LANG=C makes tr work as expected, not regarding any locale it +@@ -116,8 +120,8 @@ MKTEMP := $(shell ./test-mktemp) + VERSION := $(shell ./getversion) + + # User to run munin as +-USER := munin +-GROUP := munin ++USER := $(MUNIN_USER) ++GROUP := $(MUNIN_GROUP) + + # Default user to run the plugins as + PLUGINUSER := nobody +@@ -125,32 +129,8 @@ PLUGINUSER := nobody + # Default user to run the cgi as + CGIUSER := nobody + +-# Which command to use to check if the USER and GROUP to run Munin as, exists. +-ifneq ($(shell which getent),) +- # "getent" works on most modern OS +- CHECKUSER_COMMAND := getent passwd $(USER) +- CHECKGROUP_COMMAND := getent group $(GROUP) +-else +- ifeq ($(OSTYPE),darwin) +- # This should work for OSX 10.5 (Leopard) or later +- CHECKUSER_COMMAND := dscl . -read /Users/$(USER) +- CHECKGROUP_COMMAND := dscl . -read /Groups/$(GROUP) +- else +- ifeq ($(OSTYPE),cygwin) +- CHECKUSER_COMMAND := id $(USER) +- CHECKGROUP_COMMAND := grep ^$(GROUP): /etc/group +- else +- ifeq ($(OSTYPE),hp-ux) +- CHECKUSER_COMMAND := pwget -n $(USER) +- CHECKGROUP_COMMAND := grget -n $(GROUP) +- else +- $(warning Missing test for user existence on this platform. Skipping this check and hoping for the best ...) +- CHECKUSER_COMMAND := true +- CHECKGROUP_COMMAND := true +- endif +- endif +- endif +-endif ++CHECKUSER_COMMAND := true ++CHECKGROUP_COMMAND := true + CHECKUSER := $(shell $(CHECKUSER_COMMAND) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) + CHECKGROUP := $(shell $(CHECKGROUP_COMMAND) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) + +@@ -159,7 +139,7 @@ CHMOD := chmod + CHGRP := chgrp + + # Java compiler stuff - only needed on the buildhost +-JC := javac ++JC := $(JAVA_HOME)/bin/javac + JFLAGS := -g -source 1.7 -target 1.7 -Xlint + JAR := jar diff --git a/sysutils/munin-common/patches/patch-common_Build.PL b/sysutils/munin-common/patches/patch-common_Build.PL new file mode 100644 index 00000000000..9253b9d2792 --- /dev/null +++ b/sysutils/munin-common/patches/patch-common_Build.PL @@ -0,0 +1,14 @@ +$NetBSD: patch-common_Build.PL,v 1.1 2019/09/09 12:21:44 tm Exp $ + +Add missing module_name so that Munin::Common becomes a valid Perl Module. + +--- common/Build.PL.orig 2019-01-17 12:03:08.506724040 +0000 ++++ common/Build.PL +@@ -4,6 +4,7 @@ my $version = `../getversion`; + chomp($version); + + my $build = Module::Build->new( ++ module_name => 'Munin::Common', + dist_name => 'Munin::Common', + dist_version => $version, + dist_author => 'The Munin Team <munin-users@lists.sourceforge.net>', diff --git a/sysutils/munin-common/patches/patch-lib_Munin_Common_Defaults.pm b/sysutils/munin-common/patches/patch-lib_Munin_Common_Defaults.pm new file mode 100644 index 00000000000..53ca4f34e4b --- /dev/null +++ b/sysutils/munin-common/patches/patch-lib_Munin_Common_Defaults.pm @@ -0,0 +1,41 @@ +$NetBSD: patch-lib_Munin_Common_Defaults.pm,v 1.1 2019/09/09 12:21:44 tm Exp $ + +Initialize default paths for all Munin components. + +--- common/lib/Munin/Common/Defaults.pm.orig 2014-11-24 21:46:24.000000000 +0000 ++++ common/lib/Munin/Common/Defaults.pm +@@ -18,25 +18,25 @@ my $COMPONENT_ROOT = dirname(__FILE__) . + our $DROPDOWNLIMIT = 1; + + our $MUNIN_PREFIX = ''; +-our $MUNIN_CONFDIR = "$COMPONENT_ROOT/t/config/"; ++our $MUNIN_CONFDIR = '@PKG_SYSCONFDIR@/'; + our $MUNIN_BINDIR = ''; + our $MUNIN_SBINDIR = ''; + our $MUNIN_DOCDIR = ''; +-our $MUNIN_LIBDIR = ''; +-our $MUNIN_HTMLDIR = ''; +-our $MUNIN_CGIDIR = ''; ++our $MUNIN_LIBDIR = '@MUNIN_LIBDIR@'; ++our $MUNIN_HTMLDIR = '@MUNIN_WWWDIR@/munin/data'; ++our $MUNIN_CGIDIR = '@MUNIN_WWWDIR@/cgi-bin'; + our $MUNIN_CGITMPDIR = ''; +-our $MUNIN_DBDIR = ''; +-our $MUNIN_PLUGSTATE = ''; ++our $MUNIN_DBDIR = '@MUNIN_DBDIR@'; ++our $MUNIN_PLUGSTATE = '@MUNIN_PLUGSTATE@'; + our $MUNIN_SPOOLDIR = ''; + our $MUNIN_MANDIR = ''; +-our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/"; +-our $MUNIN_STATEDIR = ''; ++our $MUNIN_LOGDIR = '@MUNIN_LOGDIR@/'; ++our $MUNIN_STATEDIR = '@MUNIN_STATEDIR@'; + our $MUNIN_USER = getpwuid $UID; + our $MUNIN_GROUP = getgrgid $GID; + our $MUNIN_PLUGINUSER = getpwuid $UID; + our $MUNIN_VERSION = 'svn'; +-our $MUNIN_PERL = '/usr/bin/perl'; ++our $MUNIN_PERL = '@PERL5@'; + our $MUNIN_PERLLIB = ''; + our $MUNIN_GOODSH = ''; + our $MUNIN_BASH = ''; diff --git a/sysutils/munin-doc/Makefile b/sysutils/munin-doc/Makefile deleted file mode 100644 index 6b4bdc25b22..00000000000 --- a/sysutils/munin-doc/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $NetBSD: Makefile,v 1.21 2019/08/11 13:23:10 wiz Exp $ - -VERS= 1.3.2 -DISTNAME= munin_${VERS} -PKGNAME= munin-doc-${VERS} -PKGREVISION= 10 -CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} - -MAINTAINER= he@NetBSD.org -HOMEPAGE= http://munin-monitoring.org/ -COMMENT= System monitoring tool, documentation -LICENSE= gnu-gpl-v2 - -BUILD_DEPENDS+= htmldoc>=0:../../www/htmldoc -BUILD_DEPENDS+= html2text>=0:../../textproc/html2text - -USE_TOOLS+= perl pod2man -USE_TOOLS+= gmake -USE_PKGINSTALL= YES - -WRKSRC= ${WRKDIR}/${DISTNAME:S:_:-:} - -INSTALL_TARGET= install-doc install-man - -BUILD_TARGET= build-doc build-man - -MAKE_ENV+= PERL5=${PERL5:Q} -MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} -CHECK_PORTABILITY_SKIP+= node/node.d/* - -PYTHON_FOR_BUILD_ONLY= yes - -.include "../../lang/python/application.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/munin-doc/PLIST b/sysutils/munin-doc/PLIST deleted file mode 100644 index d56b7154f20..00000000000 --- a/sysutils/munin-doc/PLIST +++ /dev/null @@ -1,21 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2018/01/01 22:29:57 rillig Exp $ -man/man5/munin-node.conf.5 -man/man5/munin.conf.5 -man/man8/munin-cron.8 -man/man8/munin-graph.8 -man/man8/munin-html.8 -man/man8/munin-limits.8 -man/man8/munin-node-configure-snmp.8 -man/man8/munin-node-configure.8 -man/man8/munin-node.8 -man/man8/munin-run.8 -man/man8/munin-update.8 -share/doc/munin/COPYING -share/doc/munin/README.api -share/doc/munin/README.plugins -share/doc/munin/munin-doc.html -share/doc/munin/munin-doc.pdf -share/doc/munin/munin-doc.txt -share/doc/munin/munin-faq.html -share/doc/munin/munin-faq.pdf -share/doc/munin/munin-faq.txt diff --git a/sysutils/munin-doc/distinfo b/sysutils/munin-doc/distinfo deleted file mode 100644 index 59c99fc53c1..00000000000 --- a/sysutils/munin-doc/distinfo +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: distinfo,v 1.6 2015/11/04 01:32:22 agc Exp $ - -SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a -RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4 -SHA512 (munin_1.3.2.tar.gz) = 34eaec986b9486a8df0e0e6f9817b9f18082d870c961912719c6d7d4dbc81b92cf9614f04607b9bb80b83c3a99b20ab129933ba8679ab81034c46da9f89d18d7 -Size (munin_1.3.2.tar.gz) = 309319 bytes -SHA1 (patch-aa) = b98b1b1683928688fd15dbaf964d77e5daa285eb -SHA1 (patch-ad) = d3630a400eced497b6f0ca2bfd43d57512364b1d -SHA1 (patch-node_munin-node-configure-snmp.in) = 5bc8eb427ea12867a7d93d464fb960b0346db7b3 -SHA1 (patch-node_munin-node-configure.in) = 13077cdda2a46da0b860a7f53b5131810acbd8a2 -SHA1 (patch-node_munin-node.conf.pod) = 0b29baf932c4bc98df6d4e26ee1c2e62ed73bafa -SHA1 (patch-node_munin-node.in) = 7752355592ad0112dcbdd40959a481dd73ae19b5 -SHA1 (patch-node_munin-run.in) = f2a18421c881e76592ad7d6d2bf1cc9607a8d544 -SHA1 (patch-server_munin-cron.pod) = d2c2af47a7e935a385e752b9686b187512087ae4 -SHA1 (patch-server_munin-graph.in) = 3bfc3be349eca97bc62a821ad6573f3d02e3fa2c -SHA1 (patch-server_munin-html.in) = 2739d0002d60a3d9d2c731ab7a6e0e06f6974fb5 -SHA1 (patch-server_munin-limits.in) = ad30244579736ee2934667dc6e35244135f4e0ae -SHA1 (patch-server_munin-update.in) = edfb0449fa706e368f209059e1d0d78d21b07f56 -SHA1 (patch-server_munin.conf.pod) = 6d02fe31cf22bf6e08d9f4b12f73ccf85377f01e diff --git a/sysutils/munin-doc/patches/patch-aa b/sysutils/munin-doc/patches/patch-aa deleted file mode 100644 index 6af7b9af46e..00000000000 --- a/sysutils/munin-doc/patches/patch-aa +++ /dev/null @@ -1,91 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2013/06/17 13:28:28 wiz Exp $ - -Redefine where we install this package. - ---- Makefile.config.orig 2005-04-15 20:29:18.000000000 +0000 -+++ Makefile.config -@@ -7,32 +7,36 @@ - # - # the base of the Munin installation. - # --PREFIX = $(DESTDIR)/opt/munin -+ifdef PREFIX -+UPREFIX = $(DESTDIR)$(PREFIX) -+else -+UPREFIX= = $(DESTDIR)$(LOCALBASE) -+endif - - # Where Munin keeps its configurations (server.conf, client.conf, ++) --CONFDIR = $(DESTDIR)/etc/opt/munin -+CONFDIR = $(UPREFIX)/etc/munin - - # Server only - where to put munin-cron --BINDIR = $(PREFIX)/bin -+BINDIR = $(UPREFIX)/bin - - # Client only - where to put munin-node, munin-node-configure, and munin-run --SBINDIR = $(PREFIX)/sbin -+SBINDIR = $(UPREFIX)/sbin - - # Where to put text and html documentation --DOCDIR = $(PREFIX)/doc -+DOCDIR = $(UPREFIX)/share/doc/munin - - # Where to put man pages --MANDIR = $(PREFIX)/man -+MANDIR = $(UPREFIX)/man - - # Where to put internal binaries and plugin repository --LIBDIR = $(PREFIX)/lib -+LIBDIR = $(UPREFIX)/lib/munin - - # Server only - Output directory --HTMLDIR = $(PREFIX)/var/www -+HTMLDIR = $(UPREFIX)/www/munin/data - CGIDIR = $(HTMLDIR)/cgi - - # Client only - Where to put RRD files and other intenal data --DBDIR = $(DESTDIR)/var/opt/munin -+DBDIR = $(DESTDIR)/var/munin - - # Client only - Where plugins should put their states. Must be writable by - # group "munin", and should be preserved between reboots -@@ -45,14 +49,14 @@ LOGDIR = $(DESTDIR)/var/log/munin - # writable by the user "munin". - STATEDIR = $(DESTDIR)/var/run/munin - --# The perl interpreter to use --PERL = $(shell which perl) -+# The perl interpreter to use (passed in by pkgsrc) -+PERL = ${PERL5} - - # The python interpreter to use (used by some plugins) - PYTHON = /usr/bin/env python - - # Server only - Where to install the perl libraries --PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") -+PERLLIB = ${PERL5_SITELIB} - - # Client only - Install plugins for this architecture - OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -65,16 +69,15 @@ HOSTNAME = $(shell hostname) - VERSION = $(shell cat RELEASE) - - # User to run munin as --USER = munin --GROUP = munin -+USER = ${MUNIN_USER} -+GROUP = ${MUNIN_GROUP} - - # Default user to run the plugins as - PLUGINUSER = nobody - - # Which command to use to check if the USER and GROUP to run Munin as, exists. --GETENT = $(shell which getent || which true 2>/dev/null) --CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) --CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) -+CHECKUSER = $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) -+CHECKGROUP = $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) - - CHOWN = chown - CHMOD = chmod diff --git a/sysutils/munin-doc/patches/patch-ad b/sysutils/munin-doc/patches/patch-ad deleted file mode 100644 index c73dce87b01..00000000000 --- a/sysutils/munin-doc/patches/patch-ad +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2013/06/17 13:28:28 wiz Exp $ - ---- Makefile.orig 2005-04-15 20:37:29.000000000 +0000 -+++ Makefile -@@ -37,8 +37,6 @@ install-main: build - $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/ - $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/ - -- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ -- - $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/ - - $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/ -@@ -73,7 +71,6 @@ install-node-non-snmp: build - - $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/ - $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/ -- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ - $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ - - install-node-plugins: build diff --git a/sysutils/munin-doc/patches/patch-node_munin-node-configure-snmp.in b/sysutils/munin-doc/patches/patch-node_munin-node-configure-snmp.in deleted file mode 100644 index 3c9fd3fbc70..00000000000 --- a/sysutils/munin-doc/patches/patch-node_munin-node-configure-snmp.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-node_munin-node-configure-snmp.in,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- node/munin-node-configure-snmp.in.orig 2005-04-15 20:29:18.000000000 +0000 -+++ node/munin-node-configure-snmp.in -@@ -551,6 +551,8 @@ sub get_plugins - - 1; - -+=encoding iso-8859-1 -+ - =head1 NAME - - munin-node-configure-snmp - A sub-program used by munin-node-configure to diff --git a/sysutils/munin-doc/patches/patch-node_munin-node-configure.in b/sysutils/munin-doc/patches/patch-node_munin-node-configure.in deleted file mode 100644 index 5c26ddf60bc..00000000000 --- a/sysutils/munin-doc/patches/patch-node_munin-node-configure.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-node_munin-node-configure.in,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- node/munin-node-configure.in.orig 2005-04-15 20:29:18.000000000 +0000 -+++ node/munin-node-configure.in -@@ -553,6 +553,8 @@ sub get_plugins - - 1; - -+=encoding iso-8859-1 -+ - =head1 NAME - - munin-node-configure - A program to view configurations for munin-node diff --git a/sysutils/munin-doc/patches/patch-node_munin-node.conf.pod b/sysutils/munin-doc/patches/patch-node_munin-node.conf.pod deleted file mode 100644 index bafb7036f76..00000000000 --- a/sysutils/munin-doc/patches/patch-node_munin-node.conf.pod +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-node_munin-node.conf.pod,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- node/munin-node.conf.pod.orig 2005-04-15 20:29:18.000000000 +0000 -+++ node/munin-node.conf.pod -@@ -1,3 +1,5 @@ -+=encoding iso-8859-1 -+ - =head1 NAME - - node.conf - Munin-node configuration file -@@ -36,6 +38,8 @@ owned by root. Default on. - Files matching <regex> in the node.d/ and node-conf.d/ - directories will be overlooked. - -+=back -+ - =head1 EXAMPLE - - A pretty normal configuration file: diff --git a/sysutils/munin-doc/patches/patch-node_munin-node.in b/sysutils/munin-doc/patches/patch-node_munin-node.in deleted file mode 100644 index d952ef39d4d..00000000000 --- a/sysutils/munin-doc/patches/patch-node_munin-node.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-node_munin-node.in,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- node/munin-node.in.orig 2005-04-15 20:31:21.000000000 +0000 -+++ node/munin-node.in -@@ -1059,6 +1059,8 @@ sub get_var - - 1; - -+=encoding iso-8859-1 -+ - =head1 NAME - - munin-node - A daemon to gather information in cooperation with the main diff --git a/sysutils/munin-doc/patches/patch-node_munin-run.in b/sysutils/munin-doc/patches/patch-node_munin-run.in deleted file mode 100644 index 13470960caf..00000000000 --- a/sysutils/munin-doc/patches/patch-node_munin-run.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-node_munin-run.in,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- node/munin-run.in.orig 2005-04-15 20:31:21.000000000 +0000 -+++ node/munin-run.in -@@ -625,6 +625,8 @@ sub get_var - - 1; - -+=encoding iso-8859-1 -+ - =head1 NAME - - munin-run - A program to run munin-node plugins from the command line diff --git a/sysutils/munin-doc/patches/patch-server_munin-cron.pod b/sysutils/munin-doc/patches/patch-server_munin-cron.pod deleted file mode 100644 index 067e3af22a9..00000000000 --- a/sysutils/munin-doc/patches/patch-server_munin-cron.pod +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-server_munin-cron.pod,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- server/munin-cron.pod.orig 2005-04-15 20:29:18.000000000 +0000 -+++ server/munin-cron.pod -@@ -1,3 +1,5 @@ -+=encoding iso-8859-1 -+ - =head1 NAME - - munin-cron - A program to batch other munin programs diff --git a/sysutils/munin-doc/patches/patch-server_munin-graph.in b/sysutils/munin-doc/patches/patch-server_munin-graph.in deleted file mode 100644 index 766e1aeeee9..00000000000 --- a/sysutils/munin-doc/patches/patch-server_munin-graph.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-server_munin-graph.in,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- server/munin-graph.in.orig 2005-04-15 20:31:22.000000000 +0000 -+++ server/munin-graph.in -@@ -1092,6 +1092,8 @@ sub escape - - 1; - -+=encoding iso-8859-1 -+ - =head1 NAME - - munin-graph - A program to create graphs from data contained in rrd-files. diff --git a/sysutils/munin-doc/patches/patch-server_munin-html.in b/sysutils/munin-doc/patches/patch-server_munin-html.in deleted file mode 100644 index d1c0db47346..00000000000 --- a/sysutils/munin-doc/patches/patch-server_munin-html.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-server_munin-html.in,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- server/munin-html.in.orig 2005-04-15 20:31:22.000000000 +0000 -+++ server/munin-html.in -@@ -597,6 +597,8 @@ sub get_png_size - logger("munin-html finished"); - close $log; - -+=encoding iso-8859-1 -+ - =head1 NAME - - munin-html - A program to draw html-pages on an Munin installation diff --git a/sysutils/munin-doc/patches/patch-server_munin-limits.in b/sysutils/munin-doc/patches/patch-server_munin-limits.in deleted file mode 100644 index 98a4e661b08..00000000000 --- a/sysutils/munin-doc/patches/patch-server_munin-limits.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-server_munin-limits.in,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- server/munin-limits.in.orig 2005-04-15 20:29:18.000000000 +0000 -+++ server/munin-limits.in -@@ -567,6 +567,8 @@ sub logger { - - close $log; - -+=encoding iso-8859-1 -+ - =head1 NAME - - munin-limits - A program to check for any off-limit values diff --git a/sysutils/munin-doc/patches/patch-server_munin-update.in b/sysutils/munin-doc/patches/patch-server_munin-update.in deleted file mode 100644 index d6614370b95..00000000000 --- a/sysutils/munin-doc/patches/patch-server_munin-update.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-server_munin-update.in,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- server/munin-update.in.orig 2005-04-15 20:31:22.000000000 +0000 -+++ server/munin-update.in -@@ -1210,6 +1210,8 @@ sub sanitise_fieldname - - 1; - -+=encoding iso-8859-1 -+ - =head1 NAME - - munin-update - A program to gather data from machines running munin-node diff --git a/sysutils/munin-doc/patches/patch-server_munin.conf.pod b/sysutils/munin-doc/patches/patch-server_munin.conf.pod deleted file mode 100644 index 57bb2182df6..00000000000 --- a/sysutils/munin-doc/patches/patch-server_munin.conf.pod +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-server_munin.conf.pod,v 1.1 2013/06/17 13:28:28 wiz Exp $ - -Fix build with perl-5.18's pod2man. - ---- server/munin.conf.pod.orig 2005-04-15 20:29:18.000000000 +0000 -+++ server/munin.conf.pod -@@ -1,3 +1,5 @@ -+=encoding iso-8859-1 -+ - =head1 NAME - - munin.conf - Munin configuration file diff --git a/sysutils/munin-server/DESCR b/sysutils/munin-master/DESCR index fcfb9ca98ee..73694b6a6ff 100644 --- a/sysutils/munin-server/DESCR +++ b/sysutils/munin-master/DESCR @@ -5,5 +5,3 @@ Munin has a master/node architecture. The master connects to all the nodes at regular intervals, and asks them for data. It then stores the data in RRD-files, and (if needed) updates the graphs. One of the main goals has been ease of creating own "plugins" (graphs). - -This package contains the server. diff --git a/sysutils/munin-master/MESSAGE b/sysutils/munin-master/MESSAGE new file mode 100644 index 00000000000..6e3498254f9 --- /dev/null +++ b/sysutils/munin-master/MESSAGE @@ -0,0 +1,10 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2019/09/09 12:21:44 tm Exp $ + +You can start the collection of statistics and production of graphs by +installing a Cron for the ${MUNIN_USER} user that executes the following +command every 5 minutes: + + ${PREFIX}/bin/munin-cron + +=========================================================================== diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile new file mode 100644 index 00000000000..8208ca1c186 --- /dev/null +++ b/sysutils/munin-master/Makefile @@ -0,0 +1,69 @@ +# $NetBSD: Makefile,v 1.1 2019/09/09 12:21:44 tm Exp $ +# + +PKGNAME= ${DISTNAME:S/munin/munin-master/} +COMMENT= System monitoring tool, master version + +.include "../../sysutils/munin-common/Makefile.common" + +DEPENDS+= munin-common>=${PKGVERSION_NOREV}:../../sysutils/munin-common +DEPENDS+= p5-CGI-Fast>=0:../../www/p5-CGI-Fast +DEPENDS+= p5-Date-Manip>=0:../../devel/p5-Date-Manip +DEPENDS+= p5-File-Copy-Recursive>=0.38:../../sysutils/p5-File-Copy-Recursive +DEPENDS+= p5-HTML-Template>=0:../../www/p5-HTML-Template +DEPENDS+= p5-IO-Socket-INET6>=2.69:../../net/p5-IO-Socket-INET6 +DEPENDS+= p5-Log-Log4perl>=1.18:../../devel/p5-Log-Log4perl +DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay +DEPENDS+= p5-Time-HiRes>=0:../../time/p5-Time-HiRes +DEPENDS+= p5-URI>=1.60:../../www/p5-URI +DEPENDS+= rrdtool>=1.2:../../databases/rrdtool + +OWN_DIRS+= ${PKG_SYSCONFDIR}/munin-conf.d +OWN_DIRS+= ${PKG_SYSCONFDIR}/static +OWN_DIRS+= ${PKG_SYSCONFDIR}/templates +OWN_DIRS+= ${PKG_SYSCONFDIR}/templates/partial + +OWN_DIRS_PERMS+= ${MUNIN_DBDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755 +OWN_DIRS_PERMS+= ${MUNIN_DBDIR}/cgi-tmp nobody ${MUNIN_GROUP} 0755 +OWN_DIRS_PERMS+= ${MUNIN_LOGDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755 +OWN_DIRS_PERMS+= ${MUNIN_SPOOLDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0775 +OWN_DIRS_PERMS+= ${MUNIN_STATEDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755 +OWN_DIRS_PERMS+= ${MUNIN_WWWDIR}/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 +OWN_DIRS_PERMS+= ${MUNIN_WWWDIR}/munin/data ${MUNIN_USER} ${MUNIN_GROUP} 0755 + +TMPL_EGDIR= ${EGDIR}/templates +STATIC_EGDIR= ${EGDIR}/static +INST_TMPL_DIR= ${PKG_SYSCONFDIR}/templates + +TMPL_FILES= munin-categoryview.tmpl munin-comparison-day.tmpl \ + munin-comparison-month.tmpl munin-comparison-week.tmpl \ + munin-comparison-year.tmpl munin-domainview.tmpl \ + munin-dynazoom.tmpl munin-nodeview.tmpl munin-overview.tmpl \ + munin-problemview.tmpl munin-serviceview.tmpl \ + partial/bottom_navigation.tmpl partial/footer.tmpl \ + partial/generated_by.tmpl partial/head.tmpl partial/logo_navigation.tmpl \ + partial/logo_navigation_comparison.tmpl \ + partial/logo_navigation_problem.tmpl partial/logo_path.tmpl \ + partial/navigation.tmpl partial/path.tmpl + +STATIC_FILES= definitions.html dynazoom.html favicon.ico formatdate.js \ + logo-h.png logo.png querystring.js zoom.js \ + style-1.2.css style-new.css style.css + +CONF_FILES+= ${EGDIR}/munin.conf ${PKG_SYSCONFDIR}/munin.conf +.for f in ${TMPL_FILES} +CONF_FILES+= ${TMPL_EGDIR}/${f} ${INST_TMPL_DIR}/${f} +.endfor +.for f in ${STATIC_FILES} +CONF_FILES+= ${STATIC_EGDIR}/${f} ${PKG_SYSCONFDIR}/static/${f} +.endfor + +INSTALLATION_DIRS+= ${EGDIR} + +CHECK_PORTABILITY_SKIP+= node/node.d/* + +BUILD_TARGET= build +INSTALL_TARGET= install-master-prime + +.include "../../lang/perl5/module.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/munin-master/PLIST b/sysutils/munin-master/PLIST new file mode 100644 index 00000000000..fb4b20d89c7 --- /dev/null +++ b/sysutils/munin-master/PLIST @@ -0,0 +1,76 @@ +@comment $NetBSD: PLIST,v 1.1 2019/09/09 12:21:44 tm Exp $ +bin/munin-check +bin/munin-cron +lib/munin/DejaVuSans.ttf +lib/munin/DejaVuSansMono.ttf +lib/munin/munin-datafile2storable +lib/munin/munin-graph +lib/munin/munin-html +lib/munin/munin-limits +lib/munin/munin-storable2datafile +lib/munin/munin-update +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Config.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/GraphOld.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Group.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/GroupRepository.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/HTMLConfig.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/HTMLOld.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Host.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/LimitsOld.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Logger.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Node.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/ProcessManager.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Update.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/UpdateWorker.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Utils.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Worker.pm +man/man3/Munin::Master::Config.3 +man/man3/Munin::Master::Group.3 +man/man3/Munin::Master::GroupRepository.3 +man/man3/Munin::Master::HTMLOld.3 +man/man3/Munin::Master::Host.3 +man/man3/Munin::Master::LimitsOld.3 +man/man3/Munin::Master::Logger.3 +man/man3/Munin::Master::Node.3 +man/man3/Munin::Master::ProcessManager.3 +man/man3/Munin::Master::Update.3 +man/man3/Munin::Master::UpdateWorker.3 +man/man3/Munin::Master::Utils.3 +man/man3/Munin::Master::Worker.3 +share/examples/munin/munin.conf +share/examples/munin/static/definitions.html +share/examples/munin/static/dynazoom.html +share/examples/munin/static/favicon.ico +share/examples/munin/static/formatdate.js +share/examples/munin/static/logo-h.png +share/examples/munin/static/logo.png +share/examples/munin/static/querystring.js +share/examples/munin/static/style-1.2.css +share/examples/munin/static/style-new.css +share/examples/munin/static/style.css +share/examples/munin/static/zoom.js +share/examples/munin/templates/munin-categoryview.tmpl +share/examples/munin/templates/munin-comparison-day.tmpl +share/examples/munin/templates/munin-comparison-month.tmpl +share/examples/munin/templates/munin-comparison-week.tmpl +share/examples/munin/templates/munin-comparison-year.tmpl +share/examples/munin/templates/munin-domainview.tmpl +share/examples/munin/templates/munin-dynazoom.tmpl +share/examples/munin/templates/munin-nodeview.tmpl +share/examples/munin/templates/munin-overview.tmpl +share/examples/munin/templates/munin-problemview.tmpl +share/examples/munin/templates/munin-serviceview.tmpl +share/examples/munin/templates/partial/bottom_navigation.tmpl +share/examples/munin/templates/partial/footer.tmpl +share/examples/munin/templates/partial/generated_by.tmpl +share/examples/munin/templates/partial/head.tmpl +share/examples/munin/templates/partial/logo_navigation.tmpl +share/examples/munin/templates/partial/logo_navigation_comparison.tmpl +share/examples/munin/templates/partial/logo_navigation_problem.tmpl +share/examples/munin/templates/partial/logo_path.tmpl +share/examples/munin/templates/partial/navigation.tmpl +share/examples/munin/templates/partial/path.tmpl +www/cgi-bin/munin-cgi-graph +www/cgi-bin/munin-cgi-html +www/munin/data/.htaccess +@pkgdir share/examples/munin/munin-conf.d diff --git a/sysutils/munin-node/DESCR b/sysutils/munin-node/DESCR index 808ab0816be..73694b6a6ff 100644 --- a/sysutils/munin-node/DESCR +++ b/sysutils/munin-node/DESCR @@ -5,5 +5,3 @@ Munin has a master/node architecture. The master connects to all the nodes at regular intervals, and asks them for data. It then stores the data in RRD-files, and (if needed) updates the graphs. One of the main goals has been ease of creating own "plugins" (graphs). - -This package contains the client. diff --git a/sysutils/munin-node/MESSAGE b/sysutils/munin-node/MESSAGE index 71df9d5c4fa..3debab0e8fc 100644 --- a/sysutils/munin-node/MESSAGE +++ b/sysutils/munin-node/MESSAGE @@ -1,12 +1,6 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2006/12/05 14:53:32 xtraeme Exp $ +$NetBSD: MESSAGE,v 1.4 2019/09/09 12:21:44 tm Exp $ Plugins can be auto-configured with "munin-node-configure --shell | sh" -You may also want to add an entry such as - -${VARBASE}/log/munin/munin-node.log munin:munin 644 7 * 24 Z - -to /etc/newsyslog.conf to have the node log rotated. - =========================================================================== diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 971acfeb01c..669668e38cd 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -1,116 +1,46 @@ -# $NetBSD: Makefile,v 1.39 2019/08/11 13:23:10 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2019/09/09 12:21:44 tm Exp $ # -DISTNAME= munin_${VER} -VER= 1.3.2 -PKGNAME= munin-node-${VER} -PKGREVISION= 22 -CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://munin-monitoring.org/ +PKGNAME= ${DISTNAME:S/munin/munin-node/} COMMENT= System monitoring tool, client version -PKG_DESTDIR_SUPPORT= destdir - -USERGROUP_PHASE= pre-install +.include "../../sysutils/munin-common/Makefile.common" -DEPENDS+= p5-Net-Server>=0:../../net/p5-Net-Server +DEPENDS+= munin-common>=${PKGVERSION_NOREV}:../../sysutils/munin-common +DEPENDS+= p5-IO-Socket-INET6>=0:../../net/p5-IO-Socket-INET6 +DEPENDS+= p5-List-MoreUtils>=0:../../devel/p5-List-MoreUtils DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay -DEPENDS+= munin-doc>=1.3.1:../../sysutils/munin-doc - -.include "../../mk/bsd.prefs.mk" - -USE_TOOLS+= perl:run tar -USE_TOOLS+= gmake -USE_PKGINSTALL= YES - -WRKSRC= ${WRKDIR}/${DISTNAME:S:_:-:} - -PLIST_VARS+= sunos not-sunos netbsd not-netbsd linux not-linux - -.if ${OPSYS} == "Linux" -PLIST.linux= yes -.else -PLIST.not-linux= yes -.endif - -.if ${OPSYS} == "NetBSD" -PLIST.netbsd= yes -.else -PLIST.not-netbsd= yes -.endif - -.if ${OPSYS} == "SunOS" -PLIST.sunos= yes -.else -PLIST.not-sunos= yes -.endif - -PKG_GROUPS_VARS+= MUNIN_GROUP -PKG_USERS_VARS+= MUNIN_USER - -MUNIN_GROUP?= munin -MUNIN_USER?= munin - -PKG_GROUPS= ${MUNIN_GROUP} -PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP} -PKG_GECOS.${MUNIN_USER}= Munin user -PKG_SYSCONFSUBDIR?= munin -REPLACE_PERL+= node/node.d/*.in - -STATEDIR?= ${VARBASE}/munin/plugin-state -MUNIN_RUN?= ${VARBASE}/run/munin - -MAKE_DIRS+= ${PKG_SYSCONFDIR}/plugins - -OWN_DIRS+= ${VARBASE}/munin -OWN_DIRS+= ${MUNIN_RUN} -OWN_DIRS+= ${VARBASE}/log/munin -OWN_DIRS+= ${STATEDIR} - -OWN_DIRS_PERMS+=${VARBASE}/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 -OWN_DIRS_PERMS+=${MUNIN_RUN} ${MUNIN_USER} ${MUNIN_GROUP} 0755 -OWN_DIRS_PERMS+=${VARBASE}/log/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 -OWN_DIRS_PERMS+=${STATEDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0775 - -INSTALL_TARGET= install-node install-node-plugins - -BUILD_TARGET= build - -#MAKE_ENV+= PERL5_SITELIB=${PERL5_SITELIB} -MAKE_ENV+= PREFIX=${PREFIX} -MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} -MAKE_ENV+= MUNIN_USER=${MUNIN_USER} -MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} -MAKE_ENV+= PERL5=${PERL5:Q} -MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} +DEPENDS+= p5-Net-Server>=0:../../net/p5-Net-Server +DEPENDS+= p5-Socket6>=0:../../net/p5-Socket6 +DEPENDS+= p5-Time-HiRes>=0:../../time/p5-Time-HiRes -FILES_SUBST+= PERL=${PERL5:Q} -FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} -FILES_SUBST+= STATEDIR=${STATEDIR} -FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q} -FILES_SUBST+= MUNIN_USER=${MUNIN_USER:Q} -FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP:Q} +OWN_DIRS+= ${PKG_SYSCONFDIR}/plugin-conf.d +OWN_DIRS= ${PKG_SYSCONFDIR}/plugins -MESSAGE_SUBST+= VARBASE=${VARBASE:Q} +OWN_DIRS_PERMS+= ${MUNIN_DBDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755 +OWN_DIRS_PERMS+= ${MUNIN_LOGDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755 +OWN_DIRS_PERMS+= ${MUNIN_PLUGSTATE} nobody ${MUNIN_GROUP} 0775 +OWN_DIRS_PERMS+= ${MUNIN_SPOOLDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0775 +OWN_DIRS_PERMS+= ${MUNIN_STATEDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755 -BUILD_DEFS+= VARBASE +REPLACE_PERL+= node/sbin/munin-node +REPLACE_PERL+= node/sbin/munin-node-configure +REPLACE_PERL+= node/sbin/munin-run +REPLACE_PERL+= plugins/node.d/slony_lag_.in -RCD_SCRIPTS+= munin-node -SMF_NAME= munin +CONF_FILES+= ${EGDIR}/munin-node.conf ${PKG_SYSCONFDIR}/munin-node.conf +INSTALLATION_DIRS+= ${EGDIR} -EGDIR= ${PREFIX}/share/examples/munin +CHECK_INTERPRETER_SKIP+= lib/munin/plugins/tomcat_ -CONF_FILES+= ${EGDIR}/munin-node.conf ${PKG_SYSCONFDIR}/munin-node.conf -INSTALLATION_DIRS+= ${EGDIR} +RCD_SCRIPTS+= munin-node -pre-configure: - cd ${FILESDIR}; ${TAR} cf - . | (cd ${WRKSRC}; ${TAR} xfp -) +BUILD_TARGET= build +INSTALL_TARGET= install-node install-node-plugins post-install: ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${DESTDIR}${EGDIR} .include "../../lang/python/application.mk" +.include "../../lang/ruby/rubyversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/munin-node/PLIST b/sysutils/munin-node/PLIST index 05e2e3c977e..aae1dbba73d 100644 --- a/sysutils/munin-node/PLIST +++ b/sysutils/munin-node/PLIST @@ -1,119 +1,152 @@ -@comment $NetBSD: PLIST,v 1.14 2018/01/01 22:29:57 rillig Exp $ -lib/munin/plugins/acpi +@comment $NetBSD: PLIST,v 1.15 2019/09/09 12:21:44 tm Exp $ +bin/munindoc lib/munin/plugins/amavis lib/munin/plugins/apache_accesses lib/munin/plugins/apache_processes lib/munin/plugins/apache_volume lib/munin/plugins/apc_envunit_ lib/munin/plugins/apc_nis -${PLIST.linux}lib/munin/plugins/apt -${PLIST.linux}lib/munin/plugins/apt_all +lib/munin/plugins/asterisk_channels +lib/munin/plugins/asterisk_channelstypes +lib/munin/plugins/asterisk_codecs +lib/munin/plugins/asterisk_meetme +lib/munin/plugins/asterisk_meetmeusers +lib/munin/plugins/asterisk_sipchannels +lib/munin/plugins/asterisk_sippeers +lib/munin/plugins/asterisk_voicemail lib/munin/plugins/bind9 lib/munin/plugins/bind9_rndc +lib/munin/plugins/cmc_tc_sensor_ lib/munin/plugins/courier_ lib/munin/plugins/courier_mta_mailqueue lib/munin/plugins/courier_mta_mailstats lib/munin/plugins/courier_mta_mailvolume -${PLIST.linux}lib/munin/plugins/cps_ -lib/munin/plugins/cpu lib/munin/plugins/cupsys_pages lib/munin/plugins/df -${PLIST.linux}lib/munin/plugins/df_abs lib/munin/plugins/df_inode lib/munin/plugins/dhcpd3 -${PLIST.linux}lib/munin/plugins/entropy +lib/munin/plugins/digitemp_ +lib/munin/plugins/ejabberd_ lib/munin/plugins/exim_mailqueue lib/munin/plugins/exim_mailqueue_alt lib/munin/plugins/exim_mailstats -${PLIST.linux}lib/munin/plugins/files_ +lib/munin/plugins/fail2ban lib/munin/plugins/foldingathome lib/munin/plugins/foldingathome_rank lib/munin/plugins/foldingathome_wu -${PLIST.not-sunos}lib/munin/plugins/forks -${PLIST.sunos}lib/munin/plugins/fs_df -${PLIST.sunos}lib/munin/plugins/fs_inodes -${PLIST.linux}lib/munin/plugins/fw_conntrack -${PLIST.linux}lib/munin/plugins/fw_forwarded_local -${PLIST.linux}lib/munin/plugins/fw_packets +lib/munin/plugins/freeradius_acct +lib/munin/plugins/freeradius_auth +lib/munin/plugins/freeradius_proxy_acct +lib/munin/plugins/freeradius_proxy_auth +lib/munin/plugins/haproxy_ +lib/munin/plugins/haproxy_ng lib/munin/plugins/hddtemp lib/munin/plugins/hddtemp2 lib/munin/plugins/hddtemp_smartctl lib/munin/plugins/hddtempd -${PLIST.linux}lib/munin/plugins/i2c -${PLIST.linux}lib/munin/plugins/i2c_fan -lib/munin/plugins/if_ -${PLIST.linux}lib/munin/plugins/if_err_ -${PLIST.not-linux}lib/munin/plugins/if_errcoll_ -${PLIST.not-sunos}lib/munin/plugins/interrupts -${PLIST.sunos}lib/munin/plugins/io_busy_ -${PLIST.sunos}lib/munin/plugins/io_bytes_ -${PLIST.sunos}lib/munin/plugins/io_ops_ -${PLIST.not-sunos}lib/munin/plugins/iostat -${PLIST.linux}lib/munin/plugins/iostat_ios -${PLIST.netbsd}lib/munin/plugins/iostat_ops -${PLIST.linux}lib/munin/plugins/ip_ +lib/munin/plugins/hp2000_ +lib/munin/plugins/http_loadtime +lib/munin/plugins/ifx_concurrent_sessions_ lib/munin/plugins/ipac-ng +lib/munin/plugins/ipmi_ +lib/munin/plugins/ipmi_sensor_ lib/munin/plugins/ircu -${PLIST.not-sunos}lib/munin/plugins/irqstats -lib/munin/plugins/load lib/munin/plugins/loggrep +lib/munin/plugins/lpstat lib/munin/plugins/mailman lib/munin/plugins/mailscanner lib/munin/plugins/mbmon_ -lib/munin/plugins/memory -${PLIST.netbsd}lib/munin/plugins/memory_pools -${PLIST.netbsd}lib/munin/plugins/memory_types +lib/munin/plugins/memcached_ lib/munin/plugins/mhttping +lib/munin/plugins/multiping lib/munin/plugins/multips -lib/munin/plugins/munin_graph +lib/munin/plugins/multips_memory +lib/munin/plugins/munin_stats lib/munin/plugins/munin_update +lib/munin/plugins/mysql_ lib/munin/plugins/mysql_bytes +lib/munin/plugins/mysql_innodb lib/munin/plugins/mysql_isam_space_ lib/munin/plugins/mysql_queries lib/munin/plugins/mysql_slowqueries lib/munin/plugins/mysql_threads lib/munin/plugins/named -${PLIST.linux}lib/munin/plugins/netopia +lib/munin/plugins/netopia lib/munin/plugins/netstat -${PLIST.not-sunos}lib/munin/plugins/nfs_client -${PLIST.not-sunos}lib/munin/plugins/nfsd +lib/munin/plugins/nginx_request +lib/munin/plugins/nginx_status +lib/munin/plugins/nomadix_users_ lib/munin/plugins/ntp_ lib/munin/plugins/ntp_kernel_err lib/munin/plugins/ntp_kernel_pll_freq lib/munin/plugins/ntp_kernel_pll_off +lib/munin/plugins/ntp_offset lib/munin/plugins/ntp_states lib/munin/plugins/nut_misc lib/munin/plugins/nut_volts -${PLIST.not-sunos}lib/munin/plugins/open_files -${PLIST.linux}lib/munin/plugins/open_inodes -${PLIST.sunos}lib/munin/plugins/paging_in -${PLIST.sunos}lib/munin/plugins/paging_out +lib/munin/plugins/nutups_ +lib/munin/plugins/nvidia_ +lib/munin/plugins/openvpn lib/munin/plugins/perdition +lib/munin/plugins/pgbouncer_connections +lib/munin/plugins/pgbouncer_requests lib/munin/plugins/ping_ +lib/munin/plugins/plugin.sh lib/munin/plugins/plugins.history lib/munin/plugins/pm3users_ lib/munin/plugins/pop_stats -${PLIST.linux}lib/munin/plugins/port_ lib/munin/plugins/postfix_mailqueue lib/munin/plugins/postfix_mailstats lib/munin/plugins/postfix_mailvolume +lib/munin/plugins/postgres_autovacuum +lib/munin/plugins/postgres_bgwriter +lib/munin/plugins/postgres_cache_ +lib/munin/plugins/postgres_checkpoints +lib/munin/plugins/postgres_connections_ +lib/munin/plugins/postgres_connections_db +lib/munin/plugins/postgres_locks_ +lib/munin/plugins/postgres_oldest_prepared_xact_ +lib/munin/plugins/postgres_prepared_xacts_ +lib/munin/plugins/postgres_querylength_ +lib/munin/plugins/postgres_scans_ +lib/munin/plugins/postgres_size_ +lib/munin/plugins/postgres_streaming_ +lib/munin/plugins/postgres_transactions_ +lib/munin/plugins/postgres_tuples_ +lib/munin/plugins/postgres_users +lib/munin/plugins/postgres_xlog lib/munin/plugins/processes +lib/munin/plugins/proxy_plugin lib/munin/plugins/ps_ lib/munin/plugins/psu_ +lib/munin/plugins/qmailqstat +lib/munin/plugins/qmailscan +lib/munin/plugins/qmailscan-simple lib/munin/plugins/samba lib/munin/plugins/sendmail_mailqueue lib/munin/plugins/sendmail_mailstats lib/munin/plugins/sendmail_mailtraffic -${PLIST.not-sunos}lib/munin/plugins/sensors_ +lib/munin/plugins/slapd_ +lib/munin/plugins/slapd_bdb_cache_ +lib/munin/plugins/slony_lag_ lib/munin/plugins/smart_ lib/munin/plugins/snmp__cpuload lib/munin/plugins/snmp__df +lib/munin/plugins/snmp__df_ram lib/munin/plugins/snmp__fc_if_ lib/munin/plugins/snmp__fc_if_err_ lib/munin/plugins/snmp__if_ lib/munin/plugins/snmp__if_err_ +lib/munin/plugins/snmp__if_multi lib/munin/plugins/snmp__load +lib/munin/plugins/snmp__memory +lib/munin/plugins/snmp__netapp_diskusage_ +lib/munin/plugins/snmp__netapp_inodeusage_ +lib/munin/plugins/snmp__netstat +lib/munin/plugins/snmp__print_pages +lib/munin/plugins/snmp__print_supplies lib/munin/plugins/snmp__processes +lib/munin/plugins/snmp__rdp_users lib/munin/plugins/snmp__sensors_fsc_bx_fan lib/munin/plugins/snmp__sensors_fsc_bx_temp lib/munin/plugins/snmp__sensors_fsc_fan @@ -121,25 +154,79 @@ lib/munin/plugins/snmp__sensors_fsc_temp lib/munin/plugins/snmp__sensors_mbm_fan lib/munin/plugins/snmp__sensors_mbm_temp lib/munin/plugins/snmp__sensors_mbm_volt +lib/munin/plugins/snmp__swap +lib/munin/plugins/snmp__uptime lib/munin/plugins/snmp__users +lib/munin/plugins/snmp__winload +lib/munin/plugins/snmp__winmem +lib/munin/plugins/snort_alerts +lib/munin/plugins/snort_bytes_pkt +lib/munin/plugins/snort_drop_rate +lib/munin/plugins/snort_pattern_match +lib/munin/plugins/snort_pkts +lib/munin/plugins/snort_traffic lib/munin/plugins/spamstats +lib/munin/plugins/squeezebox_ lib/munin/plugins/squid_cache lib/munin/plugins/squid_icp +lib/munin/plugins/squid_objectsize lib/munin/plugins/squid_requests lib/munin/plugins/squid_traffic lib/munin/plugins/surfboard -${PLIST.not-sunos}lib/munin/plugins/swap -${PLIST.netbsd}lib/munin/plugins/swap_size lib/munin/plugins/sybase_space -${PLIST.sunos}lib/munin/plugins/temperature -${PLIST.not-sunos}lib/munin/plugins/uptime -${PLIST.linux}lib/munin/plugins/users -${PLIST.linux}lib/munin/plugins/vlan_ -${PLIST.linux}lib/munin/plugins/vlan_inetuse_ -${PLIST.linux}lib/munin/plugins/vlan_linkuse_ +lib/munin/plugins/tomcat_ +lib/munin/plugins/tomcat_access +lib/munin/plugins/tomcat_jvm +lib/munin/plugins/tomcat_threads +lib/munin/plugins/tomcat_volume +lib/munin/plugins/users +lib/munin/plugins/varnish_ lib/munin/plugins/vmstat +lib/munin/plugins/zimbra_ +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Config.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/Debug.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/History.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/HostEnumeration.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/Plugin.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/PluginList.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Logger.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/OS.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/SNMPConfig.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Server.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Service.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Session.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/SpoolReader.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/SpoolWriter.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Utils.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Plugin.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Plugin/Pgsql.pm +${PERL5_SUB_INSTALLVENDORLIB}/Munin/Plugin/SNMP.pm +man/man1/munin-node-configure.1 +man/man1/munin-node.1 +man/man1/munin-run.1 +man/man1/munindoc.1 +man/man3/Munin::Node::Config.3 +man/man3/Munin::Node::Configure::Debug.3 +man/man3/Munin::Node::Configure::History.3 +man/man3/Munin::Node::Configure::HostEnumeration.3 +man/man3/Munin::Node::Configure::Plugin.3 +man/man3/Munin::Node::Configure::PluginList.3 +man/man3/Munin::Node::Logger.3 +man/man3/Munin::Node::OS.3 +man/man3/Munin::Node::SNMPConfig.3 +man/man3/Munin::Node::Server.3 +man/man3/Munin::Node::Service.3 +man/man3/Munin::Node::Session.3 +man/man3/Munin::Node::SpoolReader.3 +man/man3/Munin::Node::SpoolWriter.3 +man/man3/Munin::Node::Utils.3 +man/man3/Munin::Plugin.3 +man/man3/Munin::Plugin::Pgsql.3 +man/man3/Munin::Plugin::SNMP.3 sbin/munin-node sbin/munin-node-configure -sbin/munin-node-configure-snmp sbin/munin-run share/examples/munin/munin-node.conf +share/examples/rc.d/munin-node +@pkgdir etc/munin/plugin-conf.d +@pkgdir var/munin/plugin-state diff --git a/sysutils/munin-node/PLIST.AIX b/sysutils/munin-node/PLIST.AIX new file mode 100644 index 00000000000..cf68c145299 --- /dev/null +++ b/sysutils/munin-node/PLIST.AIX @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.AIX,v 1.1 2019/09/09 12:21:44 tm Exp $ +lib/munin/plugins/swap diff --git a/sysutils/munin-node/PLIST.FreeBSD b/sysutils/munin-node/PLIST.FreeBSD new file mode 100644 index 00000000000..e1b7f4c9b41 --- /dev/null +++ b/sysutils/munin-node/PLIST.FreeBSD @@ -0,0 +1,13 @@ +@comment $NetBSD: PLIST.FreeBSD,v 1.1 2019/09/09 12:21:44 tm Exp $ +lib/munin/plugins/coretemp +lib/munin/plugins/cpu +lib/munin/plugins/dev_cpu_ +lib/munin/plugins/if_ +lib/munin/plugins/if_errcoll_ +lib/munin/plugins/iostat +lib/munin/plugins/load +lib/munin/plugins/memory +lib/munin/plugins/open_files +lib/munin/plugins/swap +lib/munin/plugins/systat +lib/munin/plugins/uptime diff --git a/sysutils/munin-node/PLIST.Linux b/sysutils/munin-node/PLIST.Linux new file mode 100644 index 00000000000..71315afb0a2 --- /dev/null +++ b/sysutils/munin-node/PLIST.Linux @@ -0,0 +1,32 @@ +@comment $NetBSD: PLIST.Linux,v 1.1 2019/09/09 12:21:44 tm Exp $ +lib/munin/plugins/acpi +lib/munin/plugins/apt +lib/munin/plugins/apt_all +lib/munin/plugins/cps_ +lib/munin/plugins/df_abs +lib/munin/plugins/entropy +lib/munin/plugins/files_ +lib/munin/plugins/forks +lib/munin/plugins/fw_conntrack +lib/munin/plugins/fw_forwarded_local +lib/munin/plugins/fw_packets +lib/munin/plugins/i2c +lib/munin/plugins/i2c_fan +lib/munin/plugins/if_err_ +lib/munin/plugins/interrupts +lib/munin/plugins/iostat_ios +lib/munin/plugins/ip_ +lib/munin/plugins/irqstats +lib/munin/plugins/netopia +lib/munin/plugins/nfs_client +lib/munin/plugins/nfsd +lib/munin/plugins/open_files +lib/munin/plugins/open_inodes +lib/munin/plugins/port_ +lib/munin/plugins/sensors_ +lib/munin/plugins/swap +lib/munin/plugins/uptime +lib/munin/plugins/users +lib/munin/plugins/vlan_ +lib/munin/plugins/vlan_inetuse_ +lib/munin/plugins/vlan_linkuse_ diff --git a/sysutils/munin-node/PLIST.NetBSD b/sysutils/munin-node/PLIST.NetBSD new file mode 100644 index 00000000000..00d199dc815 --- /dev/null +++ b/sysutils/munin-node/PLIST.NetBSD @@ -0,0 +1,19 @@ +@comment $NetBSD: PLIST.NetBSD,v 1.1 2019/09/09 12:21:44 tm Exp $ +lib/munin/plugins/cpu +lib/munin/plugins/forks +lib/munin/plugins/if_ +lib/munin/plugins/if_errcoll_ +lib/munin/plugins/interrupts +lib/munin/plugins/iostat +lib/munin/plugins/iostat_ops +lib/munin/plugins/irqstats +lib/munin/plugins/load +lib/munin/plugins/memory +lib/munin/plugins/memory_pools +lib/munin/plugins/memory_types +lib/munin/plugins/nfs_client +lib/munin/plugins/nfsd +lib/munin/plugins/open_files +lib/munin/plugins/sensors_ +lib/munin/plugins/swap +lib/munin/plugins/uptime diff --git a/sysutils/munin-node/PLIST.SunOS b/sysutils/munin-node/PLIST.SunOS new file mode 100644 index 00000000000..e1380c17f55 --- /dev/null +++ b/sysutils/munin-node/PLIST.SunOS @@ -0,0 +1,15 @@ +@comment $NetBSD: PLIST.SunOS,v 1.1 2019/09/09 12:21:44 tm Exp $ +lib/munin/plugins/cpu +lib/munin/plugins/if_ +lib/munin/plugins/if_err_ +lib/munin/plugins/io_busy_ +lib/munin/plugins/io_bytes_ +lib/munin/plugins/io_ops_ +lib/munin/plugins/iostat +lib/munin/plugins/ipmi_ +lib/munin/plugins/load +lib/munin/plugins/memory +lib/munin/plugins/paging_in +lib/munin/plugins/paging_out +lib/munin/plugins/temperature +lib/munin/plugins/uptime diff --git a/sysutils/munin-node/distinfo b/sysutils/munin-node/distinfo deleted file mode 100644 index 0d436e693ce..00000000000 --- a/sysutils/munin-node/distinfo +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: distinfo,v 1.10 2015/11/04 01:32:22 agc Exp $ - -SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a -RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4 -SHA512 (munin_1.3.2.tar.gz) = 34eaec986b9486a8df0e0e6f9817b9f18082d870c961912719c6d7d4dbc81b92cf9614f04607b9bb80b83c3a99b20ab129933ba8679ab81034c46da9f89d18d7 -Size (munin_1.3.2.tar.gz) = 309319 bytes -SHA1 (patch-aa) = 6c4517444cbcedadd276924c0ff417443618fd2b -SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80 -SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e -SHA1 (patch-ad) = d29f61134077f7875500af2e5671b67913fb2306 -SHA1 (patch-ae) = 63b6acf126bc8baaed0ff429cfa0fa63945e5915 -SHA1 (patch-af) = 094aa38a177778e6df7310a0e61839c08de7dc20 -SHA1 (patch-ag) = d33ff87fae5bef1fb2dd1f12838471b7a7a42fbf -SHA1 (patch-ah) = bd2516b8961c04dd418677f7efb2b6589db15d2e diff --git a/sysutils/munin-node/files/munin-node.sh b/sysutils/munin-node/files/munin-node.sh index 8c5984895a8..e9c4ce51119 100644 --- a/sysutils/munin-node/files/munin-node.sh +++ b/sysutils/munin-node/files/munin-node.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: munin-node.sh,v 1.4 2006/12/29 06:37:03 obache Exp $ +# $NetBSD: munin-node.sh,v 1.5 2019/09/09 12:21:44 tm Exp $ # # PROVIDE: munin-node # REQUIRE: DAEMON diff --git a/sysutils/munin-node/files/node/node.d.netbsd/cpu.in b/sysutils/munin-node/files/node/node.d.netbsd/cpu.in deleted file mode 100755 index b37bb62a998..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/cpu.in +++ /dev/null @@ -1,144 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor CPU usage. -# -# Usage: Place in /etc/munin/node.d/ (or link it there using ln -s) -# -# Parameters understood: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: cpu.in,v $ -# Revision 1.2 2006/06/08 18:59:26 he -# Remove installation of the documentation from this package, to be -# provided by the soon-to-be-committed munin-doc package. -# -# Other minor changes: -# o Remove comented-out bits from package Makefile -# o Re-ordered variables reported by NetBSD's cpu plugin script -# o Use shorter legend text in NetBSD's interrupts plugin script -# -# Bumped package revision. -# -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# Magic markers - optional - used by installation scripts and -# munin-config: -# -#%# family=auto -#%# capabilities=autoconf - - - -if [ "$1" = "autoconf" ]; then - if [ -x /sbin/sysctl ]; then - /sbin/sysctl kern.cp_time > /dev/null - if [ $? = "0" ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi - else - echo no - exit 1 - fi -fi - -if [ "$1" = "config" ]; then - - STATUNITS=`/sbin/sysctl -n kern.clockrate | cut -f15 -d' '` - PERCENT=`/sbin/sysctl -n hw.ncpu | awk '{print ($1)*100}'` - NCPU=`/sbin/sysctl -n hw.ncpu` - if [ "$scaleto100" = yes ]; then - CDEF="${STATUNITS},/,100,*,$NCPU,/" - PERCENT=100 - else - CDEF="${STATUNITS},/,100,*" - PERCENT=$(($NCPU*100)) - fi -# SYSWARNING=$PERCENT*30/100 -# SYSCRITICAL=$PERCENT*50/100 -# INTWARNING=$PERCENT*80/100 -# USRWARNING=$PERCENT*80/100 - - echo 'graph_title CPU usage (' $NCPU ' CPUs)' - echo 'graph_order system interrupt user idle nice' - echo "graph_args --base 1000 -r --lower-limit 0 --upper-limit $PERCENT " - echo 'graph_vlabel %' - echo 'graph_scale no' - echo 'graph_info This graph shows how CPU time is spent.' - echo 'graph_category system' - echo 'graph_period second' - - echo 'system.label system' - echo 'system.draw AREA' - echo 'system.max 5000' - echo 'system.type DERIVE' - echo 'system.min 0' -# echo "system.warning $SYSWARNING" -# echo "system.critical $SYSCRITICAL" - echo 'system.info CPU time spent by the kernel in system activities' - echo "system.cdef system,$CDEF" - - echo 'interrupt.label interrupt' - echo 'interrupt.draw STACK' - echo 'interrupt.max 5000' -# echo "interrupt.warning $INTWARNING" - echo 'interrupt.type DERIVE' - echo 'interrupt.min 0' - echo 'interrupt.info CPU time spent by the kernel processing interrupts' - echo "interrupt.cdef interrupt,$CDEF" - - echo 'user.label user' - echo 'user.draw STACK' - echo 'user.max 5000' -# echo "user.warning $USRWARNING" - echo 'user.type DERIVE' - echo 'user.info CPU time spent by normal programs and daemons' - echo 'user.min 0' - echo "user.cdef user,$CDEF" - - echo 'idle.label idle' - echo 'idle.draw STACK' - echo 'idle.max 5000' - echo 'idle.type DERIVE' - echo 'idle.info Idle CPU time' - echo 'idle.min 0' - echo "idle.cdef idle,$CDEF" - - echo 'nice.label nice' - echo 'nice.draw STACK' - echo 'nice.max 5000' - echo 'nice.type DERIVE' - echo 'nice.info CPU time spent by nice(1)d programs' - echo 'nice.min 0' - echo "nice.cdef nice,$CDEF" - - exit 0 -fi - -/sbin/sysctl kern.cp_time | awk '{ - gsub(",", ""); - split($0, a); - print "system.value " a[10]; - print "interrupt.value " a[13]; - print "user.value " a[4]; - print "idle.value " a[16]; - print "nice.value " a[7]; -}' - - diff --git a/sysutils/munin-node/files/node/node.d.netbsd/df.in b/sysutils/munin-node/files/node/node.d.netbsd/df.in deleted file mode 100755 index caefa65f175..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/df.in +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# -# Script to monitor disk usage. -# -# Parameters understood: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: df.in,v $ -# Revision 1.2 2010/10/27 18:23:13 shattered -# Also ignore null and union filesystems, bump revision. -# -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# Magic markers (optional - used by munin-config and installation -# scripts): -# -#%# family=auto -#%# capabilities=autoconf - -MAXLABEL=20 - -TYPES=noprocfs,devfs,fdescfs,ptyfs,kernfs,nfs,null,union - - -if [ "$1" = "autoconf" ]; then - echo yes - exit 0 -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title Filesystem usage (in %)' - echo 'graph_args --upper-limit 100 -l 0' - echo 'graph_vlabel %' - echo 'graph_category disk' - echo 'graph_info This graph shows disk usage on the machine.' - mfs=0 - /bin/df -P -t $TYPES | tail +2 | grep -v "//" | while read i; do - case $i in - mfs:*) name=mfs$mfs; mfs=`expr $mfs + 1`;; - *) name=`echo $i | awk '{ gsub("[^a-zA-Z0-9_]", "_", $1); print $1 }'` ;; - esac - echo -n "$name.label " - echo $i | awk "{ - dir=\$6; - if (length(dir) <= $MAXLABEL) - print dir - else - printf (\"...%s\n\", substr (dir, length(dir)-$MAXLABEL+4, $MAXLABEL-3)) - print \"$name.info \" \$6 \" -> \" \$1; - }" - echo "$name.warning 92" - echo "$name.critical 98" - done - exit 0 -fi - -mfs=0 -/bin/df -P -t $TYPES | tail +2 | grep -v "//" | while read i; do - case $i in - mfs:*) name=mfs$mfs; mfs=`expr $mfs + 1`;; - *) name=`echo $i | awk '{ gsub("[^a-zA-Z0-9_]", "_", $1); print $1 }'` ;; - esac - echo -n "$name.value " - echo $i | awk '{ print $5 }' | cut -f1 -d% -done diff --git a/sysutils/munin-node/files/node/node.d.netbsd/df_inode.in b/sysutils/munin-node/files/node/node.d.netbsd/df_inode.in deleted file mode 100755 index f76a80564e2..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/df_inode.in +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor inode-usage. -# -# Parameters understood: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: df_inode.in,v $ -# Revision 1.2 2010/10/27 18:23:13 shattered -# Also ignore null and union filesystems, bump revision. -# -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magic markers (optional - used by munin-config and installation -# scripts): -# -#%# family=auto -#%# capabilities=autoconf - -MAXLABEL=20 - -TYPES=noprocfs,devfs,fdescfs,ptyfs,kernfs,nfs,null,union - -print_values() { - mfs=0 - /bin/df -P -i -t $TYPES | tail +2 | grep -v "//" | \ - while read i; do - case $i in - mfs:*) name=mfs$mfs; mfs=`expr $mfs + 1`;; - *) name=`echo $i | awk '{ - gsub("[^a-zA-Z0-9_]", "_", $1); print $1 }'` - ;; - esac - echo -n "$name.value " - echo $i | awk '{ print $8 }' | cut -f1 -d% - done -} - -if [ "$1" = "autoconf" ]; then - if [ "`print_values`" = "" ] ; then - echo no - exit 1 - else - echo yes - exit 0 - fi -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title Inode usage (in %)' - echo 'graph_args --upper-limit 100 -l 0' - echo 'graph_vlabel %' - echo 'graph_category disk' - echo 'graph_info This graph shows the inode usage for the partitions of types that use inodes.' - /bin/df -P -i -t $TYPES | tail +2 | grep -v "//" | awk " - BEGIN { - mfs = 0 - } - { - name = \$1 - dir = \$9 - if (\$1 ~ /^mfs:/) { - name = \"mfs\" mfs - mfs = mfs + 1 - } else { - gsub(/[^a-zA-Z0-9_]/, \"_\", name) - } - if (length(dir) <= $MAXLABEL) - print name \".label \" dir - else - printf (\"%s.label ...%s\n\", name, substr (dir, length(dir)-$MAXLABEL+4, $MAXLABEL-3)) - print name \".info \" dir \" -> \" name - print name \".warning 92\" - print name \".critical 98\" - }" - exit 0 -fi - -print_values diff --git a/sysutils/munin-node/files/node/node.d.netbsd/entropy.in b/sysutils/munin-node/files/node/node.d.netbsd/entropy.in deleted file mode 100644 index 1939394dea4..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/entropy.in +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor available entropy -# -# Usage: Link or copy into /etc/munin/node.d/ -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=auto -#%# capabilities=autoconf - - - -if [ "$1" = "autoconf" ]; then - if [ -x /sbin/rndctl ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi -fi - - -if [ "$1" = "config" ]; then - echo 'graph_title Available entropy' - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel entropy (bytes)' - echo 'graph_scale no' - echo 'graph_category system' - echo 'graph_info This graph shows the amount of entropy available in the system.' - echo 'entropy.label entropy' - echo 'entropy.info The number of random bytes available. This is typically used by cryptographic applications.' - exit 0 -fi - -echo -n "entropy.value " -/sbin/rndctl -s | /usr/bin/awk '/bits currently stored/ { print $1 }' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/forks.in b/sysutils/munin-node/files/node/node.d.netbsd/forks.in deleted file mode 100755 index a86ee79f536..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/forks.in +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor the number of forks per second on the machine. -# -# Parameters: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: forks.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magick markers (optional - used by munin-config and som installation -# scripts): -#%# family=auto -#%# capabilities=autoconf - - - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/vmstat ]; then - echo yes - exit 0 - else - echo "no (no /usr/bin/vmstat executable)" - exit 1 - fi -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title Fork rate' - echo 'graph_args --base 1000 -l 0 ' - echo 'graph_vlabel forks / ${graph_period}' - echo 'graph_category processes' - echo 'graph_info This graph shows the number of forks (new processes started) per second.' - - echo 'forks.label forks' - echo 'forks.type DERIVE' - echo 'forks.min 0' - echo 'forks.max 100000' - echo 'forks.info The number of forks per second.' - - echo 'forkblk.label forks blocked parent' - echo 'forkblk.type DERIVE' - echo 'forkblk.min 0' - echo 'forkblk.max 100000' - echo 'forkblk.info The number of forks which blocked the parent process.' - - echo 'forksh.label shared addrs w. parent' - echo 'forksh.type DERIVE' - echo 'forksh.min 0' - echo 'forksh.max 100000' - echo 'forksh.info The number of forks which shared address space with the parent process.' - - exit 0 -fi - -vmstat -s | awk ' -/forks total$/ { print "forks.value " $1; } -/forks blocked parent$/ { print "forkblk.value " $1; } -/forks shared address space with parent$/ { print "forksh.value " $1; } -' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/if_.in b/sysutils/munin-node/files/node/node.d.netbsd/if_.in deleted file mode 100755 index 3a7fbcc4919..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/if_.in +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# Wildcard-plugin to monitor network interfaces. To monitor an -# interface, link if_<interface> to this file. E.g. -# -# ln -s /usr/share/munin/node/plugins-auto/if_ /etc/munin/node.d/if_eth0 -# -# ...will monitor eth0. -# -# Any device found in /usr/bin/netstat can be monitored. -# -# $Log: if_.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# Magic markers (optional - used by munin-config and some installation -# scripts): -# -#%# family=auto -#%# capabilities=autoconf suggest - - -INTERFACE=`basename $0 | sed 's/^if_//g'` - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/netstat ]; then - echo yes - exit 0 - else - echo "no (/usr/bin/netstat not found)" - exit 1 - fi -fi - -if [ "$1" = "suggest" ]; then - if [ -x /usr/bin/netstat ]; then - netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link.*>/s/\** .*//p' - exit 0 - else - exit 1 - fi -fi - -if [ "$1" = "config" ]; then - - echo "graph_order rbytes obytes" - echo "graph_title $INTERFACE traffic" - echo 'graph_args --base 1000' - echo 'graph_vlabel bits per ${graph_period} in (-) / out (+)' - echo 'graph_category network' - echo "graph_info This graph shows the traffic of the $INTERFACE network interface. Please note that the traffic is shown in bits per second, not bytes." - - echo 'rbytes.label received' - echo 'rbytes.type COUNTER' - echo 'rbytes.graph no' - echo 'rbytes.cdef rbytes,8,*' - - echo 'obytes.label bps' - echo 'obytes.type COUNTER' - echo 'obytes.negative rbytes' - echo 'obytes.cdef obytes,8,*' - echo "obytes.info Traffic sent (+) and received (-) on the $INTERFACE network interface." - exit 0 -fi; - -/usr/bin/netstat -i -b -I $INTERFACE | awk ' -/<Link.*>/ { - print "rbytes.value ", $5; - print "obytes.value ", $6; -}' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/if_errcoll_.in b/sysutils/munin-node/files/node/node.d.netbsd/if_errcoll_.in deleted file mode 100755 index 2c073b71af6..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/if_errcoll_.in +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -# Wildcard-plugin to monitor network interfaces. To monitor an -# interface, link if_<interface> to this file. E.g. -# -# ln -s /usr/share/munin/node/plugins-auto/if_ /etc/munin/node.d/if_eth0 -# -# ...will monitor eth0. -# -# Any device found in /usr/bin/netstat can be monitored. -# -# $Log: if_errcoll_.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magic markers (optional - used by munin-config and some installation -# scripts): -# -#%# family=auto -#%# capabilities=autoconf suggest - - -INTERFACE=`basename $0 | sed 's/^if_errcoll_//g'` - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/netstat ]; then - echo yes - exit 0 - else - echo "no (/usr/bin/netstat not found)" - exit 1 - fi -fi - -if [ "$1" = "suggest" ]; then - if [ -x /usr/bin/netstat ]; then - netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link.*>/s/\** .*//p' - exit 0 - else - exit 1 - fi -fi - -if [ "$1" = "config" ]; then - echo "graph_order ierrors oerrors collisions" - echo "graph_title $INTERFACE Errors & Collisions" - echo 'graph_args --base 1000' - echo 'graph_vlabel events / ${graph_period}' - echo 'graph_category network' - echo "graph_info This graph shows the amount of errors and collisions on the $INTERFACE network interface." - echo 'ierrors.label Input Errors' - echo 'ierrors.type COUNTER' - echo 'oerrors.label Output Errors' - echo 'oerrors.type COUNTER' - echo 'collisions.label Collisions' - echo 'collisions.type COUNTER' - exit 0 -fi; - -/usr/bin/netstat -i -I $INTERFACE | awk ' -/<Link.*>/ { - print "ierrors.value", $6; - print "oerrors.value", $8; - print "collisions.value", $9; -}' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/interrupts.in b/sysutils/munin-node/files/node/node.d.netbsd/interrupts.in deleted file mode 100755 index 5b9cc35c846..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/interrupts.in +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor the number of interrupts and context switches on a system. -# -# Idea and base from Ragnar Wisløff. -# -# Usage: Link or copy into /etc/munin/node.d/ -# -# $Log: interrupts.in,v $ -# Revision 1.2 2006/06/08 18:59:26 he -# Remove installation of the documentation from this package, to be -# provided by the soon-to-be-committed munin-doc package. -# -# Other minor changes: -# o Remove comented-out bits from package Makefile -# o Re-ordered variables reported by NetBSD's cpu plugin script -# o Use shorter legend text in NetBSD's interrupts plugin script -# -# Bumped package revision. -# -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=auto -#%# capabilities=autoconf - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/vmstat ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi -fi - -# If run with the "config"-parameter, give out information on how the -# graphs should look. - -if [ "$1" = "config" ]; then - # The title of the graph - echo 'graph_title Interrupts & context switches' - - # Arguments to "rrdtool graph". In this case, tell it that the - # lower limit of the graph is '0', and that 1k=1000 (not 1024) - echo 'graph_args --base 1000 -l 0' - # The Y-axis label - echo 'graph_vlabel interrupts & ctx switches / ${graph_period}' - # Graph category - echo 'graph_category system' - # Graph information - echo 'graph_info This graph shows the number of interrupts and context switches on the system. These are typically high on a busy system.' - - echo 'devint.info Device interrupts come from hardware (exceptions, NMI, IRQ)' - echo 'softint.info Software interrupts are typically deferred processing from hardware interrupts' - - echo 'ctx.info A context switch occurs when a multitasking operatings system suspends the currently running process, and starts executing another.' - - # The fields. "label" is used in the legend. "label" is the only - # required subfield. - echo 'devint.label device intrs' - echo 'softint.label software intrs' - echo 'ctx.label context switches' - - # Specify type - echo 'devint.type DERIVE' - echo 'softint.type DERIVE' - echo 'ctx.type DERIVE' - - # Set max (should always be done with counters) Note: this is max - # per second. - echo 'devint.max 100000' - echo 'softint.max 100000' - echo 'ctx.max 100000' - - echo 'devint.min 0' - echo 'softint.min 0' - echo 'ctx.min 0' - - # Last, if run with the "config"-parameter, quit here (don't - # display any data) - exit 0 -fi - -# The real work - -vmstat -s | awk ' -/device interrupts$/ { print "devint.value " $1; } -/context switches$/ { print "ctx.value " $1; } -/software interrupts$/ { print "softint.value " $1; } -' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/iostat.in b/sysutils/munin-node/files/node/node.d.netbsd/iostat.in deleted file mode 100755 index 77e95fe8dc3..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/iostat.in +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -# -# Plugin for watching io-bound traffic (in bytes) on disks. -# -# Parameters: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: iostat.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magick markers (optional - used by munin-config and som installation -# scripts): -#%# family=auto -#%# capabilities=autoconf - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/sbin/iostat ]; then - echo yes - exit 0 - else - echo "no (no /usr/sbin/iostat executable)" - exit 1 - fi -fi - -nf=`/usr/sbin/iostat -I -x | tail -1 | awk '{ print NF }'` -if [ $nf -eq 5 ]; then - oldformat=true -else - oldformat=false -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title IOstat by bytes' - echo 'graph_args --base 1024 -l 0 ' - - if ! $oldformat; then - echo 'graph_vlabel MB per ${graph_period} read (-) / written (+)' - else - echo 'graph_vlabel MB per ${graph_period} read+written' - fi - - echo 'graph_category disk' - echo 'graph_info This graph shows the I/O to and from block devices' - - drives=`/usr/sbin/iostat -I -x | awk ' -/^device/ { next; } -// { print $1; }'` - - echo -n 'graph_order' - for d in $drives; do - if $oldformat; then - echo -n ' '${d}'_io' - else - echo -n ' '${d}'_read '${d}'_write' - fi - done - echo - - if $oldformat; then - for d in $drives; do - echo "${d}_io.label ${d}" - echo "${d}_io.info I/O on device ${d}" - echo "${d}_io.type DERIVE" - echo "${d}_io.max 2000" - echo "${d}_io.min 0" - done - else - for d in $drives; do - echo "${d}_read.label ${d}" - echo "${d}_read.type DERIVE" - echo "${d}_read.max 2000" - echo "${d}_read.min 0" - echo "${d}_read.graph no" - - echo "${d}_write.label ${d}" - echo "${d}_write.info I/O on device ${d}" - echo "${d}_write.type DERIVE" - echo "${d}_write.max 2000" - echo "${d}_write.min 0" - echo "${d}_write.negative ${d}_read" - done - fi - exit 0 -fi - -if $oldformat; then - /usr/sbin/iostat -I -x | awk ' -/^device/ { next; } -{ - print $1 "_io.value " int($5); -} -' -else - /usr/sbin/iostat -I -x | awk ' -/^device/ { next; } -{ - print $1 "_read.value " int($5); - print $1 "_write.value " int($9); -} -' -fi diff --git a/sysutils/munin-node/files/node/node.d.netbsd/iostat_ops.in b/sysutils/munin-node/files/node/node.d.netbsd/iostat_ops.in deleted file mode 100755 index 7e234b3ab56..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/iostat_ops.in +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -# -# Plugin for watching io-bound traffic (in transfers) on disks. -# -# Parameters: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: iostat_ops.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magick markers (optional - used by munin-config and som installation -# scripts): -#%# family=auto -#%# capabilities=autoconf - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/sbin/iostat ]; then - echo yes - exit 0 - else - echo "no (no /usr/sbin/iostat executable)" - exit 1 - fi -fi - -nf=`/usr/sbin/iostat -I -x | tail -1 | awk '{ print NF }'` -if [ $nf -eq 5 ]; then - oldformat=true -else - oldformat=false -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title IOstat by transfers' - echo 'graph_args --base 1000 -l 0 ' - - if ! $oldformat; then - echo 'graph_vlabel Xfers per ${graph_period} read (-) / written (+)' - else - echo 'graph_vlabel Xfers per ${graph_period} read+written' - fi - - echo 'graph_category disk' - echo 'graph_info This graph shows the I/O to and from block devices' - - drives=`/usr/sbin/iostat -I -x | awk ' -/^device/ { next; } -// { print $1; }'` - - echo -n 'graph_order' - for d in $drives; do - if $oldformat; then - echo -n ' ' ${d}'_io' - else - echo -n ' ' ${d}'_read ' ${d}'_write ' - fi - done - echo - - if $oldformat; then - for d in $drives; do - echo "${d}_io.label ${d}" - echo "${d}_io.info I/O on device ${d}" - echo "${d}_io.type DERIVE" - echo "${d}_io.max 20000" - echo "${d}_io.min 0" - done - else - for d in $drives; do - echo "${d}_read.label ${d}" - echo "${d}_read.type DERIVE" - echo "${d}_read.max 20000" - echo "${d}_read.min 0" - echo "${d}_read.graph no" - - echo "${d}_write.label ${d}" - echo "${d}_write.info I/O on device ${d}" - echo "${d}_write.type DERIVE" - echo "${d}_write.max 20000" - echo "${d}_write.min 0" - echo "${d}_write.negative ${d}_read" - done - fi - exit 0 -fi - -if $oldformat; then - /usr/sbin/iostat -I -x | awk ' -/^device/ { next; } -{ - print $1 "_io.value " $3; -} -' -else - /usr/sbin/iostat -I -x | awk ' -/^device/ { next; } -{ - print $1 "_read.value " $3; - print $1 "_write.value " $7; -} -' -fi diff --git a/sysutils/munin-node/files/node/node.d.netbsd/irqstats.in b/sysutils/munin-node/files/node/node.d.netbsd/irqstats.in deleted file mode 100755 index 4643a6407ce..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/irqstats.in +++ /dev/null @@ -1,84 +0,0 @@ -#! /bin/sh -# -# Plugin to monitor the individual interrupt sources. -# -# Usage: Link or copy into /etc/munin/node.d/ -# -# $Log: irqstats.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=auto -#%# capabilities=autoconf - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/vmstat ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi -fi - -intr_sources () { - /usr/bin/vmstat -i | awk ' -/^interrupt/ { next; } -/^Total/ { next; } -{ - s=substr($0, 1, 24); - gsub(" *$", "", s); - gsub(" ", "_", s); - print s; -} -' -} - -# If run with the "config"-parameter, give out information on how the -# graphs should look. - -if [ "$1" = "config" ]; then - - echo 'graph_title Individual interrupts' - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel interrupts / ${graph_period}' - echo 'graph_category system' - echo -n 'graph_order ' - for i in `intr_sources`; do - echo -n ' intr_'${i} - done - echo - - for i in `intr_sources`; do -# echo 'intr_'${i}'.draw LINE' - echo 'intr_'${i}'.label' `echo $i | sed -e 's/_/ /g'` - echo 'intr_'${i}'.info Interrupt' `echo $i | sed -e 's/_/ /g'` - echo 'intr_'${i}'.type DERIVE' - echo 'intr_'${i}'.min 0' - done - exit 0 -fi - -/usr/bin/vmstat -i | awk ' -/^interrupt/ { next; } -/^Total/ { next; } -/[0-9]/{ - s=substr($0, 1, 24); - gsub(" *$", "", s); - gsub(" ", "_", s); - print "intr_" s ".value " $(NF-1); -} -' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/load.in b/sysutils/munin-node/files/node/node.d.netbsd/load.in deleted file mode 100755 index d5c070e23f8..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/load.in +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor the load average on a system. -# -# Usage: Link or copy into /etc/munin/node.d/ -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -# $Log: load.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -#%# family=auto -#%# capabilities=autoconf - - - -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by -# munin-config. In the case of this plugin, we should most probably -# always be included. - -if [ "$1" = "autoconf" ]; then - if [ -x /sbin/sysctl ]; then - /sbin/sysctl vm.loadavg > /dev/null - if [ $? = "0" ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi - else - echo no - exit 1 - fi -fi - -NCPU=`/sbin/sysctl -n hw.ncpu` -# If we fail for some reason, default to 1 cpu -if [ $? != 0 ]; then NCPU=1; fi - -# If run with the "config"-parameter, give out information on how the -# graphs should look. - -if [ "$1" = "config" ]; then - # The host name this plugin is for. (Can be overridden to have - # one machine answer for several) - - # The title of the graph - echo 'graph_title Load average' - # Arguments to "rrdtool graph". In this case, tell it that the - # lower limit of the graph is '0', and that 1k=1000 (not 1024) - echo 'graph_args --base 1000 -l 0' - # The Y-axis label - echo 'graph_vlabel load' - # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of - # 420 milliload) - echo 'graph_noscale true' - # The category of the plugin. Defaults to "other". - echo 'graph_category system' - # The fields. "label" is used in the legend. "label" is the only - # required subfield. - echo 'load.label load' - # These two are optional. They are only used if you have - # configured your munin to tell a Nagios-server about any - # problems - echo 'load.warning ' $((10 * $NCPU)) - echo 'load.critical 120' - # This one is purely to add an explanation to the web page. The first - # one is for the graph itself, while the second one is for the field - # "load". - echo 'graph_info The load average of the machine describes how many processes are in the run-queue (scheduled to run "immediately").' - echo 'load.info Average load for the five minutes.' - - # Last, if run with the "config"-parameter, quit here (don't - # display any data) - exit 0 -fi - -# If not run with any parameters at all (or only unknown ones), do the -# real work - i.e. display the data. Almost always this will be -# "value" subfield for every data field. - -echo -n "load.value " -/sbin/sysctl vm.loadavg | cut -f3 -d' ' - -# How could this plugin have been written in its simplest form? -# Something like this: -# -# --------------------- -# #!/bin/sh - -# -# if [ "$1" = "config" ]; then - -# echo "graph_title Load average" -# echo 'graph_args --base 1000 -l 0' -# echo 'graph_vlabel load' -# echo "load.label load" -# exit 0 -# fi -# echo -n "load.value " -# cut -f1 -d' ' < /proc/loadavg -# --------------------- -# -# Except for the Nagios-warnings (which most people don't have any need -# for) and things used by installation scripts and munin-config (which -# you don't need if you don't plan on submitting your plugin to the -# pacakge), the two versions will work identically. diff --git a/sysutils/munin-node/files/node/node.d.netbsd/memory.in b/sysutils/munin-node/files/node/node.d.netbsd/memory.in deleted file mode 100755 index 7ac1b5ff86a..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/memory.in +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor memory usage. -# -# Parameters: -# -# config (required) -# autoconf (optional - only used by munin-config) -# -# $Log: memory.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=auto -#%# capabilities=autoconf - -if [ "$1" = "autoconf" ]; then - if [ -x /sbin/sysctl ]; then - /sbin/sysctl hw.pagesize > /dev/null - if [ $? = "0" ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi - else - echo no - exit 1 - fi -fi - -PAGESIZE=`/sbin/sysctl -n hw.pagesize` -MEMSIZE=`vmstat -s | awk '/pages managed/ { print $1 }'` -MEMMAX=`echo 2k $PAGESIZE $MEMSIZE '*p' | dc` - -if [ "$1" = "config" ]; then - echo 'graph_args --base 1024 -l 0 --vertical-label Bytes --upper-limit '$MEMMAX - echo 'graph_title Memory usage' - echo 'graph_category system' - echo 'graph_info This graph shows what the machine uses its memory for.' - - echo 'graph_order active inactive wired kernel free' - - echo 'active.label active' - echo 'active.info pages recently statistically used' - echo 'active.draw AREA' - - echo 'inactive.label inactive' - echo 'inactive.info pages recently statistically unused' - echo 'inactive.draw STACK' - - echo 'wired.label wired' - echo 'wired.info pages that are fixed into memory' - echo 'wired.draw STACK' - - echo 'kernel.label kernel' - echo 'kernel.info pages used by the kernel' - echo 'kernel.draw STACK' - - echo 'free.label free' - echo 'free.info pages without data content' - echo 'free.draw STACK' - - exit 0 -fi - -vmstat -s | awk -v bpp=$PAGESIZE ' -/pages managed$/ { managed = $1; } -/pages free$/ { free = $1; print "free.value " $1 * bpp; } -/pages active$/ { active = $1; print "active.value " $1 * bpp; } -/pages inactive$/ { inactive = $1; print "inactive.value " $1 * bpp; } -/pages wired$/ { wired = $1; print "wired.value " $1 * bpp; } -END { kernel = managed - wired - inactive - active - free; - print "kernel.value " kernel * bpp; }' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/memory_pools.in b/sysutils/munin-node/files/node/node.d.netbsd/memory_pools.in deleted file mode 100755 index e93202547d0..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/memory_pools.in +++ /dev/null @@ -1,143 +0,0 @@ -#! /bin/sh -# -# Plugin to monitor NetBSD kernel memory pool usage. -# -# Parameters: -# -# config (required) -# autoconf (optional - only used by munin-config) -# -# $Log: memory_pools.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=auto -#%# capabilities=autoconf - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/vmstat ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi -fi - -PAGESIZE=`/sbin/sysctl -n hw.pagesize` - -KMEM=`vmstat -s | awk -v bpp=$PAGESIZE ' -/pages managed$/ { managed = $1; } -/pages free$/ { free = $1; } -/pages active$/ { active = $1; } -/pages inactive$/ { inactive = $1;} -/pages wired$/ { wired = $1; } -END { kernel = managed - wired - inactive - active - free; - print kernel * bpp; }'` - - -if [ "$1" = "config" ]; then - - echo 'graph_args --base 1024 -l 0 --vertical-label Bytes' - echo 'graph_title Kernel Pool Memory usage' - echo 'graph_category system' - echo 'graph_info This graph shows the kernel memory pool usage' - echo 'graph_order vnode ncache ffsino mbufs rest bufpl bufs' - - echo 'vnode.label vnodes' - echo 'vnode.info vnode cache' - echo 'vnode.draw AREA' - - echo 'ncache.label ncache' - echo 'ncache.info namei cache' - echo 'ncache.draw STACK' - - echo 'ffsino.label ffs-i' - echo 'ffsino.info FFS inode cache' - echo 'ffsino.draw STACK' - - echo 'mbufs.label mbufs' - echo 'mbufs.info network buffers (mbufs + mbuf clusters)' - echo 'mbufs.draw STACK' - - echo 'rest.label rest' - echo 'rest.info sum of other memory pools' - echo 'rest.draw STACK' - - echo 'bufpl.label bufpl' - echo 'bufpl.info buffer pool' - echo 'bufpl.draw STACK' - - echo 'bufs.label bufs' - echo 'bufs.info buffer pools, for file metadata' - echo 'bufs.draw STACK' - - exit 0 -fi - -vmstat -m -W > /dev/null 2>&1 -if [ $? -eq 0 ]; then - vmstat -m -W 2>/dev/null | awk ' -/^Memory resource pool statistics/ { inpool=1; next; } -/^In use/ { inpool=0; next; } -/^Name/ { next; } -/^vnodepl/ && inpool { vnode = $10 * $11; next; } -/^ncachepl/ && inpool { ncache = $10 * $11; next; } -/^ffsinopl/ && inpool { ffsino = $10 * $11; next; } -/^dino1pl/ && inpool { dinopl = $10 * $11; next; } -/^buf.*k / && inpool { bufk += $10 * $11; next; } -/^bufpl/ && inpool { bufpl = $10 * $11; next; } -/^mbpl/ && inpool { mbufs += $10 * $11; next; } -/^mclpl/ && inpool { mbufs += $10 * $11; next; } -$16 != "0x200" && $16 != "0x600" && inpool { rest += $10 * $11; } -END { - print "bufs.value " bufk; - print "bufpl.value " bufpl; - print "vnode.value " vnode; - print "ncache.value " ncache; - print "ffsino.value " ffsino; - print "mbufs.value " mbufs; - print "rest.value " rest; -}' -else - # Need to guess size of pool pages, may not be correct - # for small-memory machines (< 16MB) - vmstat -m 2>/dev/null | awk -v bpp=$PAGESIZE ' -/^Memory resource pool statistics/ { inpool=1; next; } -/^In use/ { inpool=0; next; } -/^Name/ { next; } -/^vnodepl/ && inpool { vnode = $8 * bpp; next; } -/^ncachepl/ && inpool { ncache = $8 * bpp; next; } -/^ffsinopl/ && inpool { ffsino = $8 * bpp; next; } -/^dino1pl/ && inpool { dinopl = $8 * bpp; next; } -/^buf.*k / && inpool { bufk += $8 * 65536; next; } -/^bufpl/ && inpool { bufpl = $8 * bpp; next; } -/^mbpl/ && inpool { mbufs += $8 * bpp; next; } -/^mclpl/ && inpool { mbufs += $8 * bpp; next; } -/^kvakernel/ { next; } -/^kvakmem/ { next; } -inpool { rest += $8 * bpp; } -END { - print "bufs.value " bufk; - print "bufpl.value " bufpl; - print "vnode.value " vnode; - print "ncache.value " ncache; - print "ffsino.value " ffsino; - print "mbufs.value " mbufs; - print "rest.value " rest; -}' -fi diff --git a/sysutils/munin-node/files/node/node.d.netbsd/memory_types.in b/sysutils/munin-node/files/node/node.d.netbsd/memory_types.in deleted file mode 100755 index e55effaa54d..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/memory_types.in +++ /dev/null @@ -1,88 +0,0 @@ -#! /bin/sh -# -# Plugin to monitor memory usage by type. -# -# Parameters: -# -# config (required) -# autoconf (optional - only used by munin-config) -# -# $Log: memory_types.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=auto -#%# capabilities=autoconf - -if [ "$1" = "autoconf" ]; then - if [ -x /sbin/sysctl ]; then - if /sbin/sysctl hw.pagesize > /dev/null 2>&1; then - echo yes - exit 0 - else - echo no - exit 1 - fi - else - echo no - exit 1 - fi -fi - -PAGESIZE=`/sbin/sysctl -n hw.pagesize` -MEMSIZE=`vmstat -s | awk '/pages managed/ { print $1 }'` -MEMMAX=`echo 2k $PAGESIZE $MEMSIZE '*p' | dc` - -if [ "$1" = "config" ]; then - echo 'graph_args --base 1024 -l 0 --vertical-label Bytes --upper-limit '$MEMMAX - echo 'graph_title Memory usage by category' - echo 'graph_category system' - echo 'graph_info This graph shows how the machine uses its memory.' - - echo 'graph_order exec anon file kernel free' - - echo 'exec.label exec' - echo 'exec.info memory for cached executables' - echo 'exec.draw AREA' - - echo 'anon.label anon' - echo 'anon.info anonymous memory' - echo 'anon.draw STACK' - - echo 'file.label file' - echo 'file.info memory for cached non-executable files' - echo 'file.draw STACK' - - echo 'kernel.label kernel' - echo 'kernel.info memory used by the kernel' - echo 'kernel.draw STACK' - - echo 'free.label free' - echo 'free.info free memory' - echo 'free.draw STACK' - - exit 0 -fi - -vmstat -s | awk -v bpp=$PAGESIZE ' -/pages managed$/ { managed = $1; } -/pages free$/ { free = $1; print "free.value " $1 * bpp; } -/anonymous pages$/{ anon = $1; print "anon.value " $1 * bpp; } -/cached file pages$/{ file = $1; print "file.value " $1 * bpp; } -/cached executable pages$/{ exec = $1; print "exec.value " $1 * bpp; } -END { kernel = managed - anon - file - exec - free; - print "kernel.value " kernel * bpp; }' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/netstat.in b/sysutils/munin-node/files/node/node.d.netbsd/netstat.in deleted file mode 100755 index 1151e331636..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/netstat.in +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor network connections. -# -# Parameters: -# -# config (required) -# autoconf (optional - only used by munin-config) -# -# $Log: netstat.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magic markers (optional - used by munin-config and some installation -# scripts): -#%# family=auto -#%# capabilities=autoconf - - - -if [ "$1" = "autoconf" ]; then - if ( netstat -s 2>/dev/null >/dev/null ); then - echo yes - exit 0 - else - if [ $? -eq 127 ] - then - echo "no (netstat program not found)" - exit 1 - else - echo no - exit 1 - fi - fi -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title Netstat' - echo 'graph_args -l 0 --base 1000' - echo 'graph_vlabel active connections per ${graph_period}' - echo 'graph_category network' - echo 'graph_period second' - echo 'graph_info This graph shows the TCP activity of all the network interfaces combined.' - - echo 'active.label active' - echo 'active.type DERIVE' - echo 'active.min 0' - echo 'active.max 50000' - echo 'active.info The number of active TCP openings per second.' - - echo 'passive.label passive' - echo 'passive.type DERIVE' - echo 'passive.min 0' - echo 'passive.max 50000' - echo 'passive.info The number of passive TCP openings per second.' - - echo 'failed.label failed' - echo 'failed.type DERIVE' - echo 'failed.min 0' - echo 'failed.max 50000' - echo 'failed.info The number of failed TCP connection attempts per second.' - - echo 'resets.label resets' - echo 'resets.type DERIVE' - echo 'resets.min 0' - echo 'resets.max 50000' - echo 'resets.info The number of TCP connection resets.' - - echo 'established.label established' - echo 'established.type DERIVE' - echo 'established.min 0' - echo 'established.max 50000' - echo 'established.info The number of currently open connections.' - exit 0 -fi - -netstat -s | awk ' -/connection requests/ { print "active.value " $1 } -/connection accepts/ { print "passive.value " $1 } -/bad connection/ { print "failed.value " $1 } -/reset/ { print "resets.value " $1 } -/connections established/ { print "established.value " $1 }' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/nfs_client.in b/sysutils/munin-node/files/node/node.d.netbsd/nfs_client.in deleted file mode 100755 index 38bb762b7c0..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/nfs_client.in +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor NFS client traffic -# -# $Log: nfs_client.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -#%# family=auto -#%# capabilities=autoconf - - -getnames () { - /usr/bin/nfsstat -c | awk ' -/RPC Counts/ { coll = 1; next; } -/RPC Info/ { exit 0; } -/[a-z]/ && coll { - for (n = 1; n <= NF; n++) { - print $n - } -} -' -} - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/nfsstat ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title NFS Client' - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel requests / ${graph_period}' - echo 'graph_total total' - echo 'graph_category NFS' - for a in `getnames` ; do - echo "$a.label $a" - echo "$a.type DERIVE" - echo "$a.min 0" - done - exit 0 -fi - -/usr/bin/nfsstat -c | awk ' -/RPC Counts/ { coll=1; next; } -/RPC Info/ { exit 0; } -/[a-z]/ && coll { - for (n in names) { - names[n] = "" - } - for (n = 1; n <= NF; n++) { - names[n] = $n - } -} -/[0-9]/ && coll { - for (n = 1; n <= NF/2; n++) { - name = names[n] - values[name] = $((n - 1) * 2 + 1) - } -} -END { - for (v in values) { - print v ".value " values[v]; - } -} -' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/nfsd.in b/sysutils/munin-node/files/node/node.d.netbsd/nfsd.in deleted file mode 100755 index 0e54d9ad96c..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/nfsd.in +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor NFS server traffic -# -# $Log: nfsd.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -#%# family=auto -#%# capabilities=autoconf - - -getnames () { - /usr/bin/nfsstat -s | awk ' -/RPC Counts/ { coll = 1; next; } -/Server Errors/ { exit 0; } -/[a-z]/ && coll { - for (n = 1; n <= NF; n++) { - print $n - } -} -' -} - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/nfsstat ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title NFS Server' - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel requests / ${graph_period}' - echo 'graph_total total' - echo 'graph_category NFS' - for a in `getnames` ; do - echo "$a.label $a" - echo "$a.type DERIVE" - echo "$a.min 0" - done - exit 0 -fi - -/usr/bin/nfsstat -s | awk ' -/RPC Counts/ { coll=1; next; } -/Server Errors/ { exit 0; } -/[a-z]/ && coll { - for (n in names) { - names[n] = "" - } - for (n = 1; n <= NF; n++) { - names[n] = $n - } -} -/[0-9]/ && coll { - for (n = 1; n <= NF/2; n++) { - name = names[n] - values[name] = $((n - 1) * 2 + 1) - } -} -END { - for (v in values) { - print v ".value " values[v]; - } -} -' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/open_files.in b/sysutils/munin-node/files/node/node.d.netbsd/open_files.in deleted file mode 100755 index f8d5349e838..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/open_files.in +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor the number of open files in the system. -# -# Parameters: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: open_files.in,v $ -# Revision 1.2 2008/10/15 13:13:09 he -# Convert from using an input-less awk job (how did that ever work?) -# to using shell arithmetic, which should be more light-weight and should -# not pose a danger of hanging. -# -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magic markers (Used by munin-config and some installation scripts. -# Optional): -# -#%# family=auto -#%# capabilities=autoconf - - - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/sbin/pstat ]; then - /usr/sbin/pstat -T | grep files > /dev/null - if [ $? = "0" ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi - else - echo no - exit 1 - fi -fi - -eval `/usr/sbin/pstat -T | awk '/files/ { - split($1, a, "/"); - print "filemax=" a[2]; - print "openfiles=" a[1]; -}'` - - -if [ "$1" = "config" ]; then - - echo 'graph_title File table usage' - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel number of open files' - echo 'graph_category system' - echo 'graph_info This graph monitors the Linux open files table.' - - echo 'used.label open files' - echo 'used.info The number of currently open files.' - - echo 'max.label max open files' - echo 'max.info The maximum supported number of open files.' - - echo "used.warning $(($filemax * 92/100))" - echo "used.critical $(($filemax * 98/100))" - exit 0 -fi - -echo 'max.value ' $filemax -echo 'used.value ' $openfiles diff --git a/sysutils/munin-node/files/node/node.d.netbsd/processes.in b/sysutils/munin-node/files/node/node.d.netbsd/processes.in deleted file mode 100755 index fc899ad5a6c..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/processes.in +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor the number of processes on the machine. Much like -# doing a "ps | wc -l". -# -# Parameters: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: processes.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magick markers (optional - used by munin-config and som installation -# scripts): -#%# family=auto -#%# capabilities=autoconf - - - -if [ "$1" = "autoconf" ]; then - echo yes - exit 0 -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title Number of Processes' - echo 'graph_args --base 1000 -l 0 ' - echo 'graph_vlabel number of processes' - echo 'graph_category processes' - echo 'graph_info This graph shows the number of processes in the system.' - echo 'processes.label processes' - echo 'processes.info The current number of processes.' - echo 'processes.draw LINE2' - exit 0 -fi - -echo -n "processes.value " -ps ax | wc -l diff --git a/sysutils/munin-node/files/node/node.d.netbsd/sensors_.in b/sysutils/munin-node/files/node/node.d.netbsd/sensors_.in deleted file mode 100755 index 3b7b8e20d1a..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/sensors_.in +++ /dev/null @@ -1,144 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor various environment sensors provided by envstat(8) -# on NetBSD -# -# Requirements: -# - envsys(4) driver configured and supported hardware present -# - envstat(8) program present -# -# Parameters supported: -# -# config -# autoconf -# suggest -# -# $Log: sensors_.in,v $ -# Revision 1.2 2006/07/21 23:28:37 abs -# Use PKG_SYSCONFSUBDIR so PKG_SYSCONFBASE can be set -# Use REPLACE_PERL on all plugins -# Adjust sensors_ to work with NetBSD 3 -# Bump PKGREVISION -# -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -#%# family=auto -#%# capabilities="autoconf suggest" - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/sbin/envstat ]; then - if /usr/sbin/envstat -r >/dev/null 2>&1; then - echo yes - exit 0 - else - echo no '(no sensors available via envstat(8))' - exit 1 - fi - else - echo no '(/usr/sbin/envstat not executable)' - exit 1 - fi -fi - - -if [ "$1" = "suggest" ]; then - /usr/sbin/envstat -r | awk ' -/degC$/ { temp=1; } -/RPM$/ { fans=1; } -/V$/ { volt=1; } -END { - if (temp) { - print "temp"; - } - if (fans) { - print "fans"; - } - if (volt) { - print "volt"; - } -}' - exit 0 -fi - -envstat_config() -{ - /usr/sbin/envstat -r | awk -v "lookfor=$1" -F: ' -BEGIN { p=0 } -match($0, lookfor "$") { - l=$1 - gsub("[^A-Za-z0-9\\-]", "", $1); - print tolower(lookfor) "_" tolower($1) ".label " l; - p=1; -} -END { - if (!p) { - exit 1; - } -}' - if [ $? != 0 ]; then - echo "No $1 sensors found" >&2 - exit 1 - fi -} - -envstat_value() -{ - /usr/sbin/envstat -r | awk -v "lookfor=$1" -F: ' -match($0, lookfor "$") { - gsub("[^A-Za-z0-9\\-]", "", $1); - sub(" *", "", $2); - sub(" .*", "", $2); - print tolower(lookfor) "_" tolower($1) ".value " $2; -} -' -} - -if [ "$1" = "config" ]; then - case $0 in - *sensors_temp) - echo 'graph_title Temperatures' - echo 'graph_vtitle deg Celcius' - echo 'graph_args --base 1000 -l 0' - envstat_config degC - ;; - *sensors_fans) - echo 'graph_title Fans' - echo 'graph_vtitle RPM' - echo 'graph_args --base 1000 -l 0' - envstat_config RPM - ;; - *sensors_volt) - echo 'graph_title Voltages' - echo 'graph_vtitle Volt' - echo 'graph_args --base 1000 --logarithmic' - envstat_config V - ;; - esac - echo 'graph_category sensors' - - exit 0 -fi - - -case $0 in - *sensors_temp) - envstat_value degC - ;; - *sensors_fans) - envstat_value RPM - ;; - *sensors_volt) - envstat_value V - ;; -esac diff --git a/sysutils/munin-node/files/node/node.d.netbsd/swap.in b/sysutils/munin-node/files/node/node.d.netbsd/swap.in deleted file mode 100755 index 4c7bb4aff40..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/swap.in +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor swap IO in number of blocks per second. -# -# Parameters: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: swap.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magic markers (used by munin-config and some installation scripts (i.e. -# optional)): -# -#%# family=auto -#%# capabilities=autoconf - - - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/vmstat ]; then - /usr/bin/vmstat -s | grep 'swap ins' > /dev/null - if [ $? = "0" ]; then - echo yes - exit 0 - else - echo no - exit 1 - fi - else - echo no - exit 1 - fi -fi - -if [ "$1" = "config" ]; then - - echo 'graph_title Swap in/out' - echo 'graph_args -l 0 --base 1000' - echo 'graph_vlabel pages per ${graph_period} in (-) / out (+)' - echo 'graph_category system' - echo 'graph_info This graph shows the swap activity of the system.' - - echo 'swap_in.label swap' - echo 'swap_in.type DERIVE' - echo 'swap_in.min 0' - echo 'swap_in.max 100000' - echo 'swap_in.graph no' - - echo 'swap_out.label swap' - echo 'swap_out.type DERIVE' - echo 'swap_out.min 0' - echo 'swap_out.max 100000' - echo 'swap_out.negative swap_in' - exit 0 -fi - -vmstat -s | awk ' -/swap ins$/ { print "swap_in.value " $1; } -/swap outs$/ { print "swap_out.value " $1; } -' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/swap_size.in b/sysutils/munin-node/files/node/node.d.netbsd/swap_size.in deleted file mode 100755 index d52a5d49adb..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/swap_size.in +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh -# -# Plugin to monitor swap usage. -# -# Parameters: -# -# config (required) -# autoconf (optional - only used by munin-config) -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=auto -#%# capabilities=autoconf - -if [ "$1" = "autoconf" ]; then - if [ -x /sbin/sysctl ]; then - if /sbin/sysctl hw.pagesize > /dev/null 2>&1; then - echo yes - exit 0 - else - echo no - exit 1 - fi - else - echo no - exit 1 - fi -fi - -PAGESIZE=`/sbin/sysctl -n hw.pagesize` - -if [ "$1" = "config" ]; then - echo 'graph_args --base 1024 -l 0 --vertical-label Bytes' - echo 'graph_title Swap usage' - echo 'graph_category system' - echo 'graph_info This graph shows how the machine uses its swap.' - - echo 'graph_order size used' - - echo 'size.label swap size' - echo 'size.draw AREA' - - echo 'used.label swap used' - echo 'used.draw AREA' - - exit 0 -fi - -vmstat -s | awk -v bpp=$PAGESIZE ' -/swap pages in use$/ { print "used.value " $1 * bpp; } -/swap pages$/ { print "size.value " $1 * bpp; } -' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/uptime.in b/sysutils/munin-node/files/node/node.d.netbsd/uptime.in deleted file mode 100755 index a93905c577f..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/uptime.in +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# -# Plugin to measure uptime. Especially the average and max values on the -# bigger graphs (yearly) can be interesting. -# -# $Log: uptime.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# Magic markers - optional - used by installation scripts and -# munin-config: -# -#%# family=auto -#%# capabilities=autoconf - -if [ "$1" = "autoconf" ]; then - if [ -x /sbin/sysctl ]; then - if /sbin/sysctl kern.boottime >/dev/null 2>&1; then - if [ -x /bin/date ]; then - echo yes - exit 0 - else - echo no '(no /bin/date)' - exit 1 - fi - else - echo no '(sysctl kern.boottime failed)' 2>&1 - exit 1 - fi - else - echo no '(no /sbin/sysctl)' - exit 1 - fi -fi - - -if [ "$1" = "config" ]; then - echo 'graph_title Uptime' - echo 'graph_args --base 1000 -l 0 ' - echo 'graph_vlabel uptime in days' - echo 'uptime.label uptime' - echo 'uptime.draw AREA' - exit 0 -fi - - -boottime=`/sbin/sysctl -n kern.boottime` -now=`/bin/date +%s` - -awk -v boottime=$boottime -v now=$now </dev/null ' -END { - printf "uptime.value %.2f\n", (now - boottime) / 86400; -}' diff --git a/sysutils/munin-node/files/node/node.d.netbsd/vmstat.in b/sysutils/munin-node/files/node/node.d.netbsd/vmstat.in deleted file mode 100755 index d9a74d10283..00000000000 --- a/sysutils/munin-node/files/node/node.d.netbsd/vmstat.in +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh -# -# Plugin to monitor the number of procs in io-sleep and other wait -# states. Uses `vmstat`. -# -# Parameters: -# -# config (required) -# autoconf (optional - used by munin-config) -# -# $Log: vmstat.in,v $ -# Revision 1.1.1.1 2006/06/04 20:53:57 he -# Import the client version of the Munin system monitoring/graphing -# tool -- project homepage is at http://munin.sourceforge.net/ -# -# This package has added support for NetBSD, via a number of new plugin -# scripts where specific steps needs to be taken to collect information. -# -# I also modified the ntp_ plugin script to make it possible to not -# plot the NTP poll delay, leaving just jitter and offset, which IMO -# produces a more telling graph. -# -# -# -# -# Magick markers (optional): -#%# family=auto -#%# capabilities=autoconf - - - -if [ "$1" = "autoconf" ]; then - if [ -x /usr/bin/vmstat ]; then - if /usr/bin/vmstat 1 1 2>/dev/null >/dev/null; then - echo yes - exit 0 - else - echo no - exit 1 - fi - else - echo no - exit 1 - fi -fi - -/usr/bin/vmstat -t -c 1 >/dev/null 2>&1 -if [ $? -eq 0 ]; then - new=true -else - new=false -fi - - -if [ "$1" = "config" ]; then - echo 'graph_title VMstat' - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel process states' - echo 'graph_category processes' - echo 'graph_info This graph shows number of processes in each state.' - - echo 'running.label running' - echo 'running.info processes on CPU or waiting for CPU' - echo 'running.type GAUGE' - - echo 'sleep.label sleep' - echo 'sleep.info processes waiting for some event' - echo 'sleep.type GAUGE' - - if $new; then - echo 'diskwait.label diskwait' - echo 'diskwait.info processes waiting for disk i/o activity' - echo 'diskwait.type GAUGE' - - echo 'pagewait.label pagewait' - echo 'pagewait.info processes waiting for page-in' - echo 'pagewait.type GAUGE' - - else - echo 'iowait.label wait' - echo 'iowait.info processes blocked for resources (i/o, paging, etc.)' - echo 'iowait.type GAUGE' - - fi - exit 0 -fi - -if $new; then - /usr/bin/vmstat -t -c 1 | tail -1 | awk '// { - print "running.value " $1; - print "diskwait.value " $2; - print "pagewait.value " $3; - print "sleep.value " $4; - print "swapped.value " $5; -}' -else - /usr/bin/vmstat -c 1 | tail -1 | awk '// { - print "running.value " $1; - print "iowait.value " $2; - print "sleep.value " $3; -}' -fi diff --git a/sysutils/munin-node/files/node/node.d/ntp_kernel_err.in b/sysutils/munin-node/files/node/node.d/ntp_kernel_err.in deleted file mode 100644 index 0a28bfa615e..00000000000 --- a/sysutils/munin-node/files/node/node.d/ntp_kernel_err.in +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh -# -# $Id: ntp_kernel_err.in,v 1.1.1.1 2006/06/04 20:53:57 he Exp $ -# -# Plugin to monitor the estimated error for the kernel NTP -# status. -# -# Usage: Link or copy into /etc/munin/node.d/ -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=manual -#%# capabilities=autoconf - -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by -# munin-config. In the case of this plugin, we should most probably -# always be included. - -if [ "$1" = "autoconf" ]; then - if ntpdc -c help >/dev/null 2>&1; then - echo yes - exit 0 - else - echo no - exit 1 - fi -fi - -if [ "$1" = "config" ]; then - echo 'graph_title NTP kernel PLL estimated error (secs)' -# echo 'graph_args --logarithmic' - echo 'graph_vlabel est. err (secs)' - echo 'graph_category other' - echo 'graph_info The kernels estimated error for the phase-locked loop used by NTP' - echo 'ntp_err.label est-error' - echo 'ntp_err.info Estimated error for the kernel PLL' - exit 0 -fi - -echo -n 'ntp_err.value ' -ntpdc -c kern | awk '/^estimated error:/ { print $3 }' diff --git a/sysutils/munin-node/files/node/node.d/ntp_kernel_pll_freq.in b/sysutils/munin-node/files/node/node.d/ntp_kernel_pll_freq.in deleted file mode 100644 index c2f5f1b7099..00000000000 --- a/sysutils/munin-node/files/node/node.d/ntp_kernel_pll_freq.in +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh -# -# $Id: ntp_kernel_pll_freq.in,v 1.1.1.1 2006/06/04 20:53:57 he Exp $ -# -# Plugin to monitor the kernel's PLL frequency for the NTP -# status. -# -# Usage: Link or copy into /etc/munin/node.d/ -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=manual -#%# capabilities=autoconf - -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by -# munin-config. In the case of this plugin, we should most probably -# always be included. - -if [ "$1" = "autoconf" ]; then - if ntpdc -c help >/dev/null 2>&1; then - echo yes - exit 0 - else - echo no - exit 1 - fi -fi - -if [ -f @@CONFDIR@@/ntp-freq-comp ]; then - fcomp=`cat @@CONFDIR@@/ntp-freq-comp` -else - fcomp=0 -fi - -if [ "$1" = "config" ]; then - echo 'graph_title NTP kernel PLL frequency (ppm +' ${fcomp}')' -# echo 'graph-args --logarithmic' - echo 'graph_args --alt-autoscale' - echo 'graph_vlabel PLL frequency (ppm +' ${fcomp}')' - echo 'graph_category other' - echo 'graph_info The frequency for the kernel phase-locked loop used by NTP' - echo 'ntp_pll_freq.label pll-freq' - echo 'ntp_pll_freq.info Phase-locked loop frequency in parts per million' - exit 0 -fi - -echo -n 'ntp_pll_freq.value ' -ntpdc -c kern | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }' diff --git a/sysutils/munin-node/files/node/node.d/ntp_kernel_pll_off.in b/sysutils/munin-node/files/node/node.d/ntp_kernel_pll_off.in deleted file mode 100644 index da48e782f3f..00000000000 --- a/sysutils/munin-node/files/node/node.d/ntp_kernel_pll_off.in +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh -# -# $Id: ntp_kernel_pll_off.in,v 1.1.1.1 2006/06/04 20:53:57 he Exp $ -# -# Plugin to monitor the kernel's PLL offset for the NTP -# status. -# -# Usage: Link or copy into /etc/munin/node.d/ -# -# Magic markers (optional - only used by munin-config and some -# installation scripts): -# -#%# family=manual -#%# capabilities=autoconf - -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by -# munin-config. In the case of this plugin, we should most probably -# always be included. - -if [ "$1" = "autoconf" ]; then - if ntpdc -c help >/dev/null 2>&1; then - echo yes - exit 0 - else - echo no - exit 1 - fi -fi - -if [ "$1" = "config" ]; then - echo 'graph_title NTP kernel PLL offset (secs)' -# echo 'graph-args --logarithmic' - echo 'graph_vlabel PLL offset (secs)' - echo 'graph_category other' - echo 'graph_info The kernel offset for the phase-locked loop used by NTP' - echo 'ntp_pll_off.label pll-offset' - echo 'ntp_pll_off.info Phase-locked loop offset in seconds' - exit 0 -fi - -echo -n 'ntp_pll_off.value ' -ntpdc -c kern | awk '/^pll offset:/ { print $3 }' diff --git a/sysutils/munin-node/files/smf/manifest.xml b/sysutils/munin-node/files/smf/manifest.xml index d6b0205850f..0761ebaaf7e 100644 --- a/sysutils/munin-node/files/smf/manifest.xml +++ b/sysutils/munin-node/files/smf/manifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> -<service_bundle type="manifest" name="export"> +<service_bundle type="manifest" name="munin"> <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1"> <create_default_instance enabled="false" /> <single_instance /> @@ -27,6 +27,7 @@ <property_group name="application" type="application"> <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/munin-node.conf" /> </property_group> + <stability value="Evolving" /> <template> <common_name> <loctext xml:lang="C">Munin node</loctext> diff --git a/sysutils/munin-node/patches/patch-aa b/sysutils/munin-node/patches/patch-aa deleted file mode 100644 index 2891ac9dcb3..00000000000 --- a/sysutils/munin-node/patches/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2011/04/30 19:10:13 abs Exp $ - ---- Makefile.config.orig 2005-04-15 20:29:18.000000000 +0000 -+++ Makefile.config -@@ -7,32 +7,32 @@ - # - # the base of the Munin installation. - # --PREFIX = $(DESTDIR)/opt/munin -+UPREFIX=${DESTDIR}$(PREFIX) - - # Where Munin keeps its configurations (server.conf, client.conf, ++) --CONFDIR = $(DESTDIR)/etc/opt/munin -+CONFDIR ?= $(UPREFIX)/etc/munin - - # Server only - where to put munin-cron --BINDIR = $(PREFIX)/bin -+BINDIR = $(UPREFIX)/bin - - # Client only - where to put munin-node, munin-node-configure, and munin-run --SBINDIR = $(PREFIX)/sbin -+SBINDIR = $(UPREFIX)/sbin - - # Where to put text and html documentation --DOCDIR = $(PREFIX)/doc -+DOCDIR = $(UPREFIX)/share/doc/munin - - # Where to put man pages --MANDIR = $(PREFIX)/man -+MANDIR = $(UPREFIX)/${PKGMANDIR} - - # Where to put internal binaries and plugin repository --LIBDIR = $(PREFIX)/lib -+LIBDIR = $(UPREFIX)/lib/munin - - # Server only - Output directory --HTMLDIR = $(PREFIX)/var/www -+HTMLDIR = $(UPREFIX)/www/munin/data - CGIDIR = $(HTMLDIR)/cgi - - # Client only - Where to put RRD files and other intenal data --DBDIR = $(DESTDIR)/var/opt/munin -+DBDIR = $(DESTDIR)/var/munin - - # Client only - Where plugins should put their states. Must be writable by - # group "munin", and should be preserved between reboots -@@ -45,14 +45,14 @@ LOGDIR = $(DESTDIR)/var/log/munin - # writable by the user "munin". - STATEDIR = $(DESTDIR)/var/run/munin - --# The perl interpreter to use --PERL = $(shell which perl) -+# The perl interpreter to use (passed in by pkgsrc) -+PERL = ${PERL5} - - # The python interpreter to use (used by some plugins) --PYTHON = /usr/bin/env python -+PYTHON = ${PYTHONBIN} - - # Server only - Where to install the perl libraries --PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") -+PERLLIB = ${PERL5_SITELIB} - - # Client only - Install plugins for this architecture - OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -65,16 +65,15 @@ HOSTNAME = $(shell hostname) - VERSION = $(shell cat RELEASE) - - # User to run munin as --USER = munin --GROUP = munin -+USER = ${MUNIN_USER} -+GROUP = ${MUNIN_GROUP} - - # Default user to run the plugins as - PLUGINUSER = nobody - - # Which command to use to check if the USER and GROUP to run Munin as, exists. --GETENT = $(shell which getent || which true 2>/dev/null) --CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) --CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) -+CHECKUSER = $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) -+CHECKGROUP = $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) - - CHOWN = chown - CHMOD = chmod diff --git a/sysutils/munin-node/patches/patch-ab b/sysutils/munin-node/patches/patch-ab deleted file mode 100644 index beba75aae2a..00000000000 --- a/sysutils/munin-node/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/06/04 20:53:57 he Exp $ - ---- node/munin-node.conf.in.orig 2004-01-29 18:15:47.000000000 +0100 -+++ node/munin-node.conf.in -@@ -12,7 +12,7 @@ setseid 1 - # Which port to bind to; - host * - user root --group root -+group wheel - setsid yes - - # Regexps for files to ignore diff --git a/sysutils/munin-node/patches/patch-ac b/sysutils/munin-node/patches/patch-ac deleted file mode 100644 index 459819e3cda..00000000000 --- a/sysutils/munin-node/patches/patch-ac +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2006/06/04 20:53:57 he Exp $ - ---- node/node.d/ntp_.in.orig 2004-11-21 21:19:09.000000000 +0100 -+++ node/node.d/ntp_.in -@@ -76,6 +76,8 @@ $0 =~ /ntp_(.+)*$/; - my $name = $1; - exit 2 unless defined $name; - -+my $do_delay = ! defined($ENV{'NTP_NODELAY'}); -+ - if ($ARGV[0] and $ARGV[0] eq "config") { - my @lines = `ntpq -c "hostnames no" -c peers`; - my $host; -@@ -91,8 +93,10 @@ if ($ARGV[0] and $ARGV[0] eq "config") { - print "graph_title NTP statistics for peer $host\n"; - } - print "graph_args --base 1000 --vertical-label msec --lower-limit 0\n"; -- print "delay.label Delay\n"; -- print "delay.draw LINE2\n"; -+ if ($do_delay) { -+ print "delay.label Delay\n"; -+ print "delay.draw LINE2\n"; -+ } - print "offset.label Offset\n"; - print "offset.draw LINE2\n"; - print "jitter.label Jitter\n"; -@@ -110,8 +114,12 @@ foreach (@lines) { - $host =~ s/[\.-]/_/g; - next unless $host eq $name; - my @F = split; -- print <<"EOT"; -+if ($do_delay) { -+ print <<"EOT" - delay.value $F[7] -+EOT -+} -+ print <<"EOT"; - offset.value $F[8] - jitter.value $F[9] - EOT diff --git a/sysutils/munin-node/patches/patch-ad b/sysutils/munin-node/patches/patch-ad deleted file mode 100644 index 5fc6548628a..00000000000 --- a/sysutils/munin-node/patches/patch-ad +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2010/07/17 11:47:57 abs Exp $ - ---- Makefile.orig 2005-04-15 20:37:29.000000000 +0000 -+++ Makefile -@@ -17,7 +17,7 @@ install: install-main install-node insta - - install-main: build - $(CHECKUSER) -- mkdir -p $(CONFDIR)/templates -+ mkdir -p $(DESTDIR)$(CONFDIR)/templates - mkdir -p $(LIBDIR) - mkdir -p $(BINDIR) - mkdir -p $(PERLLIB) -@@ -31,13 +31,11 @@ install-main: build - $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) - - for p in build/server/*.tmpl; do \ -- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ -+ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ - done -- $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/ -- $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/ -- $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/ -- -- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ -+ $(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/ - - $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/ - -@@ -57,11 +55,10 @@ install-node-snmp: build - - install-node-non-snmp: build - $(CHECKGROUP) -- mkdir -p $(CONFDIR)/plugins -- mkdir -p $(CONFDIR)/plugin-conf.d -+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins -+ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d - mkdir -p $(LIBDIR)/plugins - mkdir -p $(SBINDIR) -- mkdir -p $(PERLLIB)/Munin/Plugin - - mkdir -p $(LOGDIR) - mkdir -p $(STATEDIR) -@@ -69,11 +66,10 @@ install-node-non-snmp: build - - $(CHGRP) $(GROUP) $(PLUGSTATE) - $(CHMOD) 775 $(PLUGSTATE) -- $(CHMOD) 755 $(CONFDIR)/plugin-conf.d -+ $(CHMOD) 755 $(DESTDIR)$(CONFDIR)/plugin-conf.d - - $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/ - $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/ -- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ - $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ - - install-node-plugins: build diff --git a/sysutils/munin-node/patches/patch-ae b/sysutils/munin-node/patches/patch-ae deleted file mode 100644 index fd67e929445..00000000000 --- a/sysutils/munin-node/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2006/07/21 23:28:37 abs Exp $ - ---- node/node.d/hddtemp_smartctl.in.orig 2005-01-29 22:14:02.000000000 +0000 -+++ node/node.d/hddtemp_smartctl.in -@@ -93,6 +93,10 @@ if ($^O eq 'linux') { - } - } elsif ($^O eq 'solaris') { - @drives = map { s@.*/@@ } glob '/dev/rdsk/c*t*d*s2'; -+} elsif ($^O eq 'netbsd') { -+ my $rawpart = chr(`sysctl -n kern.rawpartition` + 97); # 'c' or 'd' -+ @drives = map { $_ . $rawpart } grep { /^wd/ } split ' ', -+ `sysctl -n hw.disknames`; - } - - @drives = split ' ', $ENV{drives} if exists $ENV{drives}; diff --git a/sysutils/munin-node/patches/patch-af b/sysutils/munin-node/patches/patch-af deleted file mode 100644 index b1e1a7b2e33..00000000000 --- a/sysutils/munin-node/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2006/11/19 10:02:10 wiz Exp $ - ---- node/node.d/foldingathome_wu.in.orig 2004-12-09 20:19:57.000000000 +0000 -+++ node/node.d/foldingathome_wu.in -@@ -31,7 +31,7 @@ fi - - wu=`wget "http://vspx27.stanford.edu/cgi-bin/main.py?qtype=userpage&username=8d" -q -t 1 -T 5 -O - | egrep -A 2 "<TD> WU</TD>" | grep "<b>" | sed 's/.*<b> \([0-9]*\) .*/\1/'` - --if [ "$wu" == "" ]; then -+if [ "$wu" = "" ]; then - if [ -f $statefile ]; then - echo wu.value `cat $statefile` - fi diff --git a/sysutils/munin-node/patches/patch-ag b/sysutils/munin-node/patches/patch-ag deleted file mode 100644 index 6aaee44ed9c..00000000000 --- a/sysutils/munin-node/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2006/11/19 10:02:10 wiz Exp $ - ---- node/node.d/foldingathome_rank.in.orig 2004-12-09 20:19:57.000000000 +0000 -+++ node/node.d/foldingathome_rank.in -@@ -31,7 +31,7 @@ if [ "$1" = "config" ]; then - fi - - rank=`wget "http://vspx27.stanford.edu/cgi-bin/main.py?qtype=userpage&username=8d" -q -t 1 -T 5 -O - | egrep "<TD> <font size=3> <b> [0-9]* </b> of [0-9]* </font></TD>" | sed 's/.*<font size=3> <b> \([0-9]*\) .*/\1/'` --if [ "$rank" == "" ]; then -+if [ "$rank" = "" ]; then - if [ -f $statefile ]; then - echo rank.value `cat $statefile` - fi diff --git a/sysutils/munin-node/patches/patch-ah b/sysutils/munin-node/patches/patch-ah deleted file mode 100644 index 73aed07c184..00000000000 --- a/sysutils/munin-node/patches/patch-ah +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2009/02/17 18:58:34 joerg Exp $ - ---- node/node.d/exim_mailqueue_alt.in.orig 2009-02-17 19:55:26.000000000 +0100 -+++ node/node.d/exim_mailqueue_alt.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # Plugin to monitor Exim's mail queue - # -@@ -31,7 +31,7 @@ QUEUECRIT=200 - [ "$queuewarn" ] && QUEUEWARN=$queuewarn - [ "$queuecrit" ] && QUEUECRIT=$queuecrit - --if [ "$1" == "config" ]; then -+if [ "$1" = "config" ]; then - echo 'graph_title Exim mailqueue' - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel mails in queue' diff --git a/sysutils/munin-server/MESSAGE b/sysutils/munin-server/MESSAGE deleted file mode 100644 index f3f5e8dd0c5..00000000000 --- a/sysutils/munin-server/MESSAGE +++ /dev/null @@ -1,27 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.5 2012/08/31 16:37:48 shattered Exp $ - -You can start the collection of statistics and production of graphs by -installing a crontab for the ${MUNIN_USER} user of the form - -*/5 * * * * ${PREFIX}/bin/munin-cron - -You may need to give ${MUNIN_USER} a valid shell to do so. - - -You may also want to add lines like - -${VARBASE}/log/munin/munin-graph.log munin:munin 644 7 * 24 Z -${VARBASE}/log/munin/munin-html.log munin:munin 644 7 * 24 Z -${VARBASE}/log/munin/munin-limits.log munin:munin 644 7 * 24 Z -${VARBASE}/log/munin/munin-update.log munin:munin 644 7 * 24 Z - -to your /etc/newsyslog.conf file to have the logs rotated. - - -'htmldir' should be owned by ${MUNIN_USER}; a subdirectory -named after munin's domain name should exist there for -munin-graph to work. You also need to copy HTML templates from -${PREFIX}/share/examples/munin/templates to 'tmpldir'. - -=========================================================================== diff --git a/sysutils/munin-server/Makefile b/sysutils/munin-server/Makefile deleted file mode 100644 index d20206c635c..00000000000 --- a/sysutils/munin-server/Makefile +++ /dev/null @@ -1,113 +0,0 @@ -# $NetBSD: Makefile,v 1.26 2019/08/11 13:23:10 wiz Exp $ -# - -DISTNAME= ${PKGNAME_NOREV:S:-server-:_:} -PKGNAME= munin-server-1.3.2 -PKGREVISION= 12 -CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://munin-monitoring.org/ -COMMENT= System monitoring tool, server version - -PKG_DESTDIR_SUPPORT= destdir - -DEPENDS+= p5-Date-Manip>=0:../../devel/p5-Date-Manip -DEPENDS+= p5-HTML-Template>=0:../../www/p5-HTML-Template -DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay -DEPENDS+= rrdtool>=1.2:../../databases/rrdtool -DEPENDS+= munin-doc>=1.3.1:../../sysutils/munin-doc - -.include "../../mk/bsd.prefs.mk" - -.if ${X11_TYPE} == "modular" -DEPENDS+= modular-xorg-fonts>0:../../meta-pkgs/modular-xorg-fonts -.endif - -USE_TOOLS+= gmake perl:run -USE_PKGINSTALL= YES - -PERL5_CONFIGURE=NO - -WRKSRC= ${WRKDIR}/${DISTNAME:S:_:-:} -CHECK_PORTABILITY_SKIP+= node/node.d/* - -PKG_GROUPS_VARS+= MUNIN_GROUP -PKG_USERS_VARS+= MUNIN_USER - -MUNIN_GROUP?= munin -MUNIN_USER?= munin - -PKG_GROUPS= ${MUNIN_GROUP} -PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP} -PKG_GECOS.${MUNIN_USER}= Munin user -PKG_HOME.${MUNIN_USER}= ${VARBASE}/munin -USERGROUP_PHASE= pre-install - -PKG_SYSCONFSUBDIR?= munin - -STATEDIR= ${VARBASE}/munin/plugin-state - -MAKE_DIRS= ${VARBASE}/munin -MAKE_DIRS+= ${VARBASE}/run/munin -MAKE_DIRS+= ${VARBASE}/log/munin -MAKE_DIRS+= ${STATEDIR} - -OWN_DIRS= ${VARBASE}/munin -OWN_DIRS+= ${VARBASE}/run/munin -OWN_DIRS+= ${VARBASE}/log/munin -OWN_DIRS+= ${VARBASE}/munin/plugin-state - -OWN_DIRS_PERMS+=${VARBASE}/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 -OWN_DIRS_PERMS+=${VARBASE}/run/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 -OWN_DIRS_PERMS+=${VARBASE}/log/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 -OWN_DIRS_PERMS+=${VARBASE}/munin/plugin-state ${MUNIN_USER} ${MUNIN_GROUP} 0775 - -BUILD_DEFS+= VARBASE - -INSTALL_TARGET= install-main - -BUILD_TARGET= build - -PERL5_SITELIB= ${PERL5_SUB_INSTALLVENDORLIB:Q} - -MAKE_ENV+= PERL5_SITELIB=${PREFIX}/${PERL5_SITELIB} -MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} -INSTALL_MAKE_ENV+= CONFDIR=${DESTDIR}${PKG_SYSCONFDIR} -MAKE_ENV+= MUNIN_USER=${MUNIN_USER} -MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} -MAKE_ENV+= PERL5=${PERL5:Q} - -FILES_SUBST+= PERL=${PERL5:Q} -FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} -FILES_SUBST+= STATEDIR=${STATEDIR} - -PLIST_SUBST+= PERL5_SITELIB=${PERL5_SITELIB:Q} - -MESSAGE_SUBST+= MUNIN_USER=${MUNIN_USER} -MESSAGE_SUBST+= VARBASE=${VARBASE} - -EGDIR= ${PREFIX}/share/examples/munin -TMPL_EGDIR= ${EGDIR}/templates -INST_TMPL_DIR= ${PKG_SYSCONFDIR}/templates - -CONF_FILES+= ${EGDIR}/munin.conf ${PKG_SYSCONFDIR}/munin.conf - -TMPL_FILES= definitions.html logo.png munin-comparison-day.tmpl \ - munin-comparison-month.tmpl munin-comparison-week.tmpl \ - munin-comparison-year.tmpl munin-domainview.tmpl \ - munin-nodeview.tmpl munin-overview.tmpl \ - munin-serviceview.tmpl style.css - -.for f in ${TMPL_FILES} -CONF_FILES+= ${TMPL_EGDIR}/${f} ${INST_TMPL_DIR}/${f} -.endfor - -INSTALLATION_DIRS+= ${EGDIR} - -post-install: - ${INSTALL_DATA} ${WRKSRC}/build/server/munin.conf ${DESTDIR}${EGDIR} - -.include "../../mk/bsd.pkg.mk" -.include "../../lang/perl5/module.mk" diff --git a/sysutils/munin-server/PLIST b/sysutils/munin-server/PLIST deleted file mode 100644 index 949191a86f7..00000000000 --- a/sysutils/munin-server/PLIST +++ /dev/null @@ -1,20 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:28:48 joerg Exp $ -bin/munin-cron -lib/munin/munin-graph -lib/munin/munin-html -lib/munin/munin-limits -lib/munin/munin-update -share/examples/munin/munin.conf -share/examples/munin/templates/definitions.html -share/examples/munin/templates/logo.png -share/examples/munin/templates/munin-comparison-day.tmpl -share/examples/munin/templates/munin-comparison-month.tmpl -share/examples/munin/templates/munin-comparison-week.tmpl -share/examples/munin/templates/munin-comparison-year.tmpl -share/examples/munin/templates/munin-domainview.tmpl -share/examples/munin/templates/munin-nodeview.tmpl -share/examples/munin/templates/munin-overview.tmpl -share/examples/munin/templates/munin-serviceview.tmpl -share/examples/munin/templates/style.css -www/munin/data/cgi/munin-cgi-graph -${PERL5_SITELIB}/Munin.pm diff --git a/sysutils/munin-server/distinfo b/sysutils/munin-server/distinfo deleted file mode 100644 index c2b8cb979d6..00000000000 --- a/sysutils/munin-server/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.6 2015/11/04 01:32:22 agc Exp $ - -SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a -RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4 -SHA512 (munin_1.3.2.tar.gz) = 34eaec986b9486a8df0e0e6f9817b9f18082d870c961912719c6d7d4dbc81b92cf9614f04607b9bb80b83c3a99b20ab129933ba8679ab81034c46da9f89d18d7 -Size (munin_1.3.2.tar.gz) = 309319 bytes -SHA1 (patch-aa) = e30b9294f3a2877b540bcd6678b1a63674d8e193 -SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80 -SHA1 (patch-ad) = a2293c767e0c5b6d4866449c5fbc4613ec664512 -SHA1 (patch-ae) = ac8f4f5b7abf03c057ff293ab82c7176bc51a3f6 diff --git a/sysutils/munin-server/patches/patch-aa b/sysutils/munin-server/patches/patch-aa deleted file mode 100644 index 399308c25f3..00000000000 --- a/sysutils/munin-server/patches/patch-aa +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2010/07/11 19:08:07 joerg Exp $ - ---- Makefile.config.orig 2005-01-10 11:38:22.000000000 +0100 -+++ Makefile.config -@@ -7,32 +7,35 @@ - # - # the base of the Munin installation. - # --PREFIX = $(DESTDIR)/opt/munin -+UPREFIX = ${DESTDIR}$(PREFIX) - - # Where Munin keeps its configurations (server.conf, client.conf, ++) --CONFDIR = $(DESTDIR)/etc/opt/munin -+CONFDIR ?= $(UPREFIX)/etc/munin -+ -+# Where NetBSD pkgsrc installs example config files -+EGDIR = $(UPREFIX)/share/examples/munin - - # Server only - where to put munin-cron --BINDIR = $(PREFIX)/bin -+BINDIR = $(UPREFIX)/bin - - # Client only - where to put munin-node, munin-node-configure, and munin-run --SBINDIR = $(PREFIX)/sbin -+SBINDIR = $(UPREFIX)/sbin - - # Where to put text and html documentation --DOCDIR = $(PREFIX)/doc -+DOCDIR = $(UPREFIX)/share/doc/munin - - # Where to put man pages --MANDIR = $(PREFIX)/man -+MANDIR = $(UPREFIX)/man - - # Where to put internal binaries and plugin repository --LIBDIR = $(PREFIX)/lib -+LIBDIR = $(UPREFIX)/lib/munin - - # Server only - Output directory --HTMLDIR = $(PREFIX)/var/www -+HTMLDIR = $(UPREFIX)/www/munin/data - CGIDIR = $(HTMLDIR)/cgi - - # Client only - Where to put RRD files and other intenal data --DBDIR = $(DESTDIR)/var/opt/munin -+DBDIR = $(DESTDIR)/var/munin - - # Client only - Where plugins should put their states. Must be writable by - # group "munin", and should be preserved between reboots -@@ -45,14 +52,14 @@ LOGDIR = $(DESTDIR)/var/log/munin - # writable by the user "munin". - STATEDIR = $(DESTDIR)/var/run/munin - --# The perl interpreter to use --PERL = $(shell which perl) -+# The perl interpreter to use (passed in by pkgsrc) -+PERL = ${PERL5} - - # The python interpreter to use (used by some plugins) - PYTHON = /usr/bin/env python - - # Server only - Where to install the perl libraries --PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") -+PERLLIB = ${DESTDIR}${PERL5_SITELIB} - - # Client only - Install plugins for this architecture - OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -65,16 +72,15 @@ HOSTNAME = $(shell hostname) - VERSION = $(shell cat RELEASE) - - # User to run munin as --USER = munin --GROUP = munin -+USER = ${MUNIN_USER} -+GROUP = ${MUNIN_GROUP} - - # Default user to run the plugins as - PLUGINUSER = nobody - - # Which command to use to check if the USER and GROUP to run Munin as, exists. --GETENT = $(shell which getent || which true 2>/dev/null) --CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) --CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) -+CHECKUSER = $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) -+CHECKGROUP = $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) - - CHOWN = chown - CHMOD = chmod diff --git a/sysutils/munin-server/patches/patch-ab b/sysutils/munin-server/patches/patch-ab deleted file mode 100644 index ec4f5a69630..00000000000 --- a/sysutils/munin-server/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/06/08 19:16:24 he Exp $ - ---- node/munin-node.conf.in.orig 2004-01-29 18:15:47.000000000 +0100 -+++ node/munin-node.conf.in -@@ -12,7 +12,7 @@ setseid 1 - # Which port to bind to; - host * - user root --group root -+group wheel - setsid yes - - # Regexps for files to ignore diff --git a/sysutils/munin-server/patches/patch-ad b/sysutils/munin-server/patches/patch-ad deleted file mode 100644 index 24e93675412..00000000000 --- a/sysutils/munin-server/patches/patch-ad +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2006/12/05 14:53:32 xtraeme Exp $ - ---- Makefile.orig 2006-12-05 15:43:41.000000000 +0100 -+++ Makefile 2006-12-05 15:46:20.000000000 +0100 -@@ -18,6 +18,7 @@ - install-main: build - $(CHECKUSER) - mkdir -p $(CONFDIR)/templates -+ mkdir -p $(EGDIR)/templates - mkdir -p $(LIBDIR) - mkdir -p $(BINDIR) - mkdir -p $(PERLLIB) -@@ -25,19 +26,20 @@ - mkdir -p $(LOGDIR) - mkdir -p $(STATEDIR) - mkdir -p $(HTMLDIR) -+ mkdir -p $(CGIDIR) - mkdir -p $(DBDIR) - mkdir -p $(CGIDIR) - - $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) -+ $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) $(CGIDIR) - - for p in build/server/*.tmpl; do \ -- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ -+ $(INSTALL) -m 0644 "$$p" $(EGDIR)/templates/ ; \ - done -- $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/ -- $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/ -- $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/ -+ $(INSTALL) -m 0644 server/logo.png $(EGDIR)/templates/ -+ $(INSTALL) -m 0644 server/style.css $(EGDIR)/templates/ -+ $(INSTALL) -m 0644 server/definitions.html $(EGDIR)/templates/ - -- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ - - $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/ - -@@ -73,7 +75,6 @@ - - $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/ - $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/ -- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ - $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ - - install-node-plugins: build diff --git a/sysutils/munin-server/patches/patch-ae b/sysutils/munin-server/patches/patch-ae deleted file mode 100644 index 61befa0683c..00000000000 --- a/sysutils/munin-server/patches/patch-ae +++ /dev/null @@ -1,89 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2006/06/08 19:16:24 he Exp $ - ---- server/munin-graph.in.orig 2005-01-08 23:34:38.000000000 +0100 -+++ server/munin-graph.in -@@ -490,6 +490,9 @@ sub get_header { - push @$result,"--width", &munin_get ($config, "graph_width", "400", $domain, $host, $service); - push @$result,"--imgformat", "PNG"; - push @$result,"--lazy" if ($force_lazy); -+ push @$result,"--font", "LEGEND:" . &munin_get ($config, "legend_fontsize", "7", $domain, $host, $service) . ":"; -+ push @$result,"--font", "AXIS:" . &munin_get ($config, "axis_fontsize", "7", $domain, $host, $service) . ":"; -+# push @$result,"--font-render-mode", "mono"; - - push (@$result, "--units-exponent", "0") - if (! &should_scale ($node, $service)); -@@ -848,10 +851,10 @@ sub process_node { - elsif ($global_headers == 1) - { - push (@rrd, "COMMENT:" . (" " x $max_field_len)); -- push (@rrd, "COMMENT: Cur:"); -- push (@rrd, "COMMENT:Min:"); -- push (@rrd, "COMMENT:Avg:"); -- push (@rrd, "COMMENT:Max: \\j"); -+ push (@rrd, "COMMENT: Cur\\:"); -+ push (@rrd, "COMMENT:Min\\:"); -+ push (@rrd, "COMMENT:Avg\\:"); -+ push (@rrd, "COMMENT:Max\\: \\j"); - $global_headers++; - } - -@@ -924,13 +927,13 @@ sub process_node { - } - else - { -- push (@rrd, "COMMENT: Cur:") unless $global_headers; -+ push (@rrd, "COMMENT: Cur\\:") unless $global_headers; - push (@rrd, "GPRINT:c$rrdname:LAST:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, "yes")?"%s":"") . ""); -- push (@rrd, "COMMENT: Min:") unless $global_headers; -+ push (@rrd, "COMMENT: Min\\:") unless $global_headers; - push (@rrd, "GPRINT:i$rrdname:MIN:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . ""); -- push (@rrd, "COMMENT: Avg:") unless $global_headers; -+ push (@rrd, "COMMENT: Avg\\:") unless $global_headers; - push (@rrd, "GPRINT:g$rrdname:AVERAGE:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . ""); -- push (@rrd, "COMMENT: Max:") unless $global_headers; -+ push (@rrd, "COMMENT: Max\\:") unless $global_headers; - push (@rrd, "GPRINT:a$rrdname:MAX:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "\\j"); - push (@{$total_pos{'min'}}, "i$rrdname"); - push (@{$total_pos{'avg'}}, "g$rrdname"); -@@ -991,13 +994,13 @@ sub process_node { - - push (@rrd, "CDEF:dpostotal=ipostotal,UN,ipostotal,UNKN,IF"); - push (@rrd, "LINE1:dpostotal#000000:" . $node->{client}->{$service}->{graph_total} . (" " x ($max_field_len - length ($node->{client}->{$service}->{graph_total}) + 1))); -- push (@rrd, "COMMENT: Cur:") unless $global_headers; -+ push (@rrd, "COMMENT: Cur\\:") unless $global_headers; - push (@rrd, "GPRINT:gpostotal:LAST:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . ""); -- push (@rrd, "COMMENT: Min:") unless $global_headers; -+ push (@rrd, "COMMENT: Min\\:") unless $global_headers; - push (@rrd, "GPRINT:ipostotal:MIN:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . ""); -- push (@rrd, "COMMENT: Avg:") unless $global_headers; -+ push (@rrd, "COMMENT: Avg\\:") unless $global_headers; - push (@rrd, "GPRINT:gpostotal:AVERAGE:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . ""); -- push (@rrd, "COMMENT: Max:") unless $global_headers; -+ push (@rrd, "COMMENT: Max\\:") unless $global_headers; - push (@rrd, "GPRINT:apostotal:MAX:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "\\j"); - } - -@@ -1010,7 +1013,10 @@ sub process_node { - push @complete, @{&get_header ($node, $config, $domain, $name, $service, $time)}; - push @complete, @rrd; - -- push (@complete, "COMMENT:Last update: " . localtime($lastupdate) . "\\r"); -+ my($ts); -+ $ts = localtime($lastupdate); -+ $ts =~ s/:/\\:/g; -+ push (@complete, "COMMENT:Last update\\: " . $ts . "\\r"); - - if (time - 300 < $lastupdate) - { -@@ -1040,7 +1046,10 @@ sub process_node { - push @rrd_sum, "--end",(int($lastupdate/$resolutions{$time}))*$resolutions{$time}; - } - push @rrd_sum, @rrd; -- push (@rrd_sum, "COMMENT:Last update: " . localtime($lastupdate) . "\\r"); -+ my($ts2); -+ $ts2 = localtime($lastupdate); -+ $ts2 =~ s/:/\\:/g; -+ push (@rrd_sum, "COMMENT:Last update\\: " . $ts2 . "\\r"); - - my $labelled = 0; - my @defined = (); |