1 files changed, 90 insertions, 85 deletions
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index f93dee38..91797dc8 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -1,18 +1,35 @@
 /******************************************************************************
+*
- This program is free software; you can redistribute it and/or modify
+* Nagios check_nwstat plugin
- it under the terms of the GNU General Public License as published by
+*
- the Free Software Foundation; either version 2 of the License, or
+* License: GPL
- (at your option) any later version.
+* Copyright (c) 2000-2006 nagios-plugins team
+*
- This program is distributed in the hope that it will be useful,
+* Last Modified: $Date$
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+*
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* Description:
- GNU General Public License for more details.
+*
+* This file contains the check_nwstat plugin
- You should have received a copy of the GNU General Public License
+*
- along with this program; if not, write to the Free Software
+*  This plugin attempts to contact the MRTGEXT NLM running on a
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*  Novell server to gather the requested system information.
+* 
+*
+* License Information:
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 $Id$
 
@@ -1596,82 +1613,70 @@ void print_help(void)
        printf (_(UT_HOST_PORT), 'p', myport);
-        printf (_("\
+        printf (" %s\n", "-v, --variable=STRING");
- -v, --variable=STRING\n\
+  printf ("   %s\n", _("Variable to check.  Valid variables include:"));
-    Variable to check.  Valid variables include:\n\
+  printf ("    %s\n", _("LOAD1     = 1 minute average CPU load"));
-      LOAD1     = 1 minute average CPU load\n\
+  printf ("    %s\n", _("LOAD5     = 5 minute average CPU load"));
-      LOAD5     = 5 minute average CPU load\n\
+  printf ("    %s\n", _("LOAD15    = 15 minute average CPU load"));
-      LOAD15    = 15 minute average CPU load\n\
+  printf ("    %s\n", _("CSPROCS   = number of current service processes (NW 5.x only)"));
-      CSPROCS   = number of current service processes (NW 5.x only)\n\
+  printf ("    %s\n", _("ABENDS    = number of abended threads (NW 5.x only)"));
-      ABENDS    = number of abended threads (NW 5.x only)\n\
+  printf ("    %s\n", _("UPTIME    = server uptime"));
-      UPTIME    = server uptime\n"));
+        printf ("    %s\n", _("LTCH      = percent long term cache hits"));
+  printf ("    %s\n", _("CBUFF     = current number of cache buffers"));
-        printf (_("\
+  printf ("    %s\n", _("CDBUFF    = current number of dirty cache buffers"));
-      LTCH      = percent long term cache hits\n\
+  printf ("    %s\n", _("DCB       = dirty cache buffers as a percentage of the total"));
-      CBUFF     = current number of cache buffers\n\
+  printf ("    %s\n", _("TCB       = dirty cache buffers as a percentage of the original"));
-      CDBUFF    = current number of dirty cache buffers\n\
+        printf ("    %s\n", _("OFILES    = number of open files"));
-      DCB       = dirty cache buffers as a percentage of the total\n\
+  printf ("    %s\n", _("    VMF<vol>  = MB of free space on Volume <vol>"));
-      TCB       = dirty cache buffers as a percentage of the original\n"));
+  printf ("    %s\n", _("    VMU<vol>  = MB used space on Volume <vol>"));
+  printf ("    %s\n", _("    VMP<vol>  = MB of purgeable space on Volume <vol>"));
-        printf (_("\
+  printf ("    %s\n", _("    VPF<vol>  = percent free space on volume <vol>"));
-      OFILES    = number of open files\n\
+  printf ("    %s\n", _("    VKF<vol>  = KB of free space on volume <vol>"));
-      VMF<vol>  = MB of free space on Volume <vol>\n\
+  printf ("    %s\n", _("    VPP<vol>  = percent purgeable space on volume <vol>"));
-      VMU<vol>  = MB used space on Volume <vol>\n\
+  printf ("    %s\n", _("    VKP<vol>  = KB of purgeable space on volume <vol>"));
-      VMP<vol>  = MB of purgeable space on Volume <vol>\n\
+  printf ("    %s\n", _("    VPNP<vol> = percent not yet purgeable space on volume <vol>"));
-      VPF<vol>  = percent free space on volume <vol>\n\
+  printf ("    %s\n", _("    VKNP<vol> = KB of not yet purgeable space on volume <vol>"));
-      VKF<vol>  = KB of free space on volume <vol>\n\
+  printf ("    %s\n", _("    LRUM      = LRU sitting time in minutes"));
-      VPP<vol>  = percent purgeable space on volume <vol>\n\
+  printf ("    %s\n", _("    LRUS      = LRU sitting time in seconds"));
-      VKP<vol>  = KB of purgeable space on volume <vol>\n\
+  printf ("    %s\n", _("    DSDB      = check to see if DS Database is open"));
-      VPNP<vol> = percent not yet purgeable space on volume <vol>\n\
+  printf ("    %s\n", _("    DSVER     = NDS version"));
-      VKNP<vol> = KB of not yet purgeable space on volume <vol>\n"));
+  printf ("    %s\n", _("    UPRB      = used packet receive buffers"));
+  printf ("    %s\n", _("    PUPRB     = percent (of max) used packet receive buffers"));
-        printf (_("\
+  printf ("    %s\n", _("    SAPENTRIES = number of entries in the SAP table"));
-      LRUM      = LRU sitting time in minutes\n\
+  printf ("    %s\n", _("    SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>"));
-      LRUS      = LRU sitting time in seconds\n\
+  printf ("    %s\n", _("    TSYNC     = timesync status"));
-      DSDB      = check to see if DS Database is open\n\
+  printf ("    %s\n", _("    LOGINS    = check to see if logins are enabled"));
-      DSVER     = NDS version\n\
+  printf ("    %s\n", _("    CONNS     = number of currently licensed connections"));
-      UPRB      = used packet receive buffers\n\
+  printf ("    %s\n", _("    NRMH       = NRM Summary Status"));
-      PUPRB     = percent (of max) used packet receive buffers\n\
+  printf ("    %s\n", _("    NRMP<stat> = Returns the current value for a NRM health item"));
-      SAPENTRIES = number of entries in the SAP table\n\
+  printf ("    %s\n", _("    NRMM<stat> = Returns the current memory stats from NRM"));
-      SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>\n"));
+  printf ("    %s\n", _("    NRMS<stat> = Returns the current Swapfile stats from NRM"));
+  printf ("    %s\n", _("    NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml"));
-        printf (_("\
+  printf ("    %s\n", _("    NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml"));
-      TSYNC     = timesync status\n\
+  printf ("    %s\n", _("    NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml"));
-      LOGINS    = check to see if logins are enabled\n\
+  printf ("    %s\n", _("    NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml"));
-      CONNS     = number of currently licensed connections\n\
+  printf ("    %s\n", _("    NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml"));
-      NRMH      = NRM Summary Status\n\
+  printf ("    %s\n", _("    NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml"));
-      NRMP<stat> = Returns the current value for a NRM health item\n\
+  printf ("    %s\n", _("    NLM:<nlm> = check if NLM is loaded and report version"));
-      NRMM<stat> = Returns the current memory stats from NRM\n\
+  printf ("    %s\n", _("                (e.g. NLM:TSANDS.NLM)"));
-      NRMS<stat> = Returns the current Swapfile stats from NRM\n\
+  printf ("\n");
-      NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml\n\
+        printf (" %s\n", "-w, --warning=INTEGER");
-      NSS2<stat> = Statistics from _Admin:Manage_NSS\\BufferCache.xml\n\
+  printf ("    %s\n", _("Threshold which will result in a warning status"));
-      NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml\n\
+  printf (" %s\n", "-c, --critical=INTEGER");
-      NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml\n\
+  printf ("    %s\n", _("Threshold which will result in a critical status"));
-      NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml\n\
+  printf (" %s\n", "-o, --osversion");
-      NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml\n\
+  printf ("    %s\n", _("Include server version string in results"));
-      NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml\n\
-      NLM:<nlm> = check if NLM is loaded and report version\n\
-                  (e.g. \"NLM:TSANDS.NLM\")\n"));
-        printf (_("\
- -w, --warning=INTEGER\n\
-    Threshold which will result in a warning status\n\
- -c, --critical=INTEGER\n\
-    Threshold which will result in a critical status\n\
- -o, --osversion\n\
-    Include server version string in results\n"));
        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
  printf ("\n");
  printf ("%s\n", _("Notes:"));
-        printf (_("\
+        printf (" %s\n", _("- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG"));
- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG\n\
+  printf (" %s\n", _("  extension for NetWare be loaded on the Novell servers you wish to check."));
-  extension for NetWare be loaded on the Novell servers you wish to check.\n\
+  printf (" %s\n", _("  (available from http://www.engr.wisc.edu/~drews/mrtg/)"));
-  (available from http://www.engr.wisc.edu/~drews/mrtg/)\n\
+  printf (" %s\n", _("- Values for critical thresholds should be lower than warning thresholds"));
- Values for critical thresholds should be lower than warning thresholds\n\
+  printf (" %s\n", _("  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
-  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, \n\
+  printf (" %S\n", _("  TCB, LRUS and LRUM.\n"));
-  TCB, LRUS and LRUM.\n"));
        printf (_(UT_SUPPORT));
 }

diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c index f93dee38..91797dc8 100644 --- a/plugins/check_nwstat.c +++ b/plugins/check_nwstat.c
@@ -1,18 +1,35 @@
1	/******************************************************************************	1	/******************************************************************************
2		2	*
3	This program is free software; you can redistribute it and/or modify	3	* Nagios check_nwstat plugin
4	it under the terms of the GNU General Public License as published by	4	*
5	the Free Software Foundation; either version 2 of the License, or	5	* License: GPL
6	(at your option) any later version.	6	* Copyright (c) 2000-2006 nagios-plugins team
7		7	*
8	This program is distributed in the hope that it will be useful,	8	* Last Modified: $Date$
9	but WITHOUT ANY WARRANTY; without even the implied warranty of	9	*
10	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* Description:
11	GNU General Public License for more details.	11	*
12		12	* This file contains the check_nwstat plugin
13	You should have received a copy of the GNU General Public License	13	*
14	along with this program; if not, write to the Free Software	14	* This plugin attempts to contact the MRTGEXT NLM running on a
15	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	15	* Novell server to gather the requested system information.
		16	*
		17	*
		18	* License Information:
		19	*
		20	* This program is free software; you can redistribute it and/or modify
		21	* it under the terms of the GNU General Public License as published by
		22	* the Free Software Foundation; either version 2 of the License, or
		23	* (at your option) any later version.
		24	*
		25	* This program is distributed in the hope that it will be useful,
		26	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		27	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		28	* GNU General Public License for more details.
		29	*
		30	* You should have received a copy of the GNU General Public License
		31	* along with this program; if not, write to the Free Software
		32	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
16		33
17	$Id$	34	$Id$
18		35
@@ -1596,82 +1613,70 @@ void print_help(void)
1596		1613
1597	printf (_(UT_HOST_PORT), 'p', myport);	1614	printf (_(UT_HOST_PORT), 'p', myport);
1598		1615
1599	printf (_("\	1616	printf (" %s\n", "-v, --variable=STRING");
1600	-v, --variable=STRING\n\	1617	printf (" %s\n", _("Variable to check. Valid variables include:"));
1601	Variable to check. Valid variables include:\n\	1618	printf (" %s\n", _("LOAD1 = 1 minute average CPU load"));
1602	LOAD1 = 1 minute average CPU load\n\	1619	printf (" %s\n", _("LOAD5 = 5 minute average CPU load"));
1603	LOAD5 = 5 minute average CPU load\n\	1620	printf (" %s\n", _("LOAD15 = 15 minute average CPU load"));
1604	LOAD15 = 15 minute average CPU load\n\	1621	printf (" %s\n", _("CSPROCS = number of current service processes (NW 5.x only)"));
1605	CSPROCS = number of current service processes (NW 5.x only)\n\	1622	printf (" %s\n", _("ABENDS = number of abended threads (NW 5.x only)"));
1606	ABENDS = number of abended threads (NW 5.x only)\n\	1623	printf (" %s\n", _("UPTIME = server uptime"));
1607	UPTIME = server uptime\n"));	1624	printf (" %s\n", _("LTCH = percent long term cache hits"));
1608		1625	printf (" %s\n", _("CBUFF = current number of cache buffers"));
1609	printf (_("\	1626	printf (" %s\n", _("CDBUFF = current number of dirty cache buffers"));
1610	LTCH = percent long term cache hits\n\	1627	printf (" %s\n", _("DCB = dirty cache buffers as a percentage of the total"));
1611	CBUFF = current number of cache buffers\n\	1628	printf (" %s\n", _("TCB = dirty cache buffers as a percentage of the original"));
1612	CDBUFF = current number of dirty cache buffers\n\	1629	printf (" %s\n", _("OFILES = number of open files"));
1613	DCB = dirty cache buffers as a percentage of the total\n\	1630	printf (" %s\n", _(" VMF<vol> = MB of free space on Volume <vol>"));
1614	TCB = dirty cache buffers as a percentage of the original\n"));	1631	printf (" %s\n", _(" VMU<vol> = MB used space on Volume <vol>"));
1615		1632	printf (" %s\n", _(" VMP<vol> = MB of purgeable space on Volume <vol>"));
1616	printf (_("\	1633	printf (" %s\n", _(" VPF<vol> = percent free space on volume <vol>"));
1617	OFILES = number of open files\n\	1634	printf (" %s\n", _(" VKF<vol> = KB of free space on volume <vol>"));
1618	VMF<vol> = MB of free space on Volume <vol>\n\	1635	printf (" %s\n", _(" VPP<vol> = percent purgeable space on volume <vol>"));
1619	VMU<vol> = MB used space on Volume <vol>\n\	1636	printf (" %s\n", _(" VKP<vol> = KB of purgeable space on volume <vol>"));
1620	VMP<vol> = MB of purgeable space on Volume <vol>\n\	1637	printf (" %s\n", _(" VPNP<vol> = percent not yet purgeable space on volume <vol>"));
1621	VPF<vol> = percent free space on volume <vol>\n\	1638	printf (" %s\n", _(" VKNP<vol> = KB of not yet purgeable space on volume <vol>"));
1622	VKF<vol> = KB of free space on volume <vol>\n\	1639	printf (" %s\n", _(" LRUM = LRU sitting time in minutes"));
1623	VPP<vol> = percent purgeable space on volume <vol>\n\	1640	printf (" %s\n", _(" LRUS = LRU sitting time in seconds"));
1624	VKP<vol> = KB of purgeable space on volume <vol>\n\	1641	printf (" %s\n", _(" DSDB = check to see if DS Database is open"));
1625	VPNP<vol> = percent not yet purgeable space on volume <vol>\n\	1642	printf (" %s\n", _(" DSVER = NDS version"));
1626	VKNP<vol> = KB of not yet purgeable space on volume <vol>\n"));	1643	printf (" %s\n", _(" UPRB = used packet receive buffers"));
1627		1644	printf (" %s\n", _(" PUPRB = percent (of max) used packet receive buffers"));
1628	printf (_("\	1645	printf (" %s\n", _(" SAPENTRIES = number of entries in the SAP table"));
1629	LRUM = LRU sitting time in minutes\n\	1646	printf (" %s\n", _(" SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>"));
1630	LRUS = LRU sitting time in seconds\n\	1647	printf (" %s\n", _(" TSYNC = timesync status"));
1631	DSDB = check to see if DS Database is open\n\	1648	printf (" %s\n", _(" LOGINS = check to see if logins are enabled"));
1632	DSVER = NDS version\n\	1649	printf (" %s\n", _(" CONNS = number of currently licensed connections"));
1633	UPRB = used packet receive buffers\n\	1650	printf (" %s\n", _(" NRMH = NRM Summary Status"));
1634	PUPRB = percent (of max) used packet receive buffers\n\	1651	printf (" %s\n", _(" NRMP<stat> = Returns the current value for a NRM health item"));
1635	SAPENTRIES = number of entries in the SAP table\n\	1652	printf (" %s\n", _(" NRMM<stat> = Returns the current memory stats from NRM"));
1636	SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>\n"));	1653	printf (" %s\n", _(" NRMS<stat> = Returns the current Swapfile stats from NRM"));
1637		1654	printf (" %s\n", _(" NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml"));
1638	printf (_("\	1655	printf (" %s\n", _(" NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml"));
1639	TSYNC = timesync status\n\	1656	printf (" %s\n", _(" NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml"));
1640	LOGINS = check to see if logins are enabled\n\	1657	printf (" %s\n", _(" NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml"));
1641	CONNS = number of currently licensed connections\n\	1658	printf (" %s\n", _(" NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml"));
1642	NRMH = NRM Summary Status\n\	1659	printf (" %s\n", _(" NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml"));
1643	NRMP<stat> = Returns the current value for a NRM health item\n\	1660	printf (" %s\n", _(" NLM:<nlm> = check if NLM is loaded and report version"));
1644	NRMM<stat> = Returns the current memory stats from NRM\n\	1661	printf (" %s\n", _(" (e.g. NLM:TSANDS.NLM)"));
1645	NRMS<stat> = Returns the current Swapfile stats from NRM\n\	1662	printf ("\n");
1646	NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml\n\	1663	printf (" %s\n", "-w, --warning=INTEGER");
1647	NSS2<stat> = Statistics from _Admin:Manage_NSS\\BufferCache.xml\n\	1664	printf (" %s\n", _("Threshold which will result in a warning status"));
1648	NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml\n\	1665	printf (" %s\n", "-c, --critical=INTEGER");
1649	NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml\n\	1666	printf (" %s\n", _("Threshold which will result in a critical status"));
1650	NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml\n\	1667	printf (" %s\n", "-o, --osversion");
1651	NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml\n\	1668	printf (" %s\n", _("Include server version string in results"));
1652	NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml\n\
1653	NLM:<nlm> = check if NLM is loaded and report version\n\
1654	(e.g. \"NLM:TSANDS.NLM\")\n"));
1655
1656	printf (_("\
1657	-w, --warning=INTEGER\n\
1658	Threshold which will result in a warning status\n\
1659	-c, --critical=INTEGER\n\
1660	Threshold which will result in a critical status\n\
1661	-o, --osversion\n\
1662	Include server version string in results\n"));
1663		1669
1664	printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);	1670	printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
1665		1671
1666	printf ("\n");	1672	printf ("\n");
1667	printf ("%s\n", _("Notes:"));	1673	printf ("%s\n", _("Notes:"));
1668	printf (_("\	1674	printf (" %s\n", _("- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG"));
1669	- This plugin requres that the MRTGEXT.NLM file from James Drews' MRTG\n\	1675	printf (" %s\n", _(" extension for NetWare be loaded on the Novell servers you wish to check."));
1670	extension for NetWare be loaded on the Novell servers you wish to check.\n\	1676	printf (" %s\n", _(" (available from http://www.engr.wisc.edu/~drews/mrtg/)"));
1671	(available from http://www.engr.wisc.edu/~drews/mrtg/)\n\	1677	printf (" %s\n", _("- Values for critical thresholds should be lower than warning thresholds"));
1672	- Values for critical thresholds should be lower than warning thresholds\n\	1678	printf (" %s\n", _(" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
1673	when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, \n\	1679	printf (" %S\n", _(" TCB, LRUS and LRUM.\n"));
1674	TCB, LRUS and LRUM.\n"));
1675		1680
1676	printf (_(UT_SUPPORT));	1681	printf (_(UT_SUPPORT));
1677	}	1682	}