Commit graph

1083 commits

Author SHA1 Message Date
Holger Weiss
006597a12d Make C plugin output format configurable
The development guidelines¹ currently state that the plugin output
should be in the format "SERVICE STATUS: Information text".  However,
the SERVICE and STATUS information is redundant, as the plugin caller
(e.g., Nagios) should know which SERVICE is checked and the STATUS is
returned via the plugin's exit code.  After discussing² this issue on
the development list, we decided to make the plugin output configurable
at compile time (separately for "normal" and "verbose" output).

¹ http://nagiosplug.sf.net/developer-guidelines.html
² http://thread.gmane.org/gmane.network.nagios.plugins.devel/5155

Signed-off-by: Holger Weiss <hweiss@users.sourceforge.net>
2009-05-10 13:37:35 +02:00
Thomas Guyot-Sionnest
dd52d7e5e7 check_nt: allow returning UNKNOWN on timeouts (-u) 2009-03-24 23:46:09 -04:00
Thomas Guyot-Sionnest
386b791af2 Make socket alarm handler customisable (like c459ca07) 2009-03-24 21:40:06 -04:00
Thomas Guyot-Sionnest
ab3ada9aac check_mysql: Fix segfault with old slaves (#2696823 - Oskar Ahner) 2009-03-24 02:01:48 -04:00
Thomas Guyot-Sionnest
f2f2f35240 Whitespace and intend cleanup 2009-03-24 01:50:01 -04:00
Thomas Guyot-Sionnest
8aa84840bb Update check_http short help with new stycky and stickyport options. 2009-03-21 02:56:35 -04:00
Thomas Guyot-Sionnest
795277d9b1 check_http: die when an invalid --onredirect option is specified 2009-03-21 02:39:49 -04:00
Thomas Guyot-Sionnest
e7cdcfee2a check_http: add --onredirect=stickyport - also follow the same port 2009-03-21 02:32:50 -04:00
Thomas Guyot-Sionnest
d36c976129 negate: make timeouts configurable 2009-03-20 02:28:02 -04:00
Thomas Guyot-Sionnest
c459ca0770 Make alarm handler customisable 2009-03-20 02:19:42 -04:00
Thomas Guyot-Sionnest
4142e17840 negate: Fix not printing the real timeout in ALRM handler when timeout is left to default 2009-03-20 01:40:00 -04:00
Thomas Guyot-Sionnest
31f2afcf4a tests/check_http.t: Add various timeout-related tests 2009-03-20 01:21:18 -04:00
Thomas Guyot-Sionnest thomas@aei.ca
3dd27fb063 Fixed check_http not timing-out on redirects 2009-03-19 13:59:43 -07:00
Thomas Guyot-Sionnest
37e432ec77 Revert "Add timezone support and fix checks around cert expiration" (keep the expiration fix)
This reverts commit d41a33a434.
2009-03-19 01:04:33 -04:00
Thomas Guyot-Sionnest
ead340235e Add suggested multi-oid test (John A. Barbuto) 2009-03-18 03:51:16 -04:00
Thomas Guyot-Sionnest
e9f5442bb3 check_snmp: Fix potential buffer overflow - enforce MAX_OIDS limit (John A. Barbuto) 2009-03-18 03:47:23 -04:00
Thomas Guyot-Sionnest
d41a33a434 Add timezone support and fix checks around cert expiration 2009-03-18 03:34:25 -04:00
Thomas Guyot-Sionnest
9a05e97890 Check for existence of pre-instaleld pst3 for Solaris tests in t/check_procs.t 2009-03-17 01:56:26 -05:00
Thomas Guyot-Sionnest
16030bc497 Fix check_http sending HTTP/1.0 with v1.1 headers (#2638765) 2009-03-17 01:53:00 -04:00
Thomas Guyot-Sionnest
c3c528952d Fix check_snmp test on solaris 2009-03-16 18:49:51 -05:00
Thomas Guyot-Sionnest
d89d0b40f9 Update extended check_http tests for 0d78171...
Also add some tests, and make debug mode loop infinitely.
2009-03-16 03:09:15 -04:00
Thomas Guyot-Sionnest
6b8502bee6 check_http fixes:
- Fix broken printf on 500 errors
- Add bytes to normal output (accidentally removed in 0d78171)
2009-03-16 03:06:33 -04:00
Thomas Guyot-Sionnest
e2aec83e61 check_snmp fixes:
- Fix broken compilation caused by typo in command ending
- Remove extra whitespaces at EOL
- Fix invalid host test on Ubuntu Hardy (and possibly others)
2009-03-16 01:37:00 -04:00
Ton Voon
12c17fe8a2 Ignore stderr messages unless return code is non-zero or there is no output 2009-03-14 02:36:20 +00:00
Ton Voon
36e58ae0c3 Fixed passing of quotes in OID for check_snmp (#1985230 - Jan Wagner, patch by John Barbuto) 2009-03-14 01:17:50 +00:00
Ton Voon
674841e279 Create expired cert for testing purposes. Updated tests to check
expired and unexpired certificates
2009-03-06 00:24:38 +00:00
Ton Voon
0e5a9df135 Merge branch 'master' of ssh://repo.or.cz/srv/git/nagiosplugins 2009-03-05 23:39:31 +00:00
Ton Voon
8580335779 Added inline tests for HTTPS using HTTP::Daemon::SSL 2009-03-05 23:37:45 +00:00
Thomas Guyot-Sionnest
660dabd5ac check_snmp long help missing retries entry (#2608223)
Fix for check_snmp long help, reported by Richard Edward Horner
2009-02-24 04:43:09 -05:00
Ton Voon
5324544855 Typo fixes (Jan Wagner - SF 1878971) 2009-02-20 00:00:13 +00:00
Ton Voon
31efea1b49 Fixed coredump from check_nt when drive not found (Olli Hauer - SF 2179754) 2009-02-19 23:43:15 +00:00
Thomas Guyot-Sionnest
d00a53dd1e check_http --onredirect=sticky follows using the same IP address (sf.net #2550208). 2009-02-05 00:47:07 -05:00
Thomas Guyot-Sionnest
0d781712d7 Fix aberrant behaviours in check_http:
check_http used to ignore many parameters with check combinations - sometimes
even time thresholds(!!)

With this commit as long as a response is received *all* checks are performed
on it.

This fixes #1460312 plus a number of other issues I discovered over time.
2009-02-03 04:50:47 -05:00
Thomas Guyot-Sionnest
ba132e9e52 Make extract_value more generic:
Add a separator argument passed using defines.
2009-01-26 02:05:21 -05:00
Thomas Guyot-Sionnest
a4647be424 Move check_ntp's extract_value to utils_base.c.
This function can also be used to parse performance data strings which
could be useful in the future.
2009-01-21 01:27:40 -05:00
Thomas Guyot-Sionnest
948cf21aae Trick for check_users test without users logged-in 2009-01-20 21:48:05 -05:00
Thomas Guyot-Sionnest
71cdb52799 Sync with gnulib 2009-01-15 05:19:08 -05:00
Ton Voon
639f7b2c82 Allow privproto to be passed through check_snmp to snmpget. Defaults to DES
for compatibility
2008-12-23 11:52:04 +00:00
Thomas Guyot-Sionnest
f8b606b728 check_mrtg: fix plugin returning UNKNOWN instead of OK (bug #2378068) 2008-12-03 08:00:05 -05:00
Thomas Guyot-Sionnest
399f0770b2 Fixing build breakages (I totally forgot this rule was there...) 2008-11-26 21:29:40 -05:00
Thomas Guyot-Sionnest
9bcfa9cded Disable dynamic versionning for releases, and allow generating version out of subversion.
This should be a definitive fix for systems with non-compilant make programs as the version will be taken from $(PACKAGE_VERSION) instead.

At the same time I added code for generating svn-based version strings.
2008-11-26 05:42:48 -05:00
Thomas Guyot-Sionnest
ed9a088b37 Workaround to support more make programs
Avoid the use of "-include". Since "include" is interpreted by Automake, we have to use a special macro instead.
2008-11-25 08:50:35 -05:00
Thomas Guyot-Sionnest
c0a75482b4 Avoid the use of .PHONY (target s created twice and I have no idea if it's right). 2008-11-23 13:34:19 -05:00
Thomas Guyot-Sionnest
6fbd14fea5 Removing CVS/SVN tags and replacing with git-based versioning
For contrib/, full tags have been imported from subversion


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2091 f882894a-f735-0410-b71e-b25c423dba1c
2008-11-23 05:38:47 +00:00
Thomas Guyot-Sionnest
56cf151ae9 Add comment to recent check_disk patch
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2088 f882894a-f735-0410-b71e-b25c423dba1c
2008-11-20 08:14:41 +00:00
Thomas Guyot-Sionnest
caa8bd6423 Bulk EOL cleanup
$ git diff --ignore-space-change|diffstat
 0 files changed


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2087 f882894a-f735-0410-b71e-b25c423dba1c
2008-11-19 06:45:18 +00:00
Thomas Guyot-Sionnest
16f53e0717 Fixed buffer overflow in check_ntp/check_ntp_peer (#1999319, Ubuntu #291265)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2086 f882894a-f735-0410-b71e-b25c423dba1c
2008-11-19 05:59:33 +00:00
Thomas Guyot-Sionnest
5305852212 check_disk: rerpopulate the mount list after doing a stat() on paths specified with -p for better automount support.
NB: There's a memory leak here - properly freeing the mount list would invlove
    much more work - there's many other places where leaks can happen so it
    should be a project on its own.


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2085 f882894a-f735-0410-b71e-b25c423dba1c
2008-11-19 05:59:22 +00:00
Thomas Guyot-Sionnest
8c1934b7d0 Add missing long options for check_nt (for use with extra-opts)
Extra-opts (ini files) requires long-options for setting up arguments. Added
the missing ones for check_nt so that it can be properly used with extra-opts.


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2079 f882894a-f735-0410-b71e-b25c423dba1c
2008-11-08 16:33:28 +00:00
Thomas Guyot-Sionnest
4e366f82de Fix long options parsing in check_disk, check_dns, check_mrtg and check_mrtgtraf (check_tcp was done in an earlier commit)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2078 f882894a-f735-0410-b71e-b25c423dba1c
2008-11-08 16:33:15 +00:00