diff options
54 files changed, 768 insertions, 1176 deletions
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index 1f57b4c66bba..685bfb9dc6e5 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -6,19 +6,26 @@ # PORTNAME= netsaint -PORTVERSION= 0.0.5.2 +PORTVERSION= 0.0.6 CATEGORIES= net -MASTER_SITES= http://www.netsaint.org/download/ -DISTNAME= ${PORTNAME}-0.0.5-2 +MASTER_SITES= http://netsaint.sourceforge.net/download/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd \ + gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +# no run depends due to circular reference +#RUN_DEPENDS= ${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lgd" -INSTALL_TARGET= install-all + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt" +CONFIGURE_ARGS= --with-command-user=root \ + --with-command-grp=wheel \ + --with-netsaint-user=netsaint \ + --with-netsaint-grp=netsaint +INSTALL_TARGET= all install config install-config install-daemoninit pre-fetch: @${SH} ${SCRIPTDIR}/checkps diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo index b77e807a2a4d..36148fb971d5 100644 --- a/net-mgmt/nagios/distinfo +++ b/net-mgmt/nagios/distinfo @@ -1 +1 @@ -MD5 (netsaint-0.0.5-2.tar.gz) = 19af41fb74ca4efbb1f6a4a915adc76f +MD5 (netsaint-0.0.6.tar.gz) = 0d85b66c7258fcb8dd3fbf775dd7728d diff --git a/net-mgmt/nagios/files/patch-aa b/net-mgmt/nagios/files/patch-aa index 3eb6719e49f6..ed255141379c 100644 --- a/net-mgmt/nagios/files/patch-aa +++ b/net-mgmt/nagios/files/patch-aa @@ -1,31 +1,20 @@ ---- Makefile.in Fri Apr 7 11:11:31 2000 -+++ Makefile.in.new Mon Jun 12 19:33:19 2000 -@@ -36,7 +36,7 @@ - @echo "Please supply a command line argument (i.e. 'make all'). Other targets are:" - @echo " netsaint cgis config" - @echo " clean distclean devclean" -- @echo " install install-html install-config install-init install-daemoninit install-commandmode" -+ @echo " install install-html install-config install-init install-daemoninit install-commandmode install-all" - @echo " uninstall" +--- Makefile.in.orig Sun Oct 29 14:43:54 2000 ++++ Makefile.in Fri Jan 12 14:54:45 2001 +@@ -27,7 +27,7 @@ + INSTALL_OPTS=@INSTALL_OPTS@ + COMMAND_OPTS=@COMMAND_OPTS@ + INIT_DIR=@init_dir@ +-INIT_OPTS=-o root -g root ++INIT_OPTS=-o root -g wheel + CGICFGDIR=$(CGIDIR) - # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999) -@@ -99,13 +99,17 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(CGIDIR) - - install-init: -- $(INSTALL) -m 774 -o root -g root init-script /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel init-script /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions + CGIEXTRAS=@CGIEXTRAS@ +@@ -109,7 +109,7 @@ + $(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint install-daemoninit: -- $(INSTALL) -m 774 -o root -g root daemon-init /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel daemon-init /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions +- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint ++ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh install-commandmode: - $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(LOGDIR)/rw - - uninstall: - rm -rf $(BINDIR)/netsaint $(CGIDIR)/*.cgi $(CFGDIR)/*.cfg $(HTMLDIR) -+ -+install-all: all install config install-config install-daemoninit + $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw diff --git a/net-mgmt/nagios/files/patch-ab b/net-mgmt/nagios/files/patch-ab index f7ce712a1276..bbaa1d00e8ba 100644 --- a/net-mgmt/nagios/files/patch-ab +++ b/net-mgmt/nagios/files/patch-ab @@ -1,8 +1,10 @@ ---- base/Makefile.in Fri Apr 7 11:11:32 2000 -+++ base/Makefile.in.new Sat Jun 10 21:45:15 2000 -@@ -52,5 +52,4 @@ +--- base/Makefile.in.orig Sun Jan 7 21:53:15 2001 ++++ base/Makefile.in Sun Jan 7 21:53:27 2001 +@@ -83,7 +83,6 @@ rm -f *~ install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR) - $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(BINDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR) + + diff --git a/net-mgmt/nagios/files/patch-ac b/net-mgmt/nagios/files/patch-ac deleted file mode 100644 index 1eb997a043fc..000000000000 --- a/net-mgmt/nagios/files/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ ---- common/locations.sub Wed Apr 26 21:10:13 2000 -+++ common/locations.sub.new Mon Jun 12 21:29:23 2000 -@@ -19,16 +19,16 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - ************************************************************************/ - --#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint.tmp" --#define DEFAULT_STATUS_FILE "${prefix}/var/status.log" --#define DEFAULT_LOG_FILE "${prefix}/var/netsaint.log" --#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/archives/" --#define DEFAULT_COMMENT_FILE "${prefix}/var/comment.log" --#define DEFAULT_COMMAND_FILE "${prefix}/var/rw/netsaint.cmd" --#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share" -+#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint/netsaint.tmp" -+#define DEFAULT_STATUS_FILE "${prefix}/var/netsaint/status.log" -+#define DEFAULT_LOG_FILE "${prefix}/var/netsaint/netsaint.log" -+#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/netsaint/archives/" -+#define DEFAULT_COMMENT_FILE "${prefix}/var/netsaint/comment.log" -+#define DEFAULT_COMMAND_FILE "${prefix}/var/netsaint/rw/netsaint.cmd" -+#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share/netsaint" - #define DEFAULT_URL_HTML_PATH "/netsaint" --#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/sbin" -+#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/share/netsaint/sbin" - #define DEFAULT_URL_CGIBIN_PATH "/cgi-bin/netsaint" --#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/sbin/nscgi.cfg" -+#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/share/netsaint/sbin/nscgi.cfg" - --#define LOCKFILE "${prefix}/var/netsaint.lock" -+#define LOCKFILE "${prefix}/var/netsaint/netsaint.lock" diff --git a/net-mgmt/nagios/files/patch-af b/net-mgmt/nagios/files/patch-af deleted file mode 100644 index 58d7998ff8d8..000000000000 --- a/net-mgmt/nagios/files/patch-af +++ /dev/null @@ -1,24 +0,0 @@ ---- daemon-init.in Fri Apr 7 11:11:34 2000 -+++ daemon-init.in.new Mon Jun 5 16:11:44 2000 -@@ -27,10 +27,11 @@ - - # Source function library - # Solaris doesn't have an rc.d directory, so do a test first --if [ -f /etc/rc.d/init.d/functions ]; then --. /etc/rc.d/init.d/functions --elif [ -f /etc/init.d/functions ]; then --. /etc/init.d/functions -+if [ -f /usr/local/etc/netsaint/functions ]; then -+. /usr/local/etc/netsaint/functions -+else -+ echo "/usr/local/etc/netsaint/functions missing" -+ exit 1 - fi - - prefix=@prefix@ -@@ -85,4 +86,4 @@ - exit 1 - esac - --# End of this script -+# End of this script diff --git a/net-mgmt/nagios/files/patch-ah b/net-mgmt/nagios/files/patch-ah deleted file mode 100644 index a8023ecea7f1..000000000000 --- a/net-mgmt/nagios/files/patch-ah +++ /dev/null @@ -1,71 +0,0 @@ ---- hosts.cfg.in Fri Apr 7 11:11:34 2000 -+++ hosts.cfg.in.new Thu Jun 15 10:19:42 2000 -@@ -151,10 +151,10 @@ - - hostgroup[novell-servers]=All Novell Servers;novell-admins;es-gra,es-esp - hostgroup[nt-servers]=All NT Servers;nt-admins;rosie,dev,liatris --hostgroup[linux-boxes]=All Linux Servers;linux-admins;real -+hostgroup[freebsd-boxes]=All FreeBSD Servers;freebsd-admins;real - hostgroup[switches]=Switches;switch-admins;switch-4hlan,switch-esplan,switch-gralan,switch-cetslan,switch-hrdlan - hostgroup[routers]=Routers;router-admins;ageng-router --hostgroup[printers]=Printers;printer-admins,linux-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 -+hostgroup[printers]=Printers;printer-admins,freebsd-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 - - - ################################################################################ -@@ -183,19 +183,19 @@ - - # Service notification command - send email with problem summary - --command[notify-by-email]=/bin/echo -e $SUMMARY$ | /bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ -+command[notify-by-email]=/usr/bin/printf $SUMMARY$ | /usr/bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ - - # Service notification command - send email to alphanumeric pager gateway - # The notify-by-epager command assumes that each contact has a pager email gateway, and - # that the address has been entered into the appropriate contact field instead of an - # actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager) - --command[notify-by-epager]=/bin/echo -e 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ -+command[notify-by-epager]=/usr/bin/printf 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /usr/bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ - - # Host notification commands (one for email, one for alphanumeric pager with email gateway) - --command[host-notify-by-email]=/bin/echo -e '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ --command[host-notify-by-epager]=/bin/echo -e 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ -+command[host-notify-by-email]=/usr/bin/printf '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ -+command[host-notify-by-epager]=/usr/bin/printf 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ - - # These are some example service check commands. See the HTML documentation on the plugins for - # examples of how to configure command definitions. -@@ -316,7 +316,7 @@ - - contactgroup[novell-admins]=Novell Administrators;@netsaint_user@ - contactgroup[nt-admins]=NT Administrators;@netsaint_user@,jdoe --contactgroup[linux-admins]=Linux Administrators;@netsaint_user@ -+contactgroup[freebsd-admins]=FreeBSD Administrators;@netsaint_user@ - contactgroup[switch-admins]=Etherswitch Administrators;@netsaint_user@ - contactgroup[router-admins]=Router Technicians;@netsaint_user@ - contactgroup[printer-admins]=Etherswitch Administrators;@netsaint_user@,jdoe -@@ -428,14 +428,14 @@ - service[liatris]=PING;24x7;3;5;1;maes-admins;240;workhours;1;1;0;;check_ping - service[liatris]=MAES Publications;24x7;3;2;1;maes-admins;240;workhours;1;1;1;;check_http2!192.168.2.2!/publications - --# Linux Box --service[real]=PING;24x7;3;5;1;linux-admins;240;24x7;1;1;0;;check_ping --service[real]=HTTP;24x7;3;2;1;linux-admins;240;24x7;1;1;1;;check_http --service[real]=Current Users;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_users!75!150 --service[real]=Zombie Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!5!10!Z --service[real]=Total Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!150!200 --service[real]=Drive 1 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 --service[real]=Drive 2 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 -+# FreeBSD Box -+service[real]=PING;24x7;3;5;1;freebsd-admins;240;24x7;1;1;0;;check_ping -+service[real]=HTTP;24x7;3;2;1;freebsd-admins;240;24x7;1;1;1;;check_http -+service[real]=Current Users;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_users!75!150 -+service[real]=Zombie Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!5!10!Z -+service[real]=Total Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!150!200 -+service[real]=Drive 1 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 -+service[real]=Drive 2 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 - - # Switches - service[switch-esplan]=Traffic Rate;24x7;1;5;6;switch-admins;60;24x7;0;0;0;;traffic_average!/home/httpd/html/mrtg/esp-lan.log!600000!800000!600000!800000 diff --git a/net-mgmt/nagios/pkg-descr b/net-mgmt/nagios/pkg-descr index e16ce94fefe6..ba87fff062b8 100644 --- a/net-mgmt/nagios/pkg-descr +++ b/net-mgmt/nagios/pkg-descr @@ -1,13 +1,12 @@ -NetSaint is a program that will monitor hosts and services -on your network. It has the ability to email or page you -when a problem arises and when it gets resolved. NetSaint -is written in C and is designed to run under Linux, although -it should work under most other *NIX variants. It can run -either as a normal process or as a daemon, intermittently -running checks on various services that you specify. The -actual service checks are performed by external "plugins" -which return service information to NetSaint. Several CGI -programs are included with NetSaint in order to allow you -to view the current service status, history, etc. via a web browser. +NetSaint is a program that will monitor hosts and services on your +network. It has the ability to email or page you when a problem arises +and when it gets resolved. NetSaint is written in C and is designed to +run under Linux, although it should work under most other *NIX variants. +It can run either as a normal process or as a daemon, intermittently +running checks on various services that you specify. The actual service +checks are performed by external "plugins" which return service +information to NetSaint. Several CGI programs are included with NetSaint +in order to allow you to view the current service status, history, etc. +via a web browser. WWW: http://www.netsaint.org/ diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist index e6757452f595..e932f9661776 100644 --- a/net-mgmt/nagios/pkg-plist +++ b/net-mgmt/nagios/pkg-plist @@ -1,72 +1,106 @@ bin/netsaint -etc/netsaint/netsaint.cfg +etc/netsaint/commands.cfg etc/netsaint/hosts.cfg -etc/netsaint/functions +etc/netsaint/netsaint.cfg +etc/netsaint/nscgi.cfg +etc/netsaint/resource.cfg etc/rc.d/netsaint.sh share/netsaint/docs/about.html share/netsaint/docs/addons.html +share/netsaint/docs/bigtime.html share/netsaint/docs/cgiauth.html share/netsaint/docs/cgis.html +share/netsaint/docs/checkscheduling.html +share/netsaint/docs/clusters.html +share/netsaint/docs/commandfile.html share/netsaint/docs/config.html share/netsaint/docs/configcgi.html share/netsaint/docs/confighost.html share/netsaint/docs/configmain.html +share/netsaint/docs/developer/commentfile.html +share/netsaint/docs/developer/images/xcdapi.gif +share/netsaint/docs/developer/images/xedapi.gif +share/netsaint/docs/developer/images/xodapi.gif +share/netsaint/docs/developer/images/xrdapi.gif +share/netsaint/docs/developer/images/xsdapi.gif +share/netsaint/docs/developer/index.html +share/netsaint/docs/developer/pluginhowto.html +share/netsaint/docs/developer/stateretentionfile.html +share/netsaint/docs/developer/statusfile.html +share/netsaint/docs/developer/xcd.html +share/netsaint/docs/developer/xdata.html +share/netsaint/docs/developer/xed.html +share/netsaint/docs/developer/xod.html +share/netsaint/docs/developer/xrd.html +share/netsaint/docs/developer/xsd.html +share/netsaint/docs/distributed.html +share/netsaint/docs/escalations.html share/netsaint/docs/eventhandlers.html share/netsaint/docs/extcommands.html share/netsaint/docs/faqs.html share/netsaint/docs/funstuff.html +share/netsaint/docs/images/activepassive.gif +share/netsaint/docs/images/checktiming.gif share/netsaint/docs/images/cmd_cgi.gif share/netsaint/docs/images/config_cgi.gif +share/netsaint/docs/images/distributed.gif share/netsaint/docs/images/extinfo_cgi_a.gif share/netsaint/docs/images/extinfo_cgi_b.gif share/netsaint/docs/images/extinfo_cgi_c.gif share/netsaint/docs/images/extinfo_cgi_d.gif share/netsaint/docs/images/history_cgi.gif -share/netsaint/docs/images/logic-host-event-handler.gif -share/netsaint/docs/images/logic-host-notification.gif -share/netsaint/docs/images/logic-host-state-handler.gif -share/netsaint/docs/images/logic-route-check.gif -share/netsaint/docs/images/logic-service-event-handler.gif -share/netsaint/docs/images/logic-service-notification.gif -share/netsaint/docs/images/logic-service-problem.gif -share/netsaint/docs/images/logic-service-recovery.gif -share/netsaint/docs/images/logic-top.gif +share/netsaint/docs/images/indirecthostcheck.gif +share/netsaint/docs/images/indirectsvccheck.gif +share/netsaint/docs/images/indirectsvccheck2.gif +share/netsaint/docs/images/interleaved1.gif +share/netsaint/docs/images/interleaved2.gif share/netsaint/docs/images/network-heirarchy.gif +share/netsaint/docs/images/network-outage1.gif +share/netsaint/docs/images/network-outage2.gif +share/netsaint/docs/images/noninterleaved1.gif +share/netsaint/docs/images/noninterleaved2.gif share/netsaint/docs/images/notification-process.gif share/netsaint/docs/images/notifications_cgi.gif +share/netsaint/docs/images/outages_cgi.gif share/netsaint/docs/images/physical-network.gif +share/netsaint/docs/images/plugintheory.gif share/netsaint/docs/images/redundancy-1.gif share/netsaint/docs/images/redundancy-2.gif -share/netsaint/docs/images/relationship-complex.gif -share/netsaint/docs/images/relationship-simple.gif share/netsaint/docs/images/showlog_cgi.gif share/netsaint/docs/images/status_cgi_a.gif share/netsaint/docs/images/status_cgi_b.gif share/netsaint/docs/images/statusmap_cgi.gif share/netsaint/docs/images/statuswrl_cgi.gif +share/netsaint/docs/images/trends_cgi.gif share/netsaint/docs/index.html +share/netsaint/docs/indirectchecks.html share/netsaint/docs/installing.html share/netsaint/docs/installweb.html share/netsaint/docs/macros.html share/netsaint/docs/makehtml.html +share/netsaint/docs/networkoutages.html share/netsaint/docs/networkreachability.html share/netsaint/docs/notifications.html +share/netsaint/docs/oldplugins.html share/netsaint/docs/parallelization.html +share/netsaint/docs/passivechecks.html share/netsaint/docs/pluginhowto.html share/netsaint/docs/plugins.html +share/netsaint/docs/plugintheory.html share/netsaint/docs/programmodes.html share/netsaint/docs/redundancy.html share/netsaint/docs/robots.txt +share/netsaint/docs/security.html share/netsaint/docs/starting.html share/netsaint/docs/statetypes.html share/netsaint/docs/statuslevels.html share/netsaint/docs/stoprestart.html -share/netsaint/docs/theory-network.html -share/netsaint/docs/theory-time.html share/netsaint/docs/theory.html share/netsaint/docs/timeperiods.html share/netsaint/docs/verifyconfig.html +share/netsaint/docs/volatileservices.html share/netsaint/docs/whatsnew.html +share/netsaint/images/ack.gif share/netsaint/images/active.gif share/netsaint/images/command.gif share/netsaint/images/commandsbar.gif @@ -81,7 +115,9 @@ share/netsaint/images/delay.gif share/netsaint/images/delete.gif share/netsaint/images/disabled.gif share/netsaint/images/docbar.gif +share/netsaint/images/down.gif share/netsaint/images/enabled.gif +share/netsaint/images/extinfo.gif share/netsaint/images/greendot.gif share/netsaint/images/history.gif share/netsaint/images/historybar.gif @@ -163,6 +199,8 @@ share/netsaint/images/logrotate.gif share/netsaint/images/logs.gif share/netsaint/images/ndisabled.gif share/netsaint/images/networkhealthbar.gif +share/netsaint/images/networkoutagesbar.gif +share/netsaint/images/noack.gif share/netsaint/images/notes.gif share/netsaint/images/notificationsbar.gif share/netsaint/images/notify.gif @@ -179,10 +217,10 @@ share/netsaint/images/sblogo.gif share/netsaint/images/sbmonitor.gif share/netsaint/images/scale.gif share/netsaint/images/serviceevent.gif +share/netsaint/images/serviceproblemsbar.gif share/netsaint/images/servicesbar.gif share/netsaint/images/standby.gif share/netsaint/images/start.gif -share/netsaint/images/statudetailbar.gif share/netsaint/images/status.gif share/netsaint/images/status2.gif share/netsaint/images/status3.gif @@ -190,34 +228,55 @@ share/netsaint/images/status4.gif share/netsaint/images/statusdetailbar.gif share/netsaint/images/statusmapbar.gif share/netsaint/images/statusoverviewbar.gif +share/netsaint/images/statussummarybar.gif share/netsaint/images/statusworldbar.gif share/netsaint/images/stop.gif share/netsaint/images/thermcrit.gif share/netsaint/images/thermok.gif share/netsaint/images/thermwarn.gif share/netsaint/images/timeperiodsbar.gif +share/netsaint/images/trends.gif +share/netsaint/images/trendsbar.gif +share/netsaint/images/trendshost.png +share/netsaint/images/trendssvc.png share/netsaint/images/unknown.gif +share/netsaint/images/up.gif share/netsaint/images/warning.gif -share/netsaint/images/xinfo.gif -share/netsaint/images/zombie.gif share/netsaint/index.html share/netsaint/main.html +share/netsaint/media/critical.wav +share/netsaint/media/hostdown.wav +share/netsaint/media/warning.wav share/netsaint/robots.txt share/netsaint/sbin/cmd.cgi share/netsaint/sbin/config.cgi share/netsaint/sbin/extinfo.cgi share/netsaint/sbin/history.cgi share/netsaint/sbin/notifications.cgi -share/netsaint/sbin/nscgi.cfg +share/netsaint/sbin/outages.cgi share/netsaint/sbin/showlog.cgi share/netsaint/sbin/status.cgi share/netsaint/sbin/statusmap.cgi share/netsaint/sbin/statuswrl.cgi +share/netsaint/sbin/trends.cgi share/netsaint/side.html +share/netsaint/stylesheets/cmd.css +share/netsaint/stylesheets/config.css +share/netsaint/stylesheets/extinfo.css +share/netsaint/stylesheets/history.css +share/netsaint/stylesheets/notifications.css +share/netsaint/stylesheets/outages.css +share/netsaint/stylesheets/showlog.css +share/netsaint/stylesheets/status.css +share/netsaint/stylesheets/statusmap.css +share/netsaint/stylesheets/trends.css @dirrm etc/netsaint -@dirrm share/netsaint/sbin -@dirrm share/netsaint/images/logos -@dirrm share/netsaint/images +@dirrm share/netsaint/docs/developer/images +@dirrm share/netsaint/docs/developer @dirrm share/netsaint/docs/images @dirrm share/netsaint/docs -@dirrm share/netsaint +@dirrm share/netsaint/images/logos +@dirrm share/netsaint/images +@dirrm share/netsaint/media +@dirrm share/netsaint/sbin +@dirrm share/netsaint/stylesheets diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile index 1f57b4c66bba..685bfb9dc6e5 100644 --- a/net-mgmt/nagios12/Makefile +++ b/net-mgmt/nagios12/Makefile @@ -6,19 +6,26 @@ # PORTNAME= netsaint -PORTVERSION= 0.0.5.2 +PORTVERSION= 0.0.6 CATEGORIES= net -MASTER_SITES= http://www.netsaint.org/download/ -DISTNAME= ${PORTNAME}-0.0.5-2 +MASTER_SITES= http://netsaint.sourceforge.net/download/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd \ + gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +# no run depends due to circular reference +#RUN_DEPENDS= ${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lgd" -INSTALL_TARGET= install-all + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt" +CONFIGURE_ARGS= --with-command-user=root \ + --with-command-grp=wheel \ + --with-netsaint-user=netsaint \ + --with-netsaint-grp=netsaint +INSTALL_TARGET= all install config install-config install-daemoninit pre-fetch: @${SH} ${SCRIPTDIR}/checkps diff --git a/net-mgmt/nagios12/distinfo b/net-mgmt/nagios12/distinfo index b77e807a2a4d..36148fb971d5 100644 --- a/net-mgmt/nagios12/distinfo +++ b/net-mgmt/nagios12/distinfo @@ -1 +1 @@ -MD5 (netsaint-0.0.5-2.tar.gz) = 19af41fb74ca4efbb1f6a4a915adc76f +MD5 (netsaint-0.0.6.tar.gz) = 0d85b66c7258fcb8dd3fbf775dd7728d diff --git a/net-mgmt/nagios12/files/patch-aa b/net-mgmt/nagios12/files/patch-aa index 3eb6719e49f6..ed255141379c 100644 --- a/net-mgmt/nagios12/files/patch-aa +++ b/net-mgmt/nagios12/files/patch-aa @@ -1,31 +1,20 @@ ---- Makefile.in Fri Apr 7 11:11:31 2000 -+++ Makefile.in.new Mon Jun 12 19:33:19 2000 -@@ -36,7 +36,7 @@ - @echo "Please supply a command line argument (i.e. 'make all'). Other targets are:" - @echo " netsaint cgis config" - @echo " clean distclean devclean" -- @echo " install install-html install-config install-init install-daemoninit install-commandmode" -+ @echo " install install-html install-config install-init install-daemoninit install-commandmode install-all" - @echo " uninstall" +--- Makefile.in.orig Sun Oct 29 14:43:54 2000 ++++ Makefile.in Fri Jan 12 14:54:45 2001 +@@ -27,7 +27,7 @@ + INSTALL_OPTS=@INSTALL_OPTS@ + COMMAND_OPTS=@COMMAND_OPTS@ + INIT_DIR=@init_dir@ +-INIT_OPTS=-o root -g root ++INIT_OPTS=-o root -g wheel + CGICFGDIR=$(CGIDIR) - # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999) -@@ -99,13 +99,17 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(CGIDIR) - - install-init: -- $(INSTALL) -m 774 -o root -g root init-script /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel init-script /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions + CGIEXTRAS=@CGIEXTRAS@ +@@ -109,7 +109,7 @@ + $(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint install-daemoninit: -- $(INSTALL) -m 774 -o root -g root daemon-init /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel daemon-init /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions +- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint ++ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh install-commandmode: - $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(LOGDIR)/rw - - uninstall: - rm -rf $(BINDIR)/netsaint $(CGIDIR)/*.cgi $(CFGDIR)/*.cfg $(HTMLDIR) -+ -+install-all: all install config install-config install-daemoninit + $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw diff --git a/net-mgmt/nagios12/files/patch-ab b/net-mgmt/nagios12/files/patch-ab index f7ce712a1276..bbaa1d00e8ba 100644 --- a/net-mgmt/nagios12/files/patch-ab +++ b/net-mgmt/nagios12/files/patch-ab @@ -1,8 +1,10 @@ ---- base/Makefile.in Fri Apr 7 11:11:32 2000 -+++ base/Makefile.in.new Sat Jun 10 21:45:15 2000 -@@ -52,5 +52,4 @@ +--- base/Makefile.in.orig Sun Jan 7 21:53:15 2001 ++++ base/Makefile.in Sun Jan 7 21:53:27 2001 +@@ -83,7 +83,6 @@ rm -f *~ install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR) - $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(BINDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR) + + diff --git a/net-mgmt/nagios12/files/patch-ac b/net-mgmt/nagios12/files/patch-ac deleted file mode 100644 index 1eb997a043fc..000000000000 --- a/net-mgmt/nagios12/files/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ ---- common/locations.sub Wed Apr 26 21:10:13 2000 -+++ common/locations.sub.new Mon Jun 12 21:29:23 2000 -@@ -19,16 +19,16 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - ************************************************************************/ - --#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint.tmp" --#define DEFAULT_STATUS_FILE "${prefix}/var/status.log" --#define DEFAULT_LOG_FILE "${prefix}/var/netsaint.log" --#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/archives/" --#define DEFAULT_COMMENT_FILE "${prefix}/var/comment.log" --#define DEFAULT_COMMAND_FILE "${prefix}/var/rw/netsaint.cmd" --#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share" -+#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint/netsaint.tmp" -+#define DEFAULT_STATUS_FILE "${prefix}/var/netsaint/status.log" -+#define DEFAULT_LOG_FILE "${prefix}/var/netsaint/netsaint.log" -+#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/netsaint/archives/" -+#define DEFAULT_COMMENT_FILE "${prefix}/var/netsaint/comment.log" -+#define DEFAULT_COMMAND_FILE "${prefix}/var/netsaint/rw/netsaint.cmd" -+#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share/netsaint" - #define DEFAULT_URL_HTML_PATH "/netsaint" --#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/sbin" -+#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/share/netsaint/sbin" - #define DEFAULT_URL_CGIBIN_PATH "/cgi-bin/netsaint" --#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/sbin/nscgi.cfg" -+#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/share/netsaint/sbin/nscgi.cfg" - --#define LOCKFILE "${prefix}/var/netsaint.lock" -+#define LOCKFILE "${prefix}/var/netsaint/netsaint.lock" diff --git a/net-mgmt/nagios12/files/patch-af b/net-mgmt/nagios12/files/patch-af deleted file mode 100644 index 58d7998ff8d8..000000000000 --- a/net-mgmt/nagios12/files/patch-af +++ /dev/null @@ -1,24 +0,0 @@ ---- daemon-init.in Fri Apr 7 11:11:34 2000 -+++ daemon-init.in.new Mon Jun 5 16:11:44 2000 -@@ -27,10 +27,11 @@ - - # Source function library - # Solaris doesn't have an rc.d directory, so do a test first --if [ -f /etc/rc.d/init.d/functions ]; then --. /etc/rc.d/init.d/functions --elif [ -f /etc/init.d/functions ]; then --. /etc/init.d/functions -+if [ -f /usr/local/etc/netsaint/functions ]; then -+. /usr/local/etc/netsaint/functions -+else -+ echo "/usr/local/etc/netsaint/functions missing" -+ exit 1 - fi - - prefix=@prefix@ -@@ -85,4 +86,4 @@ - exit 1 - esac - --# End of this script -+# End of this script diff --git a/net-mgmt/nagios12/files/patch-ah b/net-mgmt/nagios12/files/patch-ah deleted file mode 100644 index a8023ecea7f1..000000000000 --- a/net-mgmt/nagios12/files/patch-ah +++ /dev/null @@ -1,71 +0,0 @@ ---- hosts.cfg.in Fri Apr 7 11:11:34 2000 -+++ hosts.cfg.in.new Thu Jun 15 10:19:42 2000 -@@ -151,10 +151,10 @@ - - hostgroup[novell-servers]=All Novell Servers;novell-admins;es-gra,es-esp - hostgroup[nt-servers]=All NT Servers;nt-admins;rosie,dev,liatris --hostgroup[linux-boxes]=All Linux Servers;linux-admins;real -+hostgroup[freebsd-boxes]=All FreeBSD Servers;freebsd-admins;real - hostgroup[switches]=Switches;switch-admins;switch-4hlan,switch-esplan,switch-gralan,switch-cetslan,switch-hrdlan - hostgroup[routers]=Routers;router-admins;ageng-router --hostgroup[printers]=Printers;printer-admins,linux-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 -+hostgroup[printers]=Printers;printer-admins,freebsd-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 - - - ################################################################################ -@@ -183,19 +183,19 @@ - - # Service notification command - send email with problem summary - --command[notify-by-email]=/bin/echo -e $SUMMARY$ | /bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ -+command[notify-by-email]=/usr/bin/printf $SUMMARY$ | /usr/bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ - - # Service notification command - send email to alphanumeric pager gateway - # The notify-by-epager command assumes that each contact has a pager email gateway, and - # that the address has been entered into the appropriate contact field instead of an - # actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager) - --command[notify-by-epager]=/bin/echo -e 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ -+command[notify-by-epager]=/usr/bin/printf 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /usr/bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ - - # Host notification commands (one for email, one for alphanumeric pager with email gateway) - --command[host-notify-by-email]=/bin/echo -e '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ --command[host-notify-by-epager]=/bin/echo -e 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ -+command[host-notify-by-email]=/usr/bin/printf '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ -+command[host-notify-by-epager]=/usr/bin/printf 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ - - # These are some example service check commands. See the HTML documentation on the plugins for - # examples of how to configure command definitions. -@@ -316,7 +316,7 @@ - - contactgroup[novell-admins]=Novell Administrators;@netsaint_user@ - contactgroup[nt-admins]=NT Administrators;@netsaint_user@,jdoe --contactgroup[linux-admins]=Linux Administrators;@netsaint_user@ -+contactgroup[freebsd-admins]=FreeBSD Administrators;@netsaint_user@ - contactgroup[switch-admins]=Etherswitch Administrators;@netsaint_user@ - contactgroup[router-admins]=Router Technicians;@netsaint_user@ - contactgroup[printer-admins]=Etherswitch Administrators;@netsaint_user@,jdoe -@@ -428,14 +428,14 @@ - service[liatris]=PING;24x7;3;5;1;maes-admins;240;workhours;1;1;0;;check_ping - service[liatris]=MAES Publications;24x7;3;2;1;maes-admins;240;workhours;1;1;1;;check_http2!192.168.2.2!/publications - --# Linux Box --service[real]=PING;24x7;3;5;1;linux-admins;240;24x7;1;1;0;;check_ping --service[real]=HTTP;24x7;3;2;1;linux-admins;240;24x7;1;1;1;;check_http --service[real]=Current Users;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_users!75!150 --service[real]=Zombie Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!5!10!Z --service[real]=Total Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!150!200 --service[real]=Drive 1 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 --service[real]=Drive 2 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 -+# FreeBSD Box -+service[real]=PING;24x7;3;5;1;freebsd-admins;240;24x7;1;1;0;;check_ping -+service[real]=HTTP;24x7;3;2;1;freebsd-admins;240;24x7;1;1;1;;check_http -+service[real]=Current Users;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_users!75!150 -+service[real]=Zombie Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!5!10!Z -+service[real]=Total Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!150!200 -+service[real]=Drive 1 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 -+service[real]=Drive 2 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 - - # Switches - service[switch-esplan]=Traffic Rate;24x7;1;5;6;switch-admins;60;24x7;0;0;0;;traffic_average!/home/httpd/html/mrtg/esp-lan.log!600000!800000!600000!800000 diff --git a/net-mgmt/nagios12/pkg-descr b/net-mgmt/nagios12/pkg-descr index e16ce94fefe6..ba87fff062b8 100644 --- a/net-mgmt/nagios12/pkg-descr +++ b/net-mgmt/nagios12/pkg-descr @@ -1,13 +1,12 @@ -NetSaint is a program that will monitor hosts and services -on your network. It has the ability to email or page you -when a problem arises and when it gets resolved. NetSaint -is written in C and is designed to run under Linux, although -it should work under most other *NIX variants. It can run -either as a normal process or as a daemon, intermittently -running checks on various services that you specify. The -actual service checks are performed by external "plugins" -which return service information to NetSaint. Several CGI -programs are included with NetSaint in order to allow you -to view the current service status, history, etc. via a web browser. +NetSaint is a program that will monitor hosts and services on your +network. It has the ability to email or page you when a problem arises +and when it gets resolved. NetSaint is written in C and is designed to +run under Linux, although it should work under most other *NIX variants. +It can run either as a normal process or as a daemon, intermittently +running checks on various services that you specify. The actual service +checks are performed by external "plugins" which return service +information to NetSaint. Several CGI programs are included with NetSaint +in order to allow you to view the current service status, history, etc. +via a web browser. WWW: http://www.netsaint.org/ diff --git a/net-mgmt/nagios12/pkg-plist b/net-mgmt/nagios12/pkg-plist index e6757452f595..e932f9661776 100644 --- a/net-mgmt/nagios12/pkg-plist +++ b/net-mgmt/nagios12/pkg-plist @@ -1,72 +1,106 @@ bin/netsaint -etc/netsaint/netsaint.cfg +etc/netsaint/commands.cfg etc/netsaint/hosts.cfg -etc/netsaint/functions +etc/netsaint/netsaint.cfg +etc/netsaint/nscgi.cfg +etc/netsaint/resource.cfg etc/rc.d/netsaint.sh share/netsaint/docs/about.html share/netsaint/docs/addons.html +share/netsaint/docs/bigtime.html share/netsaint/docs/cgiauth.html share/netsaint/docs/cgis.html +share/netsaint/docs/checkscheduling.html +share/netsaint/docs/clusters.html +share/netsaint/docs/commandfile.html share/netsaint/docs/config.html share/netsaint/docs/configcgi.html share/netsaint/docs/confighost.html share/netsaint/docs/configmain.html +share/netsaint/docs/developer/commentfile.html +share/netsaint/docs/developer/images/xcdapi.gif +share/netsaint/docs/developer/images/xedapi.gif +share/netsaint/docs/developer/images/xodapi.gif +share/netsaint/docs/developer/images/xrdapi.gif +share/netsaint/docs/developer/images/xsdapi.gif +share/netsaint/docs/developer/index.html +share/netsaint/docs/developer/pluginhowto.html +share/netsaint/docs/developer/stateretentionfile.html +share/netsaint/docs/developer/statusfile.html +share/netsaint/docs/developer/xcd.html +share/netsaint/docs/developer/xdata.html +share/netsaint/docs/developer/xed.html +share/netsaint/docs/developer/xod.html +share/netsaint/docs/developer/xrd.html +share/netsaint/docs/developer/xsd.html +share/netsaint/docs/distributed.html +share/netsaint/docs/escalations.html share/netsaint/docs/eventhandlers.html share/netsaint/docs/extcommands.html share/netsaint/docs/faqs.html share/netsaint/docs/funstuff.html +share/netsaint/docs/images/activepassive.gif +share/netsaint/docs/images/checktiming.gif share/netsaint/docs/images/cmd_cgi.gif share/netsaint/docs/images/config_cgi.gif +share/netsaint/docs/images/distributed.gif share/netsaint/docs/images/extinfo_cgi_a.gif share/netsaint/docs/images/extinfo_cgi_b.gif share/netsaint/docs/images/extinfo_cgi_c.gif share/netsaint/docs/images/extinfo_cgi_d.gif share/netsaint/docs/images/history_cgi.gif -share/netsaint/docs/images/logic-host-event-handler.gif -share/netsaint/docs/images/logic-host-notification.gif -share/netsaint/docs/images/logic-host-state-handler.gif -share/netsaint/docs/images/logic-route-check.gif -share/netsaint/docs/images/logic-service-event-handler.gif -share/netsaint/docs/images/logic-service-notification.gif -share/netsaint/docs/images/logic-service-problem.gif -share/netsaint/docs/images/logic-service-recovery.gif -share/netsaint/docs/images/logic-top.gif +share/netsaint/docs/images/indirecthostcheck.gif +share/netsaint/docs/images/indirectsvccheck.gif +share/netsaint/docs/images/indirectsvccheck2.gif +share/netsaint/docs/images/interleaved1.gif +share/netsaint/docs/images/interleaved2.gif share/netsaint/docs/images/network-heirarchy.gif +share/netsaint/docs/images/network-outage1.gif +share/netsaint/docs/images/network-outage2.gif +share/netsaint/docs/images/noninterleaved1.gif +share/netsaint/docs/images/noninterleaved2.gif share/netsaint/docs/images/notification-process.gif share/netsaint/docs/images/notifications_cgi.gif +share/netsaint/docs/images/outages_cgi.gif share/netsaint/docs/images/physical-network.gif +share/netsaint/docs/images/plugintheory.gif share/netsaint/docs/images/redundancy-1.gif share/netsaint/docs/images/redundancy-2.gif -share/netsaint/docs/images/relationship-complex.gif -share/netsaint/docs/images/relationship-simple.gif share/netsaint/docs/images/showlog_cgi.gif share/netsaint/docs/images/status_cgi_a.gif share/netsaint/docs/images/status_cgi_b.gif share/netsaint/docs/images/statusmap_cgi.gif share/netsaint/docs/images/statuswrl_cgi.gif +share/netsaint/docs/images/trends_cgi.gif share/netsaint/docs/index.html +share/netsaint/docs/indirectchecks.html share/netsaint/docs/installing.html share/netsaint/docs/installweb.html share/netsaint/docs/macros.html share/netsaint/docs/makehtml.html +share/netsaint/docs/networkoutages.html share/netsaint/docs/networkreachability.html share/netsaint/docs/notifications.html +share/netsaint/docs/oldplugins.html share/netsaint/docs/parallelization.html +share/netsaint/docs/passivechecks.html share/netsaint/docs/pluginhowto.html share/netsaint/docs/plugins.html +share/netsaint/docs/plugintheory.html share/netsaint/docs/programmodes.html share/netsaint/docs/redundancy.html share/netsaint/docs/robots.txt +share/netsaint/docs/security.html share/netsaint/docs/starting.html share/netsaint/docs/statetypes.html share/netsaint/docs/statuslevels.html share/netsaint/docs/stoprestart.html -share/netsaint/docs/theory-network.html -share/netsaint/docs/theory-time.html share/netsaint/docs/theory.html share/netsaint/docs/timeperiods.html share/netsaint/docs/verifyconfig.html +share/netsaint/docs/volatileservices.html share/netsaint/docs/whatsnew.html +share/netsaint/images/ack.gif share/netsaint/images/active.gif share/netsaint/images/command.gif share/netsaint/images/commandsbar.gif @@ -81,7 +115,9 @@ share/netsaint/images/delay.gif share/netsaint/images/delete.gif share/netsaint/images/disabled.gif share/netsaint/images/docbar.gif +share/netsaint/images/down.gif share/netsaint/images/enabled.gif +share/netsaint/images/extinfo.gif share/netsaint/images/greendot.gif share/netsaint/images/history.gif share/netsaint/images/historybar.gif @@ -163,6 +199,8 @@ share/netsaint/images/logrotate.gif share/netsaint/images/logs.gif share/netsaint/images/ndisabled.gif share/netsaint/images/networkhealthbar.gif +share/netsaint/images/networkoutagesbar.gif +share/netsaint/images/noack.gif share/netsaint/images/notes.gif share/netsaint/images/notificationsbar.gif share/netsaint/images/notify.gif @@ -179,10 +217,10 @@ share/netsaint/images/sblogo.gif share/netsaint/images/sbmonitor.gif share/netsaint/images/scale.gif share/netsaint/images/serviceevent.gif +share/netsaint/images/serviceproblemsbar.gif share/netsaint/images/servicesbar.gif share/netsaint/images/standby.gif share/netsaint/images/start.gif -share/netsaint/images/statudetailbar.gif share/netsaint/images/status.gif share/netsaint/images/status2.gif share/netsaint/images/status3.gif @@ -190,34 +228,55 @@ share/netsaint/images/status4.gif share/netsaint/images/statusdetailbar.gif share/netsaint/images/statusmapbar.gif share/netsaint/images/statusoverviewbar.gif +share/netsaint/images/statussummarybar.gif share/netsaint/images/statusworldbar.gif share/netsaint/images/stop.gif share/netsaint/images/thermcrit.gif share/netsaint/images/thermok.gif share/netsaint/images/thermwarn.gif share/netsaint/images/timeperiodsbar.gif +share/netsaint/images/trends.gif +share/netsaint/images/trendsbar.gif +share/netsaint/images/trendshost.png +share/netsaint/images/trendssvc.png share/netsaint/images/unknown.gif +share/netsaint/images/up.gif share/netsaint/images/warning.gif -share/netsaint/images/xinfo.gif -share/netsaint/images/zombie.gif share/netsaint/index.html share/netsaint/main.html +share/netsaint/media/critical.wav +share/netsaint/media/hostdown.wav +share/netsaint/media/warning.wav share/netsaint/robots.txt share/netsaint/sbin/cmd.cgi share/netsaint/sbin/config.cgi share/netsaint/sbin/extinfo.cgi share/netsaint/sbin/history.cgi share/netsaint/sbin/notifications.cgi -share/netsaint/sbin/nscgi.cfg +share/netsaint/sbin/outages.cgi share/netsaint/sbin/showlog.cgi share/netsaint/sbin/status.cgi share/netsaint/sbin/statusmap.cgi share/netsaint/sbin/statuswrl.cgi +share/netsaint/sbin/trends.cgi share/netsaint/side.html +share/netsaint/stylesheets/cmd.css +share/netsaint/stylesheets/config.css +share/netsaint/stylesheets/extinfo.css +share/netsaint/stylesheets/history.css +share/netsaint/stylesheets/notifications.css +share/netsaint/stylesheets/outages.css +share/netsaint/stylesheets/showlog.css +share/netsaint/stylesheets/status.css +share/netsaint/stylesheets/statusmap.css +share/netsaint/stylesheets/trends.css @dirrm etc/netsaint -@dirrm share/netsaint/sbin -@dirrm share/netsaint/images/logos -@dirrm share/netsaint/images +@dirrm share/netsaint/docs/developer/images +@dirrm share/netsaint/docs/developer @dirrm share/netsaint/docs/images @dirrm share/netsaint/docs -@dirrm share/netsaint +@dirrm share/netsaint/images/logos +@dirrm share/netsaint/images +@dirrm share/netsaint/media +@dirrm share/netsaint/sbin +@dirrm share/netsaint/stylesheets diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile index 1f57b4c66bba..685bfb9dc6e5 100644 --- a/net-mgmt/nagios2/Makefile +++ b/net-mgmt/nagios2/Makefile @@ -6,19 +6,26 @@ # PORTNAME= netsaint -PORTVERSION= 0.0.5.2 +PORTVERSION= 0.0.6 CATEGORIES= net -MASTER_SITES= http://www.netsaint.org/download/ -DISTNAME= ${PORTNAME}-0.0.5-2 +MASTER_SITES= http://netsaint.sourceforge.net/download/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd \ + gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +# no run depends due to circular reference +#RUN_DEPENDS= ${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lgd" -INSTALL_TARGET= install-all + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt" +CONFIGURE_ARGS= --with-command-user=root \ + --with-command-grp=wheel \ + --with-netsaint-user=netsaint \ + --with-netsaint-grp=netsaint +INSTALL_TARGET= all install config install-config install-daemoninit pre-fetch: @${SH} ${SCRIPTDIR}/checkps diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo index b77e807a2a4d..36148fb971d5 100644 --- a/net-mgmt/nagios2/distinfo +++ b/net-mgmt/nagios2/distinfo @@ -1 +1 @@ -MD5 (netsaint-0.0.5-2.tar.gz) = 19af41fb74ca4efbb1f6a4a915adc76f +MD5 (netsaint-0.0.6.tar.gz) = 0d85b66c7258fcb8dd3fbf775dd7728d diff --git a/net-mgmt/nagios2/files/patch-aa b/net-mgmt/nagios2/files/patch-aa index 3eb6719e49f6..ed255141379c 100644 --- a/net-mgmt/nagios2/files/patch-aa +++ b/net-mgmt/nagios2/files/patch-aa @@ -1,31 +1,20 @@ ---- Makefile.in Fri Apr 7 11:11:31 2000 -+++ Makefile.in.new Mon Jun 12 19:33:19 2000 -@@ -36,7 +36,7 @@ - @echo "Please supply a command line argument (i.e. 'make all'). Other targets are:" - @echo " netsaint cgis config" - @echo " clean distclean devclean" -- @echo " install install-html install-config install-init install-daemoninit install-commandmode" -+ @echo " install install-html install-config install-init install-daemoninit install-commandmode install-all" - @echo " uninstall" +--- Makefile.in.orig Sun Oct 29 14:43:54 2000 ++++ Makefile.in Fri Jan 12 14:54:45 2001 +@@ -27,7 +27,7 @@ + INSTALL_OPTS=@INSTALL_OPTS@ + COMMAND_OPTS=@COMMAND_OPTS@ + INIT_DIR=@init_dir@ +-INIT_OPTS=-o root -g root ++INIT_OPTS=-o root -g wheel + CGICFGDIR=$(CGIDIR) - # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999) -@@ -99,13 +99,17 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(CGIDIR) - - install-init: -- $(INSTALL) -m 774 -o root -g root init-script /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel init-script /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions + CGIEXTRAS=@CGIEXTRAS@ +@@ -109,7 +109,7 @@ + $(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint install-daemoninit: -- $(INSTALL) -m 774 -o root -g root daemon-init /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel daemon-init /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions +- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint ++ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh install-commandmode: - $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(LOGDIR)/rw - - uninstall: - rm -rf $(BINDIR)/netsaint $(CGIDIR)/*.cgi $(CFGDIR)/*.cfg $(HTMLDIR) -+ -+install-all: all install config install-config install-daemoninit + $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw diff --git a/net-mgmt/nagios2/files/patch-ab b/net-mgmt/nagios2/files/patch-ab index f7ce712a1276..bbaa1d00e8ba 100644 --- a/net-mgmt/nagios2/files/patch-ab +++ b/net-mgmt/nagios2/files/patch-ab @@ -1,8 +1,10 @@ ---- base/Makefile.in Fri Apr 7 11:11:32 2000 -+++ base/Makefile.in.new Sat Jun 10 21:45:15 2000 -@@ -52,5 +52,4 @@ +--- base/Makefile.in.orig Sun Jan 7 21:53:15 2001 ++++ base/Makefile.in Sun Jan 7 21:53:27 2001 +@@ -83,7 +83,6 @@ rm -f *~ install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR) - $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(BINDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR) + + diff --git a/net-mgmt/nagios2/files/patch-ac b/net-mgmt/nagios2/files/patch-ac deleted file mode 100644 index 1eb997a043fc..000000000000 --- a/net-mgmt/nagios2/files/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ ---- common/locations.sub Wed Apr 26 21:10:13 2000 -+++ common/locations.sub.new Mon Jun 12 21:29:23 2000 -@@ -19,16 +19,16 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - ************************************************************************/ - --#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint.tmp" --#define DEFAULT_STATUS_FILE "${prefix}/var/status.log" --#define DEFAULT_LOG_FILE "${prefix}/var/netsaint.log" --#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/archives/" --#define DEFAULT_COMMENT_FILE "${prefix}/var/comment.log" --#define DEFAULT_COMMAND_FILE "${prefix}/var/rw/netsaint.cmd" --#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share" -+#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint/netsaint.tmp" -+#define DEFAULT_STATUS_FILE "${prefix}/var/netsaint/status.log" -+#define DEFAULT_LOG_FILE "${prefix}/var/netsaint/netsaint.log" -+#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/netsaint/archives/" -+#define DEFAULT_COMMENT_FILE "${prefix}/var/netsaint/comment.log" -+#define DEFAULT_COMMAND_FILE "${prefix}/var/netsaint/rw/netsaint.cmd" -+#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share/netsaint" - #define DEFAULT_URL_HTML_PATH "/netsaint" --#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/sbin" -+#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/share/netsaint/sbin" - #define DEFAULT_URL_CGIBIN_PATH "/cgi-bin/netsaint" --#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/sbin/nscgi.cfg" -+#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/share/netsaint/sbin/nscgi.cfg" - --#define LOCKFILE "${prefix}/var/netsaint.lock" -+#define LOCKFILE "${prefix}/var/netsaint/netsaint.lock" diff --git a/net-mgmt/nagios2/files/patch-af b/net-mgmt/nagios2/files/patch-af deleted file mode 100644 index 58d7998ff8d8..000000000000 --- a/net-mgmt/nagios2/files/patch-af +++ /dev/null @@ -1,24 +0,0 @@ ---- daemon-init.in Fri Apr 7 11:11:34 2000 -+++ daemon-init.in.new Mon Jun 5 16:11:44 2000 -@@ -27,10 +27,11 @@ - - # Source function library - # Solaris doesn't have an rc.d directory, so do a test first --if [ -f /etc/rc.d/init.d/functions ]; then --. /etc/rc.d/init.d/functions --elif [ -f /etc/init.d/functions ]; then --. /etc/init.d/functions -+if [ -f /usr/local/etc/netsaint/functions ]; then -+. /usr/local/etc/netsaint/functions -+else -+ echo "/usr/local/etc/netsaint/functions missing" -+ exit 1 - fi - - prefix=@prefix@ -@@ -85,4 +86,4 @@ - exit 1 - esac - --# End of this script -+# End of this script diff --git a/net-mgmt/nagios2/files/patch-ah b/net-mgmt/nagios2/files/patch-ah deleted file mode 100644 index a8023ecea7f1..000000000000 --- a/net-mgmt/nagios2/files/patch-ah +++ /dev/null @@ -1,71 +0,0 @@ ---- hosts.cfg.in Fri Apr 7 11:11:34 2000 -+++ hosts.cfg.in.new Thu Jun 15 10:19:42 2000 -@@ -151,10 +151,10 @@ - - hostgroup[novell-servers]=All Novell Servers;novell-admins;es-gra,es-esp - hostgroup[nt-servers]=All NT Servers;nt-admins;rosie,dev,liatris --hostgroup[linux-boxes]=All Linux Servers;linux-admins;real -+hostgroup[freebsd-boxes]=All FreeBSD Servers;freebsd-admins;real - hostgroup[switches]=Switches;switch-admins;switch-4hlan,switch-esplan,switch-gralan,switch-cetslan,switch-hrdlan - hostgroup[routers]=Routers;router-admins;ageng-router --hostgroup[printers]=Printers;printer-admins,linux-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 -+hostgroup[printers]=Printers;printer-admins,freebsd-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 - - - ################################################################################ -@@ -183,19 +183,19 @@ - - # Service notification command - send email with problem summary - --command[notify-by-email]=/bin/echo -e $SUMMARY$ | /bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ -+command[notify-by-email]=/usr/bin/printf $SUMMARY$ | /usr/bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ - - # Service notification command - send email to alphanumeric pager gateway - # The notify-by-epager command assumes that each contact has a pager email gateway, and - # that the address has been entered into the appropriate contact field instead of an - # actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager) - --command[notify-by-epager]=/bin/echo -e 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ -+command[notify-by-epager]=/usr/bin/printf 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /usr/bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ - - # Host notification commands (one for email, one for alphanumeric pager with email gateway) - --command[host-notify-by-email]=/bin/echo -e '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ --command[host-notify-by-epager]=/bin/echo -e 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ -+command[host-notify-by-email]=/usr/bin/printf '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ -+command[host-notify-by-epager]=/usr/bin/printf 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ - - # These are some example service check commands. See the HTML documentation on the plugins for - # examples of how to configure command definitions. -@@ -316,7 +316,7 @@ - - contactgroup[novell-admins]=Novell Administrators;@netsaint_user@ - contactgroup[nt-admins]=NT Administrators;@netsaint_user@,jdoe --contactgroup[linux-admins]=Linux Administrators;@netsaint_user@ -+contactgroup[freebsd-admins]=FreeBSD Administrators;@netsaint_user@ - contactgroup[switch-admins]=Etherswitch Administrators;@netsaint_user@ - contactgroup[router-admins]=Router Technicians;@netsaint_user@ - contactgroup[printer-admins]=Etherswitch Administrators;@netsaint_user@,jdoe -@@ -428,14 +428,14 @@ - service[liatris]=PING;24x7;3;5;1;maes-admins;240;workhours;1;1;0;;check_ping - service[liatris]=MAES Publications;24x7;3;2;1;maes-admins;240;workhours;1;1;1;;check_http2!192.168.2.2!/publications - --# Linux Box --service[real]=PING;24x7;3;5;1;linux-admins;240;24x7;1;1;0;;check_ping --service[real]=HTTP;24x7;3;2;1;linux-admins;240;24x7;1;1;1;;check_http --service[real]=Current Users;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_users!75!150 --service[real]=Zombie Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!5!10!Z --service[real]=Total Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!150!200 --service[real]=Drive 1 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 --service[real]=Drive 2 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 -+# FreeBSD Box -+service[real]=PING;24x7;3;5;1;freebsd-admins;240;24x7;1;1;0;;check_ping -+service[real]=HTTP;24x7;3;2;1;freebsd-admins;240;24x7;1;1;1;;check_http -+service[real]=Current Users;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_users!75!150 -+service[real]=Zombie Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!5!10!Z -+service[real]=Total Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!150!200 -+service[real]=Drive 1 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 -+service[real]=Drive 2 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 - - # Switches - service[switch-esplan]=Traffic Rate;24x7;1;5;6;switch-admins;60;24x7;0;0;0;;traffic_average!/home/httpd/html/mrtg/esp-lan.log!600000!800000!600000!800000 diff --git a/net-mgmt/nagios2/pkg-descr b/net-mgmt/nagios2/pkg-descr index e16ce94fefe6..ba87fff062b8 100644 --- a/net-mgmt/nagios2/pkg-descr +++ b/net-mgmt/nagios2/pkg-descr @@ -1,13 +1,12 @@ -NetSaint is a program that will monitor hosts and services -on your network. It has the ability to email or page you -when a problem arises and when it gets resolved. NetSaint -is written in C and is designed to run under Linux, although -it should work under most other *NIX variants. It can run -either as a normal process or as a daemon, intermittently -running checks on various services that you specify. The -actual service checks are performed by external "plugins" -which return service information to NetSaint. Several CGI -programs are included with NetSaint in order to allow you -to view the current service status, history, etc. via a web browser. +NetSaint is a program that will monitor hosts and services on your +network. It has the ability to email or page you when a problem arises +and when it gets resolved. NetSaint is written in C and is designed to +run under Linux, although it should work under most other *NIX variants. +It can run either as a normal process or as a daemon, intermittently +running checks on various services that you specify. The actual service +checks are performed by external "plugins" which return service +information to NetSaint. Several CGI programs are included with NetSaint +in order to allow you to view the current service status, history, etc. +via a web browser. WWW: http://www.netsaint.org/ diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist index e6757452f595..e932f9661776 100644 --- a/net-mgmt/nagios2/pkg-plist +++ b/net-mgmt/nagios2/pkg-plist @@ -1,72 +1,106 @@ bin/netsaint -etc/netsaint/netsaint.cfg +etc/netsaint/commands.cfg etc/netsaint/hosts.cfg -etc/netsaint/functions +etc/netsaint/netsaint.cfg +etc/netsaint/nscgi.cfg +etc/netsaint/resource.cfg etc/rc.d/netsaint.sh share/netsaint/docs/about.html share/netsaint/docs/addons.html +share/netsaint/docs/bigtime.html share/netsaint/docs/cgiauth.html share/netsaint/docs/cgis.html +share/netsaint/docs/checkscheduling.html +share/netsaint/docs/clusters.html +share/netsaint/docs/commandfile.html share/netsaint/docs/config.html share/netsaint/docs/configcgi.html share/netsaint/docs/confighost.html share/netsaint/docs/configmain.html +share/netsaint/docs/developer/commentfile.html +share/netsaint/docs/developer/images/xcdapi.gif +share/netsaint/docs/developer/images/xedapi.gif +share/netsaint/docs/developer/images/xodapi.gif +share/netsaint/docs/developer/images/xrdapi.gif +share/netsaint/docs/developer/images/xsdapi.gif +share/netsaint/docs/developer/index.html +share/netsaint/docs/developer/pluginhowto.html +share/netsaint/docs/developer/stateretentionfile.html +share/netsaint/docs/developer/statusfile.html +share/netsaint/docs/developer/xcd.html +share/netsaint/docs/developer/xdata.html +share/netsaint/docs/developer/xed.html +share/netsaint/docs/developer/xod.html +share/netsaint/docs/developer/xrd.html +share/netsaint/docs/developer/xsd.html +share/netsaint/docs/distributed.html +share/netsaint/docs/escalations.html share/netsaint/docs/eventhandlers.html share/netsaint/docs/extcommands.html share/netsaint/docs/faqs.html share/netsaint/docs/funstuff.html +share/netsaint/docs/images/activepassive.gif +share/netsaint/docs/images/checktiming.gif share/netsaint/docs/images/cmd_cgi.gif share/netsaint/docs/images/config_cgi.gif +share/netsaint/docs/images/distributed.gif share/netsaint/docs/images/extinfo_cgi_a.gif share/netsaint/docs/images/extinfo_cgi_b.gif share/netsaint/docs/images/extinfo_cgi_c.gif share/netsaint/docs/images/extinfo_cgi_d.gif share/netsaint/docs/images/history_cgi.gif -share/netsaint/docs/images/logic-host-event-handler.gif -share/netsaint/docs/images/logic-host-notification.gif -share/netsaint/docs/images/logic-host-state-handler.gif -share/netsaint/docs/images/logic-route-check.gif -share/netsaint/docs/images/logic-service-event-handler.gif -share/netsaint/docs/images/logic-service-notification.gif -share/netsaint/docs/images/logic-service-problem.gif -share/netsaint/docs/images/logic-service-recovery.gif -share/netsaint/docs/images/logic-top.gif +share/netsaint/docs/images/indirecthostcheck.gif +share/netsaint/docs/images/indirectsvccheck.gif +share/netsaint/docs/images/indirectsvccheck2.gif +share/netsaint/docs/images/interleaved1.gif +share/netsaint/docs/images/interleaved2.gif share/netsaint/docs/images/network-heirarchy.gif +share/netsaint/docs/images/network-outage1.gif +share/netsaint/docs/images/network-outage2.gif +share/netsaint/docs/images/noninterleaved1.gif +share/netsaint/docs/images/noninterleaved2.gif share/netsaint/docs/images/notification-process.gif share/netsaint/docs/images/notifications_cgi.gif +share/netsaint/docs/images/outages_cgi.gif share/netsaint/docs/images/physical-network.gif +share/netsaint/docs/images/plugintheory.gif share/netsaint/docs/images/redundancy-1.gif share/netsaint/docs/images/redundancy-2.gif -share/netsaint/docs/images/relationship-complex.gif -share/netsaint/docs/images/relationship-simple.gif share/netsaint/docs/images/showlog_cgi.gif share/netsaint/docs/images/status_cgi_a.gif share/netsaint/docs/images/status_cgi_b.gif share/netsaint/docs/images/statusmap_cgi.gif share/netsaint/docs/images/statuswrl_cgi.gif +share/netsaint/docs/images/trends_cgi.gif share/netsaint/docs/index.html +share/netsaint/docs/indirectchecks.html share/netsaint/docs/installing.html share/netsaint/docs/installweb.html share/netsaint/docs/macros.html share/netsaint/docs/makehtml.html +share/netsaint/docs/networkoutages.html share/netsaint/docs/networkreachability.html share/netsaint/docs/notifications.html +share/netsaint/docs/oldplugins.html share/netsaint/docs/parallelization.html +share/netsaint/docs/passivechecks.html share/netsaint/docs/pluginhowto.html share/netsaint/docs/plugins.html +share/netsaint/docs/plugintheory.html share/netsaint/docs/programmodes.html share/netsaint/docs/redundancy.html share/netsaint/docs/robots.txt +share/netsaint/docs/security.html share/netsaint/docs/starting.html share/netsaint/docs/statetypes.html share/netsaint/docs/statuslevels.html share/netsaint/docs/stoprestart.html -share/netsaint/docs/theory-network.html -share/netsaint/docs/theory-time.html share/netsaint/docs/theory.html share/netsaint/docs/timeperiods.html share/netsaint/docs/verifyconfig.html +share/netsaint/docs/volatileservices.html share/netsaint/docs/whatsnew.html +share/netsaint/images/ack.gif share/netsaint/images/active.gif share/netsaint/images/command.gif share/netsaint/images/commandsbar.gif @@ -81,7 +115,9 @@ share/netsaint/images/delay.gif share/netsaint/images/delete.gif share/netsaint/images/disabled.gif share/netsaint/images/docbar.gif +share/netsaint/images/down.gif share/netsaint/images/enabled.gif +share/netsaint/images/extinfo.gif share/netsaint/images/greendot.gif share/netsaint/images/history.gif share/netsaint/images/historybar.gif @@ -163,6 +199,8 @@ share/netsaint/images/logrotate.gif share/netsaint/images/logs.gif share/netsaint/images/ndisabled.gif share/netsaint/images/networkhealthbar.gif +share/netsaint/images/networkoutagesbar.gif +share/netsaint/images/noack.gif share/netsaint/images/notes.gif share/netsaint/images/notificationsbar.gif share/netsaint/images/notify.gif @@ -179,10 +217,10 @@ share/netsaint/images/sblogo.gif share/netsaint/images/sbmonitor.gif share/netsaint/images/scale.gif share/netsaint/images/serviceevent.gif +share/netsaint/images/serviceproblemsbar.gif share/netsaint/images/servicesbar.gif share/netsaint/images/standby.gif share/netsaint/images/start.gif -share/netsaint/images/statudetailbar.gif share/netsaint/images/status.gif share/netsaint/images/status2.gif share/netsaint/images/status3.gif @@ -190,34 +228,55 @@ share/netsaint/images/status4.gif share/netsaint/images/statusdetailbar.gif share/netsaint/images/statusmapbar.gif share/netsaint/images/statusoverviewbar.gif +share/netsaint/images/statussummarybar.gif share/netsaint/images/statusworldbar.gif share/netsaint/images/stop.gif share/netsaint/images/thermcrit.gif share/netsaint/images/thermok.gif share/netsaint/images/thermwarn.gif share/netsaint/images/timeperiodsbar.gif +share/netsaint/images/trends.gif +share/netsaint/images/trendsbar.gif +share/netsaint/images/trendshost.png +share/netsaint/images/trendssvc.png share/netsaint/images/unknown.gif +share/netsaint/images/up.gif share/netsaint/images/warning.gif -share/netsaint/images/xinfo.gif -share/netsaint/images/zombie.gif share/netsaint/index.html share/netsaint/main.html +share/netsaint/media/critical.wav +share/netsaint/media/hostdown.wav +share/netsaint/media/warning.wav share/netsaint/robots.txt share/netsaint/sbin/cmd.cgi share/netsaint/sbin/config.cgi share/netsaint/sbin/extinfo.cgi share/netsaint/sbin/history.cgi share/netsaint/sbin/notifications.cgi -share/netsaint/sbin/nscgi.cfg +share/netsaint/sbin/outages.cgi share/netsaint/sbin/showlog.cgi share/netsaint/sbin/status.cgi share/netsaint/sbin/statusmap.cgi share/netsaint/sbin/statuswrl.cgi +share/netsaint/sbin/trends.cgi share/netsaint/side.html +share/netsaint/stylesheets/cmd.css +share/netsaint/stylesheets/config.css +share/netsaint/stylesheets/extinfo.css +share/netsaint/stylesheets/history.css +share/netsaint/stylesheets/notifications.css +share/netsaint/stylesheets/outages.css +share/netsaint/stylesheets/showlog.css +share/netsaint/stylesheets/status.css +share/netsaint/stylesheets/statusmap.css +share/netsaint/stylesheets/trends.css @dirrm etc/netsaint -@dirrm share/netsaint/sbin -@dirrm share/netsaint/images/logos -@dirrm share/netsaint/images +@dirrm share/netsaint/docs/developer/images +@dirrm share/netsaint/docs/developer @dirrm share/netsaint/docs/images @dirrm share/netsaint/docs -@dirrm share/netsaint +@dirrm share/netsaint/images/logos +@dirrm share/netsaint/images +@dirrm share/netsaint/media +@dirrm share/netsaint/sbin +@dirrm share/netsaint/stylesheets diff --git a/net-mgmt/netsaint/Makefile b/net-mgmt/netsaint/Makefile index 1f57b4c66bba..685bfb9dc6e5 100644 --- a/net-mgmt/netsaint/Makefile +++ b/net-mgmt/netsaint/Makefile @@ -6,19 +6,26 @@ # PORTNAME= netsaint -PORTVERSION= 0.0.5.2 +PORTVERSION= 0.0.6 CATEGORIES= net -MASTER_SITES= http://www.netsaint.org/download/ -DISTNAME= ${PORTNAME}-0.0.5-2 +MASTER_SITES= http://netsaint.sourceforge.net/download/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd \ + gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +# no run depends due to circular reference +#RUN_DEPENDS= ${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lgd" -INSTALL_TARGET= install-all + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt" +CONFIGURE_ARGS= --with-command-user=root \ + --with-command-grp=wheel \ + --with-netsaint-user=netsaint \ + --with-netsaint-grp=netsaint +INSTALL_TARGET= all install config install-config install-daemoninit pre-fetch: @${SH} ${SCRIPTDIR}/checkps diff --git a/net-mgmt/netsaint/distinfo b/net-mgmt/netsaint/distinfo index b77e807a2a4d..36148fb971d5 100644 --- a/net-mgmt/netsaint/distinfo +++ b/net-mgmt/netsaint/distinfo @@ -1 +1 @@ -MD5 (netsaint-0.0.5-2.tar.gz) = 19af41fb74ca4efbb1f6a4a915adc76f +MD5 (netsaint-0.0.6.tar.gz) = 0d85b66c7258fcb8dd3fbf775dd7728d diff --git a/net-mgmt/netsaint/files/patch-aa b/net-mgmt/netsaint/files/patch-aa index 3eb6719e49f6..ed255141379c 100644 --- a/net-mgmt/netsaint/files/patch-aa +++ b/net-mgmt/netsaint/files/patch-aa @@ -1,31 +1,20 @@ ---- Makefile.in Fri Apr 7 11:11:31 2000 -+++ Makefile.in.new Mon Jun 12 19:33:19 2000 -@@ -36,7 +36,7 @@ - @echo "Please supply a command line argument (i.e. 'make all'). Other targets are:" - @echo " netsaint cgis config" - @echo " clean distclean devclean" -- @echo " install install-html install-config install-init install-daemoninit install-commandmode" -+ @echo " install install-html install-config install-init install-daemoninit install-commandmode install-all" - @echo " uninstall" +--- Makefile.in.orig Sun Oct 29 14:43:54 2000 ++++ Makefile.in Fri Jan 12 14:54:45 2001 +@@ -27,7 +27,7 @@ + INSTALL_OPTS=@INSTALL_OPTS@ + COMMAND_OPTS=@COMMAND_OPTS@ + INIT_DIR=@init_dir@ +-INIT_OPTS=-o root -g root ++INIT_OPTS=-o root -g wheel + CGICFGDIR=$(CGIDIR) - # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999) -@@ -99,13 +99,17 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(CGIDIR) - - install-init: -- $(INSTALL) -m 774 -o root -g root init-script /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel init-script /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions + CGIEXTRAS=@CGIEXTRAS@ +@@ -109,7 +109,7 @@ + $(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint install-daemoninit: -- $(INSTALL) -m 774 -o root -g root daemon-init /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel daemon-init /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions +- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint ++ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh install-commandmode: - $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(LOGDIR)/rw - - uninstall: - rm -rf $(BINDIR)/netsaint $(CGIDIR)/*.cgi $(CFGDIR)/*.cfg $(HTMLDIR) -+ -+install-all: all install config install-config install-daemoninit + $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw diff --git a/net-mgmt/netsaint/files/patch-ab b/net-mgmt/netsaint/files/patch-ab index f7ce712a1276..bbaa1d00e8ba 100644 --- a/net-mgmt/netsaint/files/patch-ab +++ b/net-mgmt/netsaint/files/patch-ab @@ -1,8 +1,10 @@ ---- base/Makefile.in Fri Apr 7 11:11:32 2000 -+++ base/Makefile.in.new Sat Jun 10 21:45:15 2000 -@@ -52,5 +52,4 @@ +--- base/Makefile.in.orig Sun Jan 7 21:53:15 2001 ++++ base/Makefile.in Sun Jan 7 21:53:27 2001 +@@ -83,7 +83,6 @@ rm -f *~ install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR) - $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(BINDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR) + + diff --git a/net-mgmt/netsaint/files/patch-ac b/net-mgmt/netsaint/files/patch-ac deleted file mode 100644 index 1eb997a043fc..000000000000 --- a/net-mgmt/netsaint/files/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ ---- common/locations.sub Wed Apr 26 21:10:13 2000 -+++ common/locations.sub.new Mon Jun 12 21:29:23 2000 -@@ -19,16 +19,16 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - ************************************************************************/ - --#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint.tmp" --#define DEFAULT_STATUS_FILE "${prefix}/var/status.log" --#define DEFAULT_LOG_FILE "${prefix}/var/netsaint.log" --#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/archives/" --#define DEFAULT_COMMENT_FILE "${prefix}/var/comment.log" --#define DEFAULT_COMMAND_FILE "${prefix}/var/rw/netsaint.cmd" --#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share" -+#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint/netsaint.tmp" -+#define DEFAULT_STATUS_FILE "${prefix}/var/netsaint/status.log" -+#define DEFAULT_LOG_FILE "${prefix}/var/netsaint/netsaint.log" -+#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/netsaint/archives/" -+#define DEFAULT_COMMENT_FILE "${prefix}/var/netsaint/comment.log" -+#define DEFAULT_COMMAND_FILE "${prefix}/var/netsaint/rw/netsaint.cmd" -+#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share/netsaint" - #define DEFAULT_URL_HTML_PATH "/netsaint" --#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/sbin" -+#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/share/netsaint/sbin" - #define DEFAULT_URL_CGIBIN_PATH "/cgi-bin/netsaint" --#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/sbin/nscgi.cfg" -+#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/share/netsaint/sbin/nscgi.cfg" - --#define LOCKFILE "${prefix}/var/netsaint.lock" -+#define LOCKFILE "${prefix}/var/netsaint/netsaint.lock" diff --git a/net-mgmt/netsaint/files/patch-af b/net-mgmt/netsaint/files/patch-af deleted file mode 100644 index 58d7998ff8d8..000000000000 --- a/net-mgmt/netsaint/files/patch-af +++ /dev/null @@ -1,24 +0,0 @@ ---- daemon-init.in Fri Apr 7 11:11:34 2000 -+++ daemon-init.in.new Mon Jun 5 16:11:44 2000 -@@ -27,10 +27,11 @@ - - # Source function library - # Solaris doesn't have an rc.d directory, so do a test first --if [ -f /etc/rc.d/init.d/functions ]; then --. /etc/rc.d/init.d/functions --elif [ -f /etc/init.d/functions ]; then --. /etc/init.d/functions -+if [ -f /usr/local/etc/netsaint/functions ]; then -+. /usr/local/etc/netsaint/functions -+else -+ echo "/usr/local/etc/netsaint/functions missing" -+ exit 1 - fi - - prefix=@prefix@ -@@ -85,4 +86,4 @@ - exit 1 - esac - --# End of this script -+# End of this script diff --git a/net-mgmt/netsaint/files/patch-ah b/net-mgmt/netsaint/files/patch-ah deleted file mode 100644 index a8023ecea7f1..000000000000 --- a/net-mgmt/netsaint/files/patch-ah +++ /dev/null @@ -1,71 +0,0 @@ ---- hosts.cfg.in Fri Apr 7 11:11:34 2000 -+++ hosts.cfg.in.new Thu Jun 15 10:19:42 2000 -@@ -151,10 +151,10 @@ - - hostgroup[novell-servers]=All Novell Servers;novell-admins;es-gra,es-esp - hostgroup[nt-servers]=All NT Servers;nt-admins;rosie,dev,liatris --hostgroup[linux-boxes]=All Linux Servers;linux-admins;real -+hostgroup[freebsd-boxes]=All FreeBSD Servers;freebsd-admins;real - hostgroup[switches]=Switches;switch-admins;switch-4hlan,switch-esplan,switch-gralan,switch-cetslan,switch-hrdlan - hostgroup[routers]=Routers;router-admins;ageng-router --hostgroup[printers]=Printers;printer-admins,linux-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 -+hostgroup[printers]=Printers;printer-admins,freebsd-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 - - - ################################################################################ -@@ -183,19 +183,19 @@ - - # Service notification command - send email with problem summary - --command[notify-by-email]=/bin/echo -e $SUMMARY$ | /bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ -+command[notify-by-email]=/usr/bin/printf $SUMMARY$ | /usr/bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ - - # Service notification command - send email to alphanumeric pager gateway - # The notify-by-epager command assumes that each contact has a pager email gateway, and - # that the address has been entered into the appropriate contact field instead of an - # actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager) - --command[notify-by-epager]=/bin/echo -e 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ -+command[notify-by-epager]=/usr/bin/printf 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /usr/bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ - - # Host notification commands (one for email, one for alphanumeric pager with email gateway) - --command[host-notify-by-email]=/bin/echo -e '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ --command[host-notify-by-epager]=/bin/echo -e 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ -+command[host-notify-by-email]=/usr/bin/printf '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ -+command[host-notify-by-epager]=/usr/bin/printf 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ - - # These are some example service check commands. See the HTML documentation on the plugins for - # examples of how to configure command definitions. -@@ -316,7 +316,7 @@ - - contactgroup[novell-admins]=Novell Administrators;@netsaint_user@ - contactgroup[nt-admins]=NT Administrators;@netsaint_user@,jdoe --contactgroup[linux-admins]=Linux Administrators;@netsaint_user@ -+contactgroup[freebsd-admins]=FreeBSD Administrators;@netsaint_user@ - contactgroup[switch-admins]=Etherswitch Administrators;@netsaint_user@ - contactgroup[router-admins]=Router Technicians;@netsaint_user@ - contactgroup[printer-admins]=Etherswitch Administrators;@netsaint_user@,jdoe -@@ -428,14 +428,14 @@ - service[liatris]=PING;24x7;3;5;1;maes-admins;240;workhours;1;1;0;;check_ping - service[liatris]=MAES Publications;24x7;3;2;1;maes-admins;240;workhours;1;1;1;;check_http2!192.168.2.2!/publications - --# Linux Box --service[real]=PING;24x7;3;5;1;linux-admins;240;24x7;1;1;0;;check_ping --service[real]=HTTP;24x7;3;2;1;linux-admins;240;24x7;1;1;1;;check_http --service[real]=Current Users;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_users!75!150 --service[real]=Zombie Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!5!10!Z --service[real]=Total Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!150!200 --service[real]=Drive 1 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 --service[real]=Drive 2 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 -+# FreeBSD Box -+service[real]=PING;24x7;3;5;1;freebsd-admins;240;24x7;1;1;0;;check_ping -+service[real]=HTTP;24x7;3;2;1;freebsd-admins;240;24x7;1;1;1;;check_http -+service[real]=Current Users;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_users!75!150 -+service[real]=Zombie Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!5!10!Z -+service[real]=Total Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!150!200 -+service[real]=Drive 1 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 -+service[real]=Drive 2 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 - - # Switches - service[switch-esplan]=Traffic Rate;24x7;1;5;6;switch-admins;60;24x7;0;0;0;;traffic_average!/home/httpd/html/mrtg/esp-lan.log!600000!800000!600000!800000 diff --git a/net-mgmt/netsaint/pkg-descr b/net-mgmt/netsaint/pkg-descr index e16ce94fefe6..ba87fff062b8 100644 --- a/net-mgmt/netsaint/pkg-descr +++ b/net-mgmt/netsaint/pkg-descr @@ -1,13 +1,12 @@ -NetSaint is a program that will monitor hosts and services -on your network. It has the ability to email or page you -when a problem arises and when it gets resolved. NetSaint -is written in C and is designed to run under Linux, although -it should work under most other *NIX variants. It can run -either as a normal process or as a daemon, intermittently -running checks on various services that you specify. The -actual service checks are performed by external "plugins" -which return service information to NetSaint. Several CGI -programs are included with NetSaint in order to allow you -to view the current service status, history, etc. via a web browser. +NetSaint is a program that will monitor hosts and services on your +network. It has the ability to email or page you when a problem arises +and when it gets resolved. NetSaint is written in C and is designed to +run under Linux, although it should work under most other *NIX variants. +It can run either as a normal process or as a daemon, intermittently +running checks on various services that you specify. The actual service +checks are performed by external "plugins" which return service +information to NetSaint. Several CGI programs are included with NetSaint +in order to allow you to view the current service status, history, etc. +via a web browser. WWW: http://www.netsaint.org/ diff --git a/net-mgmt/netsaint/pkg-plist b/net-mgmt/netsaint/pkg-plist index e6757452f595..e932f9661776 100644 --- a/net-mgmt/netsaint/pkg-plist +++ b/net-mgmt/netsaint/pkg-plist @@ -1,72 +1,106 @@ bin/netsaint -etc/netsaint/netsaint.cfg +etc/netsaint/commands.cfg etc/netsaint/hosts.cfg -etc/netsaint/functions +etc/netsaint/netsaint.cfg +etc/netsaint/nscgi.cfg +etc/netsaint/resource.cfg etc/rc.d/netsaint.sh share/netsaint/docs/about.html share/netsaint/docs/addons.html +share/netsaint/docs/bigtime.html share/netsaint/docs/cgiauth.html share/netsaint/docs/cgis.html +share/netsaint/docs/checkscheduling.html +share/netsaint/docs/clusters.html +share/netsaint/docs/commandfile.html share/netsaint/docs/config.html share/netsaint/docs/configcgi.html share/netsaint/docs/confighost.html share/netsaint/docs/configmain.html +share/netsaint/docs/developer/commentfile.html +share/netsaint/docs/developer/images/xcdapi.gif +share/netsaint/docs/developer/images/xedapi.gif +share/netsaint/docs/developer/images/xodapi.gif +share/netsaint/docs/developer/images/xrdapi.gif +share/netsaint/docs/developer/images/xsdapi.gif +share/netsaint/docs/developer/index.html +share/netsaint/docs/developer/pluginhowto.html +share/netsaint/docs/developer/stateretentionfile.html +share/netsaint/docs/developer/statusfile.html +share/netsaint/docs/developer/xcd.html +share/netsaint/docs/developer/xdata.html +share/netsaint/docs/developer/xed.html +share/netsaint/docs/developer/xod.html +share/netsaint/docs/developer/xrd.html +share/netsaint/docs/developer/xsd.html +share/netsaint/docs/distributed.html +share/netsaint/docs/escalations.html share/netsaint/docs/eventhandlers.html share/netsaint/docs/extcommands.html share/netsaint/docs/faqs.html share/netsaint/docs/funstuff.html +share/netsaint/docs/images/activepassive.gif +share/netsaint/docs/images/checktiming.gif share/netsaint/docs/images/cmd_cgi.gif share/netsaint/docs/images/config_cgi.gif +share/netsaint/docs/images/distributed.gif share/netsaint/docs/images/extinfo_cgi_a.gif share/netsaint/docs/images/extinfo_cgi_b.gif share/netsaint/docs/images/extinfo_cgi_c.gif share/netsaint/docs/images/extinfo_cgi_d.gif share/netsaint/docs/images/history_cgi.gif -share/netsaint/docs/images/logic-host-event-handler.gif -share/netsaint/docs/images/logic-host-notification.gif -share/netsaint/docs/images/logic-host-state-handler.gif -share/netsaint/docs/images/logic-route-check.gif -share/netsaint/docs/images/logic-service-event-handler.gif -share/netsaint/docs/images/logic-service-notification.gif -share/netsaint/docs/images/logic-service-problem.gif -share/netsaint/docs/images/logic-service-recovery.gif -share/netsaint/docs/images/logic-top.gif +share/netsaint/docs/images/indirecthostcheck.gif +share/netsaint/docs/images/indirectsvccheck.gif +share/netsaint/docs/images/indirectsvccheck2.gif +share/netsaint/docs/images/interleaved1.gif +share/netsaint/docs/images/interleaved2.gif share/netsaint/docs/images/network-heirarchy.gif +share/netsaint/docs/images/network-outage1.gif +share/netsaint/docs/images/network-outage2.gif +share/netsaint/docs/images/noninterleaved1.gif +share/netsaint/docs/images/noninterleaved2.gif share/netsaint/docs/images/notification-process.gif share/netsaint/docs/images/notifications_cgi.gif +share/netsaint/docs/images/outages_cgi.gif share/netsaint/docs/images/physical-network.gif +share/netsaint/docs/images/plugintheory.gif share/netsaint/docs/images/redundancy-1.gif share/netsaint/docs/images/redundancy-2.gif -share/netsaint/docs/images/relationship-complex.gif -share/netsaint/docs/images/relationship-simple.gif share/netsaint/docs/images/showlog_cgi.gif share/netsaint/docs/images/status_cgi_a.gif share/netsaint/docs/images/status_cgi_b.gif share/netsaint/docs/images/statusmap_cgi.gif share/netsaint/docs/images/statuswrl_cgi.gif +share/netsaint/docs/images/trends_cgi.gif share/netsaint/docs/index.html +share/netsaint/docs/indirectchecks.html share/netsaint/docs/installing.html share/netsaint/docs/installweb.html share/netsaint/docs/macros.html share/netsaint/docs/makehtml.html +share/netsaint/docs/networkoutages.html share/netsaint/docs/networkreachability.html share/netsaint/docs/notifications.html +share/netsaint/docs/oldplugins.html share/netsaint/docs/parallelization.html +share/netsaint/docs/passivechecks.html share/netsaint/docs/pluginhowto.html share/netsaint/docs/plugins.html +share/netsaint/docs/plugintheory.html share/netsaint/docs/programmodes.html share/netsaint/docs/redundancy.html share/netsaint/docs/robots.txt +share/netsaint/docs/security.html share/netsaint/docs/starting.html share/netsaint/docs/statetypes.html share/netsaint/docs/statuslevels.html share/netsaint/docs/stoprestart.html -share/netsaint/docs/theory-network.html -share/netsaint/docs/theory-time.html share/netsaint/docs/theory.html share/netsaint/docs/timeperiods.html share/netsaint/docs/verifyconfig.html +share/netsaint/docs/volatileservices.html share/netsaint/docs/whatsnew.html +share/netsaint/images/ack.gif share/netsaint/images/active.gif share/netsaint/images/command.gif share/netsaint/images/commandsbar.gif @@ -81,7 +115,9 @@ share/netsaint/images/delay.gif share/netsaint/images/delete.gif share/netsaint/images/disabled.gif share/netsaint/images/docbar.gif +share/netsaint/images/down.gif share/netsaint/images/enabled.gif +share/netsaint/images/extinfo.gif share/netsaint/images/greendot.gif share/netsaint/images/history.gif share/netsaint/images/historybar.gif @@ -163,6 +199,8 @@ share/netsaint/images/logrotate.gif share/netsaint/images/logs.gif share/netsaint/images/ndisabled.gif share/netsaint/images/networkhealthbar.gif +share/netsaint/images/networkoutagesbar.gif +share/netsaint/images/noack.gif share/netsaint/images/notes.gif share/netsaint/images/notificationsbar.gif share/netsaint/images/notify.gif @@ -179,10 +217,10 @@ share/netsaint/images/sblogo.gif share/netsaint/images/sbmonitor.gif share/netsaint/images/scale.gif share/netsaint/images/serviceevent.gif +share/netsaint/images/serviceproblemsbar.gif share/netsaint/images/servicesbar.gif share/netsaint/images/standby.gif share/netsaint/images/start.gif -share/netsaint/images/statudetailbar.gif share/netsaint/images/status.gif share/netsaint/images/status2.gif share/netsaint/images/status3.gif @@ -190,34 +228,55 @@ share/netsaint/images/status4.gif share/netsaint/images/statusdetailbar.gif share/netsaint/images/statusmapbar.gif share/netsaint/images/statusoverviewbar.gif +share/netsaint/images/statussummarybar.gif share/netsaint/images/statusworldbar.gif share/netsaint/images/stop.gif share/netsaint/images/thermcrit.gif share/netsaint/images/thermok.gif share/netsaint/images/thermwarn.gif share/netsaint/images/timeperiodsbar.gif +share/netsaint/images/trends.gif +share/netsaint/images/trendsbar.gif +share/netsaint/images/trendshost.png +share/netsaint/images/trendssvc.png share/netsaint/images/unknown.gif +share/netsaint/images/up.gif share/netsaint/images/warning.gif -share/netsaint/images/xinfo.gif -share/netsaint/images/zombie.gif share/netsaint/index.html share/netsaint/main.html +share/netsaint/media/critical.wav +share/netsaint/media/hostdown.wav +share/netsaint/media/warning.wav share/netsaint/robots.txt share/netsaint/sbin/cmd.cgi share/netsaint/sbin/config.cgi share/netsaint/sbin/extinfo.cgi share/netsaint/sbin/history.cgi share/netsaint/sbin/notifications.cgi -share/netsaint/sbin/nscgi.cfg +share/netsaint/sbin/outages.cgi share/netsaint/sbin/showlog.cgi share/netsaint/sbin/status.cgi share/netsaint/sbin/statusmap.cgi share/netsaint/sbin/statuswrl.cgi +share/netsaint/sbin/trends.cgi share/netsaint/side.html +share/netsaint/stylesheets/cmd.css +share/netsaint/stylesheets/config.css +share/netsaint/stylesheets/extinfo.css +share/netsaint/stylesheets/history.css +share/netsaint/stylesheets/notifications.css +share/netsaint/stylesheets/outages.css +share/netsaint/stylesheets/showlog.css +share/netsaint/stylesheets/status.css +share/netsaint/stylesheets/statusmap.css +share/netsaint/stylesheets/trends.css @dirrm etc/netsaint -@dirrm share/netsaint/sbin -@dirrm share/netsaint/images/logos -@dirrm share/netsaint/images +@dirrm share/netsaint/docs/developer/images +@dirrm share/netsaint/docs/developer @dirrm share/netsaint/docs/images @dirrm share/netsaint/docs -@dirrm share/netsaint +@dirrm share/netsaint/images/logos +@dirrm share/netsaint/images +@dirrm share/netsaint/media +@dirrm share/netsaint/sbin +@dirrm share/netsaint/stylesheets diff --git a/net/nagios/Makefile b/net/nagios/Makefile index 1f57b4c66bba..685bfb9dc6e5 100644 --- a/net/nagios/Makefile +++ b/net/nagios/Makefile @@ -6,19 +6,26 @@ # PORTNAME= netsaint -PORTVERSION= 0.0.5.2 +PORTVERSION= 0.0.6 CATEGORIES= net -MASTER_SITES= http://www.netsaint.org/download/ -DISTNAME= ${PORTNAME}-0.0.5-2 +MASTER_SITES= http://netsaint.sourceforge.net/download/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd \ + gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +# no run depends due to circular reference +#RUN_DEPENDS= ${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lgd" -INSTALL_TARGET= install-all + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt" +CONFIGURE_ARGS= --with-command-user=root \ + --with-command-grp=wheel \ + --with-netsaint-user=netsaint \ + --with-netsaint-grp=netsaint +INSTALL_TARGET= all install config install-config install-daemoninit pre-fetch: @${SH} ${SCRIPTDIR}/checkps diff --git a/net/nagios/distinfo b/net/nagios/distinfo index b77e807a2a4d..36148fb971d5 100644 --- a/net/nagios/distinfo +++ b/net/nagios/distinfo @@ -1 +1 @@ -MD5 (netsaint-0.0.5-2.tar.gz) = 19af41fb74ca4efbb1f6a4a915adc76f +MD5 (netsaint-0.0.6.tar.gz) = 0d85b66c7258fcb8dd3fbf775dd7728d diff --git a/net/nagios/files/patch-aa b/net/nagios/files/patch-aa index 3eb6719e49f6..ed255141379c 100644 --- a/net/nagios/files/patch-aa +++ b/net/nagios/files/patch-aa @@ -1,31 +1,20 @@ ---- Makefile.in Fri Apr 7 11:11:31 2000 -+++ Makefile.in.new Mon Jun 12 19:33:19 2000 -@@ -36,7 +36,7 @@ - @echo "Please supply a command line argument (i.e. 'make all'). Other targets are:" - @echo " netsaint cgis config" - @echo " clean distclean devclean" -- @echo " install install-html install-config install-init install-daemoninit install-commandmode" -+ @echo " install install-html install-config install-init install-daemoninit install-commandmode install-all" - @echo " uninstall" +--- Makefile.in.orig Sun Oct 29 14:43:54 2000 ++++ Makefile.in Fri Jan 12 14:54:45 2001 +@@ -27,7 +27,7 @@ + INSTALL_OPTS=@INSTALL_OPTS@ + COMMAND_OPTS=@COMMAND_OPTS@ + INIT_DIR=@init_dir@ +-INIT_OPTS=-o root -g root ++INIT_OPTS=-o root -g wheel + CGICFGDIR=$(CGIDIR) - # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999) -@@ -99,13 +99,17 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(CGIDIR) - - install-init: -- $(INSTALL) -m 774 -o root -g root init-script /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel init-script /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions + CGIEXTRAS=@CGIEXTRAS@ +@@ -109,7 +109,7 @@ + $(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint install-daemoninit: -- $(INSTALL) -m 774 -o root -g root daemon-init /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel daemon-init /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions +- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint ++ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh install-commandmode: - $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(LOGDIR)/rw - - uninstall: - rm -rf $(BINDIR)/netsaint $(CGIDIR)/*.cgi $(CFGDIR)/*.cfg $(HTMLDIR) -+ -+install-all: all install config install-config install-daemoninit + $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw diff --git a/net/nagios/files/patch-ab b/net/nagios/files/patch-ab index f7ce712a1276..bbaa1d00e8ba 100644 --- a/net/nagios/files/patch-ab +++ b/net/nagios/files/patch-ab @@ -1,8 +1,10 @@ ---- base/Makefile.in Fri Apr 7 11:11:32 2000 -+++ base/Makefile.in.new Sat Jun 10 21:45:15 2000 -@@ -52,5 +52,4 @@ +--- base/Makefile.in.orig Sun Jan 7 21:53:15 2001 ++++ base/Makefile.in Sun Jan 7 21:53:27 2001 +@@ -83,7 +83,6 @@ rm -f *~ install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR) - $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(BINDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR) + + diff --git a/net/nagios/files/patch-ac b/net/nagios/files/patch-ac deleted file mode 100644 index 1eb997a043fc..000000000000 --- a/net/nagios/files/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ ---- common/locations.sub Wed Apr 26 21:10:13 2000 -+++ common/locations.sub.new Mon Jun 12 21:29:23 2000 -@@ -19,16 +19,16 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - ************************************************************************/ - --#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint.tmp" --#define DEFAULT_STATUS_FILE "${prefix}/var/status.log" --#define DEFAULT_LOG_FILE "${prefix}/var/netsaint.log" --#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/archives/" --#define DEFAULT_COMMENT_FILE "${prefix}/var/comment.log" --#define DEFAULT_COMMAND_FILE "${prefix}/var/rw/netsaint.cmd" --#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share" -+#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint/netsaint.tmp" -+#define DEFAULT_STATUS_FILE "${prefix}/var/netsaint/status.log" -+#define DEFAULT_LOG_FILE "${prefix}/var/netsaint/netsaint.log" -+#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/netsaint/archives/" -+#define DEFAULT_COMMENT_FILE "${prefix}/var/netsaint/comment.log" -+#define DEFAULT_COMMAND_FILE "${prefix}/var/netsaint/rw/netsaint.cmd" -+#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share/netsaint" - #define DEFAULT_URL_HTML_PATH "/netsaint" --#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/sbin" -+#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/share/netsaint/sbin" - #define DEFAULT_URL_CGIBIN_PATH "/cgi-bin/netsaint" --#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/sbin/nscgi.cfg" -+#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/share/netsaint/sbin/nscgi.cfg" - --#define LOCKFILE "${prefix}/var/netsaint.lock" -+#define LOCKFILE "${prefix}/var/netsaint/netsaint.lock" diff --git a/net/nagios/files/patch-af b/net/nagios/files/patch-af deleted file mode 100644 index 58d7998ff8d8..000000000000 --- a/net/nagios/files/patch-af +++ /dev/null @@ -1,24 +0,0 @@ ---- daemon-init.in Fri Apr 7 11:11:34 2000 -+++ daemon-init.in.new Mon Jun 5 16:11:44 2000 -@@ -27,10 +27,11 @@ - - # Source function library - # Solaris doesn't have an rc.d directory, so do a test first --if [ -f /etc/rc.d/init.d/functions ]; then --. /etc/rc.d/init.d/functions --elif [ -f /etc/init.d/functions ]; then --. /etc/init.d/functions -+if [ -f /usr/local/etc/netsaint/functions ]; then -+. /usr/local/etc/netsaint/functions -+else -+ echo "/usr/local/etc/netsaint/functions missing" -+ exit 1 - fi - - prefix=@prefix@ -@@ -85,4 +86,4 @@ - exit 1 - esac - --# End of this script -+# End of this script diff --git a/net/nagios/files/patch-ah b/net/nagios/files/patch-ah deleted file mode 100644 index a8023ecea7f1..000000000000 --- a/net/nagios/files/patch-ah +++ /dev/null @@ -1,71 +0,0 @@ ---- hosts.cfg.in Fri Apr 7 11:11:34 2000 -+++ hosts.cfg.in.new Thu Jun 15 10:19:42 2000 -@@ -151,10 +151,10 @@ - - hostgroup[novell-servers]=All Novell Servers;novell-admins;es-gra,es-esp - hostgroup[nt-servers]=All NT Servers;nt-admins;rosie,dev,liatris --hostgroup[linux-boxes]=All Linux Servers;linux-admins;real -+hostgroup[freebsd-boxes]=All FreeBSD Servers;freebsd-admins;real - hostgroup[switches]=Switches;switch-admins;switch-4hlan,switch-esplan,switch-gralan,switch-cetslan,switch-hrdlan - hostgroup[routers]=Routers;router-admins;ageng-router --hostgroup[printers]=Printers;printer-admins,linux-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 -+hostgroup[printers]=Printers;printer-admins,freebsd-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 - - - ################################################################################ -@@ -183,19 +183,19 @@ - - # Service notification command - send email with problem summary - --command[notify-by-email]=/bin/echo -e $SUMMARY$ | /bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ -+command[notify-by-email]=/usr/bin/printf $SUMMARY$ | /usr/bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ - - # Service notification command - send email to alphanumeric pager gateway - # The notify-by-epager command assumes that each contact has a pager email gateway, and - # that the address has been entered into the appropriate contact field instead of an - # actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager) - --command[notify-by-epager]=/bin/echo -e 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ -+command[notify-by-epager]=/usr/bin/printf 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /usr/bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ - - # Host notification commands (one for email, one for alphanumeric pager with email gateway) - --command[host-notify-by-email]=/bin/echo -e '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ --command[host-notify-by-epager]=/bin/echo -e 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ -+command[host-notify-by-email]=/usr/bin/printf '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ -+command[host-notify-by-epager]=/usr/bin/printf 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ - - # These are some example service check commands. See the HTML documentation on the plugins for - # examples of how to configure command definitions. -@@ -316,7 +316,7 @@ - - contactgroup[novell-admins]=Novell Administrators;@netsaint_user@ - contactgroup[nt-admins]=NT Administrators;@netsaint_user@,jdoe --contactgroup[linux-admins]=Linux Administrators;@netsaint_user@ -+contactgroup[freebsd-admins]=FreeBSD Administrators;@netsaint_user@ - contactgroup[switch-admins]=Etherswitch Administrators;@netsaint_user@ - contactgroup[router-admins]=Router Technicians;@netsaint_user@ - contactgroup[printer-admins]=Etherswitch Administrators;@netsaint_user@,jdoe -@@ -428,14 +428,14 @@ - service[liatris]=PING;24x7;3;5;1;maes-admins;240;workhours;1;1;0;;check_ping - service[liatris]=MAES Publications;24x7;3;2;1;maes-admins;240;workhours;1;1;1;;check_http2!192.168.2.2!/publications - --# Linux Box --service[real]=PING;24x7;3;5;1;linux-admins;240;24x7;1;1;0;;check_ping --service[real]=HTTP;24x7;3;2;1;linux-admins;240;24x7;1;1;1;;check_http --service[real]=Current Users;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_users!75!150 --service[real]=Zombie Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!5!10!Z --service[real]=Total Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!150!200 --service[real]=Drive 1 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 --service[real]=Drive 2 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 -+# FreeBSD Box -+service[real]=PING;24x7;3;5;1;freebsd-admins;240;24x7;1;1;0;;check_ping -+service[real]=HTTP;24x7;3;2;1;freebsd-admins;240;24x7;1;1;1;;check_http -+service[real]=Current Users;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_users!75!150 -+service[real]=Zombie Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!5!10!Z -+service[real]=Total Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!150!200 -+service[real]=Drive 1 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 -+service[real]=Drive 2 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 - - # Switches - service[switch-esplan]=Traffic Rate;24x7;1;5;6;switch-admins;60;24x7;0;0;0;;traffic_average!/home/httpd/html/mrtg/esp-lan.log!600000!800000!600000!800000 diff --git a/net/nagios/pkg-descr b/net/nagios/pkg-descr index e16ce94fefe6..ba87fff062b8 100644 --- a/net/nagios/pkg-descr +++ b/net/nagios/pkg-descr @@ -1,13 +1,12 @@ -NetSaint is a program that will monitor hosts and services -on your network. It has the ability to email or page you -when a problem arises and when it gets resolved. NetSaint -is written in C and is designed to run under Linux, although -it should work under most other *NIX variants. It can run -either as a normal process or as a daemon, intermittently -running checks on various services that you specify. The -actual service checks are performed by external "plugins" -which return service information to NetSaint. Several CGI -programs are included with NetSaint in order to allow you -to view the current service status, history, etc. via a web browser. +NetSaint is a program that will monitor hosts and services on your +network. It has the ability to email or page you when a problem arises +and when it gets resolved. NetSaint is written in C and is designed to +run under Linux, although it should work under most other *NIX variants. +It can run either as a normal process or as a daemon, intermittently +running checks on various services that you specify. The actual service +checks are performed by external "plugins" which return service +information to NetSaint. Several CGI programs are included with NetSaint +in order to allow you to view the current service status, history, etc. +via a web browser. WWW: http://www.netsaint.org/ diff --git a/net/nagios/pkg-plist b/net/nagios/pkg-plist index e6757452f595..e932f9661776 100644 --- a/net/nagios/pkg-plist +++ b/net/nagios/pkg-plist @@ -1,72 +1,106 @@ bin/netsaint -etc/netsaint/netsaint.cfg +etc/netsaint/commands.cfg etc/netsaint/hosts.cfg -etc/netsaint/functions +etc/netsaint/netsaint.cfg +etc/netsaint/nscgi.cfg +etc/netsaint/resource.cfg etc/rc.d/netsaint.sh share/netsaint/docs/about.html share/netsaint/docs/addons.html +share/netsaint/docs/bigtime.html share/netsaint/docs/cgiauth.html share/netsaint/docs/cgis.html +share/netsaint/docs/checkscheduling.html +share/netsaint/docs/clusters.html +share/netsaint/docs/commandfile.html share/netsaint/docs/config.html share/netsaint/docs/configcgi.html share/netsaint/docs/confighost.html share/netsaint/docs/configmain.html +share/netsaint/docs/developer/commentfile.html +share/netsaint/docs/developer/images/xcdapi.gif +share/netsaint/docs/developer/images/xedapi.gif +share/netsaint/docs/developer/images/xodapi.gif +share/netsaint/docs/developer/images/xrdapi.gif +share/netsaint/docs/developer/images/xsdapi.gif +share/netsaint/docs/developer/index.html +share/netsaint/docs/developer/pluginhowto.html +share/netsaint/docs/developer/stateretentionfile.html +share/netsaint/docs/developer/statusfile.html +share/netsaint/docs/developer/xcd.html +share/netsaint/docs/developer/xdata.html +share/netsaint/docs/developer/xed.html +share/netsaint/docs/developer/xod.html +share/netsaint/docs/developer/xrd.html +share/netsaint/docs/developer/xsd.html +share/netsaint/docs/distributed.html +share/netsaint/docs/escalations.html share/netsaint/docs/eventhandlers.html share/netsaint/docs/extcommands.html share/netsaint/docs/faqs.html share/netsaint/docs/funstuff.html +share/netsaint/docs/images/activepassive.gif +share/netsaint/docs/images/checktiming.gif share/netsaint/docs/images/cmd_cgi.gif share/netsaint/docs/images/config_cgi.gif +share/netsaint/docs/images/distributed.gif share/netsaint/docs/images/extinfo_cgi_a.gif share/netsaint/docs/images/extinfo_cgi_b.gif share/netsaint/docs/images/extinfo_cgi_c.gif share/netsaint/docs/images/extinfo_cgi_d.gif share/netsaint/docs/images/history_cgi.gif -share/netsaint/docs/images/logic-host-event-handler.gif -share/netsaint/docs/images/logic-host-notification.gif -share/netsaint/docs/images/logic-host-state-handler.gif -share/netsaint/docs/images/logic-route-check.gif -share/netsaint/docs/images/logic-service-event-handler.gif -share/netsaint/docs/images/logic-service-notification.gif -share/netsaint/docs/images/logic-service-problem.gif -share/netsaint/docs/images/logic-service-recovery.gif -share/netsaint/docs/images/logic-top.gif +share/netsaint/docs/images/indirecthostcheck.gif +share/netsaint/docs/images/indirectsvccheck.gif +share/netsaint/docs/images/indirectsvccheck2.gif +share/netsaint/docs/images/interleaved1.gif +share/netsaint/docs/images/interleaved2.gif share/netsaint/docs/images/network-heirarchy.gif +share/netsaint/docs/images/network-outage1.gif +share/netsaint/docs/images/network-outage2.gif +share/netsaint/docs/images/noninterleaved1.gif +share/netsaint/docs/images/noninterleaved2.gif share/netsaint/docs/images/notification-process.gif share/netsaint/docs/images/notifications_cgi.gif +share/netsaint/docs/images/outages_cgi.gif share/netsaint/docs/images/physical-network.gif +share/netsaint/docs/images/plugintheory.gif share/netsaint/docs/images/redundancy-1.gif share/netsaint/docs/images/redundancy-2.gif -share/netsaint/docs/images/relationship-complex.gif -share/netsaint/docs/images/relationship-simple.gif share/netsaint/docs/images/showlog_cgi.gif share/netsaint/docs/images/status_cgi_a.gif share/netsaint/docs/images/status_cgi_b.gif share/netsaint/docs/images/statusmap_cgi.gif share/netsaint/docs/images/statuswrl_cgi.gif +share/netsaint/docs/images/trends_cgi.gif share/netsaint/docs/index.html +share/netsaint/docs/indirectchecks.html share/netsaint/docs/installing.html share/netsaint/docs/installweb.html share/netsaint/docs/macros.html share/netsaint/docs/makehtml.html +share/netsaint/docs/networkoutages.html share/netsaint/docs/networkreachability.html share/netsaint/docs/notifications.html +share/netsaint/docs/oldplugins.html share/netsaint/docs/parallelization.html +share/netsaint/docs/passivechecks.html share/netsaint/docs/pluginhowto.html share/netsaint/docs/plugins.html +share/netsaint/docs/plugintheory.html share/netsaint/docs/programmodes.html share/netsaint/docs/redundancy.html share/netsaint/docs/robots.txt +share/netsaint/docs/security.html share/netsaint/docs/starting.html share/netsaint/docs/statetypes.html share/netsaint/docs/statuslevels.html share/netsaint/docs/stoprestart.html -share/netsaint/docs/theory-network.html -share/netsaint/docs/theory-time.html share/netsaint/docs/theory.html share/netsaint/docs/timeperiods.html share/netsaint/docs/verifyconfig.html +share/netsaint/docs/volatileservices.html share/netsaint/docs/whatsnew.html +share/netsaint/images/ack.gif share/netsaint/images/active.gif share/netsaint/images/command.gif share/netsaint/images/commandsbar.gif @@ -81,7 +115,9 @@ share/netsaint/images/delay.gif share/netsaint/images/delete.gif share/netsaint/images/disabled.gif share/netsaint/images/docbar.gif +share/netsaint/images/down.gif share/netsaint/images/enabled.gif +share/netsaint/images/extinfo.gif share/netsaint/images/greendot.gif share/netsaint/images/history.gif share/netsaint/images/historybar.gif @@ -163,6 +199,8 @@ share/netsaint/images/logrotate.gif share/netsaint/images/logs.gif share/netsaint/images/ndisabled.gif share/netsaint/images/networkhealthbar.gif +share/netsaint/images/networkoutagesbar.gif +share/netsaint/images/noack.gif share/netsaint/images/notes.gif share/netsaint/images/notificationsbar.gif share/netsaint/images/notify.gif @@ -179,10 +217,10 @@ share/netsaint/images/sblogo.gif share/netsaint/images/sbmonitor.gif share/netsaint/images/scale.gif share/netsaint/images/serviceevent.gif +share/netsaint/images/serviceproblemsbar.gif share/netsaint/images/servicesbar.gif share/netsaint/images/standby.gif share/netsaint/images/start.gif -share/netsaint/images/statudetailbar.gif share/netsaint/images/status.gif share/netsaint/images/status2.gif share/netsaint/images/status3.gif @@ -190,34 +228,55 @@ share/netsaint/images/status4.gif share/netsaint/images/statusdetailbar.gif share/netsaint/images/statusmapbar.gif share/netsaint/images/statusoverviewbar.gif +share/netsaint/images/statussummarybar.gif share/netsaint/images/statusworldbar.gif share/netsaint/images/stop.gif share/netsaint/images/thermcrit.gif share/netsaint/images/thermok.gif share/netsaint/images/thermwarn.gif share/netsaint/images/timeperiodsbar.gif +share/netsaint/images/trends.gif +share/netsaint/images/trendsbar.gif +share/netsaint/images/trendshost.png +share/netsaint/images/trendssvc.png share/netsaint/images/unknown.gif +share/netsaint/images/up.gif share/netsaint/images/warning.gif -share/netsaint/images/xinfo.gif -share/netsaint/images/zombie.gif share/netsaint/index.html share/netsaint/main.html +share/netsaint/media/critical.wav +share/netsaint/media/hostdown.wav +share/netsaint/media/warning.wav share/netsaint/robots.txt share/netsaint/sbin/cmd.cgi share/netsaint/sbin/config.cgi share/netsaint/sbin/extinfo.cgi share/netsaint/sbin/history.cgi share/netsaint/sbin/notifications.cgi -share/netsaint/sbin/nscgi.cfg +share/netsaint/sbin/outages.cgi share/netsaint/sbin/showlog.cgi share/netsaint/sbin/status.cgi share/netsaint/sbin/statusmap.cgi share/netsaint/sbin/statuswrl.cgi +share/netsaint/sbin/trends.cgi share/netsaint/side.html +share/netsaint/stylesheets/cmd.css +share/netsaint/stylesheets/config.css +share/netsaint/stylesheets/extinfo.css +share/netsaint/stylesheets/history.css +share/netsaint/stylesheets/notifications.css +share/netsaint/stylesheets/outages.css +share/netsaint/stylesheets/showlog.css +share/netsaint/stylesheets/status.css +share/netsaint/stylesheets/statusmap.css +share/netsaint/stylesheets/trends.css @dirrm etc/netsaint -@dirrm share/netsaint/sbin -@dirrm share/netsaint/images/logos -@dirrm share/netsaint/images +@dirrm share/netsaint/docs/developer/images +@dirrm share/netsaint/docs/developer @dirrm share/netsaint/docs/images @dirrm share/netsaint/docs -@dirrm share/netsaint +@dirrm share/netsaint/images/logos +@dirrm share/netsaint/images +@dirrm share/netsaint/media +@dirrm share/netsaint/sbin +@dirrm share/netsaint/stylesheets diff --git a/net/netsaint/Makefile b/net/netsaint/Makefile index 1f57b4c66bba..685bfb9dc6e5 100644 --- a/net/netsaint/Makefile +++ b/net/netsaint/Makefile @@ -6,19 +6,26 @@ # PORTNAME= netsaint -PORTVERSION= 0.0.5.2 +PORTVERSION= 0.0.6 CATEGORIES= net -MASTER_SITES= http://www.netsaint.org/download/ -DISTNAME= ${PORTNAME}-0.0.5-2 +MASTER_SITES= http://netsaint.sourceforge.net/download/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd +LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd \ + gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +# no run depends due to circular reference +#RUN_DEPENDS= ${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lgd" -INSTALL_TARGET= install-all + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt" +CONFIGURE_ARGS= --with-command-user=root \ + --with-command-grp=wheel \ + --with-netsaint-user=netsaint \ + --with-netsaint-grp=netsaint +INSTALL_TARGET= all install config install-config install-daemoninit pre-fetch: @${SH} ${SCRIPTDIR}/checkps diff --git a/net/netsaint/distinfo b/net/netsaint/distinfo index b77e807a2a4d..36148fb971d5 100644 --- a/net/netsaint/distinfo +++ b/net/netsaint/distinfo @@ -1 +1 @@ -MD5 (netsaint-0.0.5-2.tar.gz) = 19af41fb74ca4efbb1f6a4a915adc76f +MD5 (netsaint-0.0.6.tar.gz) = 0d85b66c7258fcb8dd3fbf775dd7728d diff --git a/net/netsaint/files/patch-aa b/net/netsaint/files/patch-aa index 3eb6719e49f6..ed255141379c 100644 --- a/net/netsaint/files/patch-aa +++ b/net/netsaint/files/patch-aa @@ -1,31 +1,20 @@ ---- Makefile.in Fri Apr 7 11:11:31 2000 -+++ Makefile.in.new Mon Jun 12 19:33:19 2000 -@@ -36,7 +36,7 @@ - @echo "Please supply a command line argument (i.e. 'make all'). Other targets are:" - @echo " netsaint cgis config" - @echo " clean distclean devclean" -- @echo " install install-html install-config install-init install-daemoninit install-commandmode" -+ @echo " install install-html install-config install-init install-daemoninit install-commandmode install-all" - @echo " uninstall" +--- Makefile.in.orig Sun Oct 29 14:43:54 2000 ++++ Makefile.in Fri Jan 12 14:54:45 2001 +@@ -27,7 +27,7 @@ + INSTALL_OPTS=@INSTALL_OPTS@ + COMMAND_OPTS=@COMMAND_OPTS@ + INIT_DIR=@init_dir@ +-INIT_OPTS=-o root -g root ++INIT_OPTS=-o root -g wheel + CGICFGDIR=$(CGIDIR) - # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999) -@@ -99,13 +99,17 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) nscgi.cfg $(CGIDIR) - - install-init: -- $(INSTALL) -m 774 -o root -g root init-script /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel init-script /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions + CGIEXTRAS=@CGIEXTRAS@ +@@ -109,7 +109,7 @@ + $(INSTALL) -m 774 $(INIT_OPTS) init-script $(DESTDIR)$(INIT_DIR)/netsaint install-daemoninit: -- $(INSTALL) -m 774 -o root -g root daemon-init /etc/rc.d/init.d/netsaint -+ $(INSTALL) -m 774 -o root -g wheel daemon-init /usr/local/etc/rc.d/netsaint.sh -+ $(INSTALL) -m 774 -o netsaint -g netsaint functions /usr/local/etc/netsaint/functions +- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint ++ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/netsaint.sh install-commandmode: - $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(LOGDIR)/rw - - uninstall: - rm -rf $(BINDIR)/netsaint $(CGIDIR)/*.cgi $(CFGDIR)/*.cfg $(HTMLDIR) -+ -+install-all: all install config install-config install-daemoninit + $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw diff --git a/net/netsaint/files/patch-ab b/net/netsaint/files/patch-ab index f7ce712a1276..bbaa1d00e8ba 100644 --- a/net/netsaint/files/patch-ab +++ b/net/netsaint/files/patch-ab @@ -1,8 +1,10 @@ ---- base/Makefile.in Fri Apr 7 11:11:32 2000 -+++ base/Makefile.in.new Sat Jun 10 21:45:15 2000 -@@ -52,5 +52,4 @@ +--- base/Makefile.in.orig Sun Jan 7 21:53:15 2001 ++++ base/Makefile.in Sun Jan 7 21:53:27 2001 +@@ -83,7 +83,6 @@ rm -f *~ install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(BINDIR) - $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(BINDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 774 $(INSTALL_OPTS) netsaint $(DESTDIR)$(BINDIR) + + diff --git a/net/netsaint/files/patch-ac b/net/netsaint/files/patch-ac deleted file mode 100644 index 1eb997a043fc..000000000000 --- a/net/netsaint/files/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ ---- common/locations.sub Wed Apr 26 21:10:13 2000 -+++ common/locations.sub.new Mon Jun 12 21:29:23 2000 -@@ -19,16 +19,16 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - ************************************************************************/ - --#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint.tmp" --#define DEFAULT_STATUS_FILE "${prefix}/var/status.log" --#define DEFAULT_LOG_FILE "${prefix}/var/netsaint.log" --#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/archives/" --#define DEFAULT_COMMENT_FILE "${prefix}/var/comment.log" --#define DEFAULT_COMMAND_FILE "${prefix}/var/rw/netsaint.cmd" --#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share" -+#define DEFAULT_TEMP_FILE "${prefix}/var/netsaint/netsaint.tmp" -+#define DEFAULT_STATUS_FILE "${prefix}/var/netsaint/status.log" -+#define DEFAULT_LOG_FILE "${prefix}/var/netsaint/netsaint.log" -+#define DEFAULT_LOG_ARCHIVE_PATH "${prefix}/var/netsaint/archives/" -+#define DEFAULT_COMMENT_FILE "${prefix}/var/netsaint/comment.log" -+#define DEFAULT_COMMAND_FILE "${prefix}/var/netsaint/rw/netsaint.cmd" -+#define DEFAULT_PHYSICAL_HTML_PATH "${prefix}/share/netsaint" - #define DEFAULT_URL_HTML_PATH "/netsaint" --#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/sbin" -+#define DEFAULT_PHYSICAL_CGIBIN_PATH "${exec_prefix}/share/netsaint/sbin" - #define DEFAULT_URL_CGIBIN_PATH "/cgi-bin/netsaint" --#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/sbin/nscgi.cfg" -+#define DEFAULT_CGI_CONFIG_FILE "${exec_prefix}/share/netsaint/sbin/nscgi.cfg" - --#define LOCKFILE "${prefix}/var/netsaint.lock" -+#define LOCKFILE "${prefix}/var/netsaint/netsaint.lock" diff --git a/net/netsaint/files/patch-af b/net/netsaint/files/patch-af deleted file mode 100644 index 58d7998ff8d8..000000000000 --- a/net/netsaint/files/patch-af +++ /dev/null @@ -1,24 +0,0 @@ ---- daemon-init.in Fri Apr 7 11:11:34 2000 -+++ daemon-init.in.new Mon Jun 5 16:11:44 2000 -@@ -27,10 +27,11 @@ - - # Source function library - # Solaris doesn't have an rc.d directory, so do a test first --if [ -f /etc/rc.d/init.d/functions ]; then --. /etc/rc.d/init.d/functions --elif [ -f /etc/init.d/functions ]; then --. /etc/init.d/functions -+if [ -f /usr/local/etc/netsaint/functions ]; then -+. /usr/local/etc/netsaint/functions -+else -+ echo "/usr/local/etc/netsaint/functions missing" -+ exit 1 - fi - - prefix=@prefix@ -@@ -85,4 +86,4 @@ - exit 1 - esac - --# End of this script -+# End of this script diff --git a/net/netsaint/files/patch-ah b/net/netsaint/files/patch-ah deleted file mode 100644 index a8023ecea7f1..000000000000 --- a/net/netsaint/files/patch-ah +++ /dev/null @@ -1,71 +0,0 @@ ---- hosts.cfg.in Fri Apr 7 11:11:34 2000 -+++ hosts.cfg.in.new Thu Jun 15 10:19:42 2000 -@@ -151,10 +151,10 @@ - - hostgroup[novell-servers]=All Novell Servers;novell-admins;es-gra,es-esp - hostgroup[nt-servers]=All NT Servers;nt-admins;rosie,dev,liatris --hostgroup[linux-boxes]=All Linux Servers;linux-admins;real -+hostgroup[freebsd-boxes]=All FreeBSD Servers;freebsd-admins;real - hostgroup[switches]=Switches;switch-admins;switch-4hlan,switch-esplan,switch-gralan,switch-cetslan,switch-hrdlan - hostgroup[routers]=Routers;router-admins;ageng-router --hostgroup[printers]=Printers;printer-admins,linux-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 -+hostgroup[printers]=Printers;printer-admins,freebsd-admins;cofh-475-lj4m,cofh-415-lj4,cofh-405-lj4000 - - - ################################################################################ -@@ -183,19 +183,19 @@ - - # Service notification command - send email with problem summary - --command[notify-by-email]=/bin/echo -e $SUMMARY$ | /bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ -+command[notify-by-email]=/usr/bin/printf $SUMMARY$ | /usr/bin/mail -s '** $SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$ **' $CONTACTEMAIL$ - - # Service notification command - send email to alphanumeric pager gateway - # The notify-by-epager command assumes that each contact has a pager email gateway, and - # that the address has been entered into the appropriate contact field instead of an - # actual pager number. (i.e. 'pagejoe@nowhere.com' routes mail to Joe's alphanumeric pager) - --command[notify-by-epager]=/bin/echo -e 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ -+command[notify-by-epager]=/usr/bin/printf 'Service: $SERVICEDESC$\nHost: $HOSTNAME$\nAddress: $HOSTADDRESS$\nInfo: $OUTPUT$' | /usr/bin/mail -s '$SERVICESTATE$ alert for $HOSTALIAS$/$SERVICEDESC$' $CONTACTPAGER$ - - # Host notification commands (one for email, one for alphanumeric pager with email gateway) - --command[host-notify-by-email]=/bin/echo -e '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ --command[host-notify-by-epager]=/bin/echo -e 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ -+command[host-notify-by-email]=/usr/bin/printf '***** NetSaint 0.0.5 *****\n\nHost "$HOSTALIAS$" is $HOSTSTATE$!\n\nDate/Time: $DATETIME$\n' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTEMAIL$ -+command[host-notify-by-epager]=/usr/bin/printf 'Host "$HOSTALIAS$" is $HOSTSTATE$!' | /usr/bin/mail -s 'Host $HOSTNAME$ is $HOSTSTATE$!' $CONTACTPAGER$ - - # These are some example service check commands. See the HTML documentation on the plugins for - # examples of how to configure command definitions. -@@ -316,7 +316,7 @@ - - contactgroup[novell-admins]=Novell Administrators;@netsaint_user@ - contactgroup[nt-admins]=NT Administrators;@netsaint_user@,jdoe --contactgroup[linux-admins]=Linux Administrators;@netsaint_user@ -+contactgroup[freebsd-admins]=FreeBSD Administrators;@netsaint_user@ - contactgroup[switch-admins]=Etherswitch Administrators;@netsaint_user@ - contactgroup[router-admins]=Router Technicians;@netsaint_user@ - contactgroup[printer-admins]=Etherswitch Administrators;@netsaint_user@,jdoe -@@ -428,14 +428,14 @@ - service[liatris]=PING;24x7;3;5;1;maes-admins;240;workhours;1;1;0;;check_ping - service[liatris]=MAES Publications;24x7;3;2;1;maes-admins;240;workhours;1;1;1;;check_http2!192.168.2.2!/publications - --# Linux Box --service[real]=PING;24x7;3;5;1;linux-admins;240;24x7;1;1;0;;check_ping --service[real]=HTTP;24x7;3;2;1;linux-admins;240;24x7;1;1;1;;check_http --service[real]=Current Users;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_users!75!150 --service[real]=Zombie Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!5!10!Z --service[real]=Total Processes;24x7;3;5;2;linux-admins;240;24x7;1;1;1;;check_procs!150!200 --service[real]=Drive 1 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 --service[real]=Drive 2 Free Space;24x7;3;5;1;linux-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 -+# FreeBSD Box -+service[real]=PING;24x7;3;5;1;freebsd-admins;240;24x7;1;1;0;;check_ping -+service[real]=HTTP;24x7;3;2;1;freebsd-admins;240;24x7;1;1;1;;check_http -+service[real]=Current Users;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_users!75!150 -+service[real]=Zombie Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!5!10!Z -+service[real]=Total Processes;24x7;3;5;2;freebsd-admins;240;24x7;1;1;1;;check_procs!150!200 -+service[real]=Drive 1 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hda1 -+service[real]=Drive 2 Free Space;24x7;3;5;1;freebsd-admins;120;24x7;1;1;1;;check_disk!/dev/hdb2 - - # Switches - service[switch-esplan]=Traffic Rate;24x7;1;5;6;switch-admins;60;24x7;0;0;0;;traffic_average!/home/httpd/html/mrtg/esp-lan.log!600000!800000!600000!800000 diff --git a/net/netsaint/pkg-descr b/net/netsaint/pkg-descr index e16ce94fefe6..ba87fff062b8 100644 --- a/net/netsaint/pkg-descr +++ b/net/netsaint/pkg-descr @@ -1,13 +1,12 @@ -NetSaint is a program that will monitor hosts and services -on your network. It has the ability to email or page you -when a problem arises and when it gets resolved. NetSaint -is written in C and is designed to run under Linux, although -it should work under most other *NIX variants. It can run -either as a normal process or as a daemon, intermittently -running checks on various services that you specify. The -actual service checks are performed by external "plugins" -which return service information to NetSaint. Several CGI -programs are included with NetSaint in order to allow you -to view the current service status, history, etc. via a web browser. +NetSaint is a program that will monitor hosts and services on your +network. It has the ability to email or page you when a problem arises +and when it gets resolved. NetSaint is written in C and is designed to +run under Linux, although it should work under most other *NIX variants. +It can run either as a normal process or as a daemon, intermittently +running checks on various services that you specify. The actual service +checks are performed by external "plugins" which return service +information to NetSaint. Several CGI programs are included with NetSaint +in order to allow you to view the current service status, history, etc. +via a web browser. WWW: http://www.netsaint.org/ diff --git a/net/netsaint/pkg-plist b/net/netsaint/pkg-plist index e6757452f595..e932f9661776 100644 --- a/net/netsaint/pkg-plist +++ b/net/netsaint/pkg-plist @@ -1,72 +1,106 @@ bin/netsaint -etc/netsaint/netsaint.cfg +etc/netsaint/commands.cfg etc/netsaint/hosts.cfg -etc/netsaint/functions +etc/netsaint/netsaint.cfg +etc/netsaint/nscgi.cfg +etc/netsaint/resource.cfg etc/rc.d/netsaint.sh share/netsaint/docs/about.html share/netsaint/docs/addons.html +share/netsaint/docs/bigtime.html share/netsaint/docs/cgiauth.html share/netsaint/docs/cgis.html +share/netsaint/docs/checkscheduling.html +share/netsaint/docs/clusters.html +share/netsaint/docs/commandfile.html share/netsaint/docs/config.html share/netsaint/docs/configcgi.html share/netsaint/docs/confighost.html share/netsaint/docs/configmain.html +share/netsaint/docs/developer/commentfile.html +share/netsaint/docs/developer/images/xcdapi.gif +share/netsaint/docs/developer/images/xedapi.gif +share/netsaint/docs/developer/images/xodapi.gif +share/netsaint/docs/developer/images/xrdapi.gif +share/netsaint/docs/developer/images/xsdapi.gif +share/netsaint/docs/developer/index.html +share/netsaint/docs/developer/pluginhowto.html +share/netsaint/docs/developer/stateretentionfile.html +share/netsaint/docs/developer/statusfile.html +share/netsaint/docs/developer/xcd.html +share/netsaint/docs/developer/xdata.html +share/netsaint/docs/developer/xed.html +share/netsaint/docs/developer/xod.html +share/netsaint/docs/developer/xrd.html +share/netsaint/docs/developer/xsd.html +share/netsaint/docs/distributed.html +share/netsaint/docs/escalations.html share/netsaint/docs/eventhandlers.html share/netsaint/docs/extcommands.html share/netsaint/docs/faqs.html share/netsaint/docs/funstuff.html +share/netsaint/docs/images/activepassive.gif +share/netsaint/docs/images/checktiming.gif share/netsaint/docs/images/cmd_cgi.gif share/netsaint/docs/images/config_cgi.gif +share/netsaint/docs/images/distributed.gif share/netsaint/docs/images/extinfo_cgi_a.gif share/netsaint/docs/images/extinfo_cgi_b.gif share/netsaint/docs/images/extinfo_cgi_c.gif share/netsaint/docs/images/extinfo_cgi_d.gif share/netsaint/docs/images/history_cgi.gif -share/netsaint/docs/images/logic-host-event-handler.gif -share/netsaint/docs/images/logic-host-notification.gif -share/netsaint/docs/images/logic-host-state-handler.gif -share/netsaint/docs/images/logic-route-check.gif -share/netsaint/docs/images/logic-service-event-handler.gif -share/netsaint/docs/images/logic-service-notification.gif -share/netsaint/docs/images/logic-service-problem.gif -share/netsaint/docs/images/logic-service-recovery.gif -share/netsaint/docs/images/logic-top.gif +share/netsaint/docs/images/indirecthostcheck.gif +share/netsaint/docs/images/indirectsvccheck.gif +share/netsaint/docs/images/indirectsvccheck2.gif +share/netsaint/docs/images/interleaved1.gif +share/netsaint/docs/images/interleaved2.gif share/netsaint/docs/images/network-heirarchy.gif +share/netsaint/docs/images/network-outage1.gif +share/netsaint/docs/images/network-outage2.gif +share/netsaint/docs/images/noninterleaved1.gif +share/netsaint/docs/images/noninterleaved2.gif share/netsaint/docs/images/notification-process.gif share/netsaint/docs/images/notifications_cgi.gif +share/netsaint/docs/images/outages_cgi.gif share/netsaint/docs/images/physical-network.gif +share/netsaint/docs/images/plugintheory.gif share/netsaint/docs/images/redundancy-1.gif share/netsaint/docs/images/redundancy-2.gif -share/netsaint/docs/images/relationship-complex.gif -share/netsaint/docs/images/relationship-simple.gif share/netsaint/docs/images/showlog_cgi.gif share/netsaint/docs/images/status_cgi_a.gif share/netsaint/docs/images/status_cgi_b.gif share/netsaint/docs/images/statusmap_cgi.gif share/netsaint/docs/images/statuswrl_cgi.gif +share/netsaint/docs/images/trends_cgi.gif share/netsaint/docs/index.html +share/netsaint/docs/indirectchecks.html share/netsaint/docs/installing.html share/netsaint/docs/installweb.html share/netsaint/docs/macros.html share/netsaint/docs/makehtml.html +share/netsaint/docs/networkoutages.html share/netsaint/docs/networkreachability.html share/netsaint/docs/notifications.html +share/netsaint/docs/oldplugins.html share/netsaint/docs/parallelization.html +share/netsaint/docs/passivechecks.html share/netsaint/docs/pluginhowto.html share/netsaint/docs/plugins.html +share/netsaint/docs/plugintheory.html share/netsaint/docs/programmodes.html share/netsaint/docs/redundancy.html share/netsaint/docs/robots.txt +share/netsaint/docs/security.html share/netsaint/docs/starting.html share/netsaint/docs/statetypes.html share/netsaint/docs/statuslevels.html share/netsaint/docs/stoprestart.html -share/netsaint/docs/theory-network.html -share/netsaint/docs/theory-time.html share/netsaint/docs/theory.html share/netsaint/docs/timeperiods.html share/netsaint/docs/verifyconfig.html +share/netsaint/docs/volatileservices.html share/netsaint/docs/whatsnew.html +share/netsaint/images/ack.gif share/netsaint/images/active.gif share/netsaint/images/command.gif share/netsaint/images/commandsbar.gif @@ -81,7 +115,9 @@ share/netsaint/images/delay.gif share/netsaint/images/delete.gif share/netsaint/images/disabled.gif share/netsaint/images/docbar.gif +share/netsaint/images/down.gif share/netsaint/images/enabled.gif +share/netsaint/images/extinfo.gif share/netsaint/images/greendot.gif share/netsaint/images/history.gif share/netsaint/images/historybar.gif @@ -163,6 +199,8 @@ share/netsaint/images/logrotate.gif share/netsaint/images/logs.gif share/netsaint/images/ndisabled.gif share/netsaint/images/networkhealthbar.gif +share/netsaint/images/networkoutagesbar.gif +share/netsaint/images/noack.gif share/netsaint/images/notes.gif share/netsaint/images/notificationsbar.gif share/netsaint/images/notify.gif @@ -179,10 +217,10 @@ share/netsaint/images/sblogo.gif share/netsaint/images/sbmonitor.gif share/netsaint/images/scale.gif share/netsaint/images/serviceevent.gif +share/netsaint/images/serviceproblemsbar.gif share/netsaint/images/servicesbar.gif share/netsaint/images/standby.gif share/netsaint/images/start.gif -share/netsaint/images/statudetailbar.gif share/netsaint/images/status.gif share/netsaint/images/status2.gif share/netsaint/images/status3.gif @@ -190,34 +228,55 @@ share/netsaint/images/status4.gif share/netsaint/images/statusdetailbar.gif share/netsaint/images/statusmapbar.gif share/netsaint/images/statusoverviewbar.gif +share/netsaint/images/statussummarybar.gif share/netsaint/images/statusworldbar.gif share/netsaint/images/stop.gif share/netsaint/images/thermcrit.gif share/netsaint/images/thermok.gif share/netsaint/images/thermwarn.gif share/netsaint/images/timeperiodsbar.gif +share/netsaint/images/trends.gif +share/netsaint/images/trendsbar.gif +share/netsaint/images/trendshost.png +share/netsaint/images/trendssvc.png share/netsaint/images/unknown.gif +share/netsaint/images/up.gif share/netsaint/images/warning.gif -share/netsaint/images/xinfo.gif -share/netsaint/images/zombie.gif share/netsaint/index.html share/netsaint/main.html +share/netsaint/media/critical.wav +share/netsaint/media/hostdown.wav +share/netsaint/media/warning.wav share/netsaint/robots.txt share/netsaint/sbin/cmd.cgi share/netsaint/sbin/config.cgi share/netsaint/sbin/extinfo.cgi share/netsaint/sbin/history.cgi share/netsaint/sbin/notifications.cgi -share/netsaint/sbin/nscgi.cfg +share/netsaint/sbin/outages.cgi share/netsaint/sbin/showlog.cgi share/netsaint/sbin/status.cgi share/netsaint/sbin/statusmap.cgi share/netsaint/sbin/statuswrl.cgi +share/netsaint/sbin/trends.cgi share/netsaint/side.html +share/netsaint/stylesheets/cmd.css +share/netsaint/stylesheets/config.css +share/netsaint/stylesheets/extinfo.css +share/netsaint/stylesheets/history.css +share/netsaint/stylesheets/notifications.css +share/netsaint/stylesheets/outages.css +share/netsaint/stylesheets/showlog.css +share/netsaint/stylesheets/status.css +share/netsaint/stylesheets/statusmap.css +share/netsaint/stylesheets/trends.css @dirrm etc/netsaint -@dirrm share/netsaint/sbin -@dirrm share/netsaint/images/logos -@dirrm share/netsaint/images +@dirrm share/netsaint/docs/developer/images +@dirrm share/netsaint/docs/developer @dirrm share/netsaint/docs/images @dirrm share/netsaint/docs -@dirrm share/netsaint +@dirrm share/netsaint/images/logos +@dirrm share/netsaint/images +@dirrm share/netsaint/media +@dirrm share/netsaint/sbin +@dirrm share/netsaint/stylesheets |