Commit graph

2692 commits

Author SHA1 Message Date
Holger Weiss
0170bc48d1 configure.ac: Change RADIUS library preferences
Prefer the FreeRADIUS Client library over radiusclient-ng, and prefer
that one over the original radiusclient library.
2014-06-22 14:12:55 +02:00
Holger Weiss
c0311d9848 check_radius: Support FreeRADIUS Client library
Allow for using the FreeRADIUS Client library instead of radiusclient or
radiusclient-ng.  The latter two projects are dead.

Closes #1231.
2014-06-22 14:10:38 +02:00
Holger Weiss
22e7b78685 REQUIREMENTS: Update radiusclient-ng URL
The project was moved to SourceForge.net.
2014-06-22 13:59:57 +02:00
Holger Weiss
eb85a612a3 Add UID to state retention file path
Add the UID of the invoking user to the state retention file path.  This
helps solving permission issues when different users run the same
plugin.
2014-06-21 15:15:44 +02:00
Holger Weiss
8a932865eb NEWS: s/MP_STATE_DIRECTORY/MP_STATE_PATH/
NAGIOS_PLUGIN_STATE_DIRECTORY was renamed to MP_STATE_PATH, not to
MP_STATE_DIRECTORY.
2014-06-20 12:35:22 +02:00
Holger Weiss
dc0f25cf76 lib/parse_ini.c: Print proper read error message
Print a useful error message if opening the configuration file fails.
2014-06-18 23:42:57 +02:00
Holger Weiss
48025ff39c lib/parse_ini.c: Drop privileges for reading file
Read the configuration file with privileges temporarily dropped if the
code is used by a setuid plugin.
2014-06-18 23:22:12 +02:00
Holger Weiss
2bf7647be6 lib/parse_ini.c: Add newline to die() calls
Our die() function doesn't append a newline character to the message.
2014-06-18 23:15:21 +02:00
Holger Weiss
b81c10e00c lib/parse_ini.c: Cosmetic change
Replace an "if" with the ternary operator.
2014-06-18 23:09:02 +02:00
Holger Weiss
91d04ad62d Add Gnulib module "idpriv-droptemp" 2014-06-18 21:47:10 +02:00
Holger Weiss
ae24aaeefb Use FindBin consistently across Perl plugins
Use Perl's FindBin module to locate the path to utils.pm in
check_file_age.pl and check_mssql.pl, just as we do in other Perl
plugins.
2014-06-18 18:45:10 +02:00
Holger Weiss
b63974c2cb plugins/runcmd.c: Remove superfluous newline
The puts(3) function already appends a newline character to the string.
2014-06-18 18:40:23 +02:00
Holger Weiss
f0b22b37f9 lib/parse_ini.c: Search for INI file in subdirs
Add two path names to the list of default INI file locations, as some
users/distributions prefer to put configuration files into
subdirectories.
2014-06-18 18:39:32 +02:00
Holger Weiss
6da7dba782 lib/parse_ini.c: Add comment on NAGIOS_CONFIG_PATH
We might want to spit out a warning when NAGIOS_CONFIG_PATH is used.

While at it, move the function that handles this environment variable to
the bottom.
2014-06-18 10:53:44 +02:00
Holger Weiss
1890cfccdf lib/parse_ini.c: Cosmetic changes to comments 2014-06-18 10:52:09 +02:00
Holger Weiss
f627b3f33b lib/parse_ini.c: Fix Clang warnings 2014-06-18 10:45:14 +02:00
Holger Weiss
11bfb0def2 lib/parse_ini.[ch]: Change code formatting
Change the indentation and formatting of the code in lib/parse_ini.c.
This breaks patches against that file and makes it harder to track its
history, but it (hopefully) improves readability a lot.
2014-06-18 10:37:10 +02:00
Holger Weiss
e2b8169869 lib/parse_ini.c: Don't cast malloc(3) result
There's no need to cast malloc(3)'s return value.
2014-06-18 01:21:31 +02:00
Holger Weiss
95ed0a996c lib/parse_ini.c: Remove outdated comment and code
The lib/parse_ini.c:np_get_defaults() function now dies if no
configuration file is found.
2014-06-18 00:50:48 +02:00
Holger Weiss
fbe13d8f32 lib/parse_ini.c: Read $MP_CONFIG_FILE
Read $MP_CONFIG_FILE if that variable is set in the environment.
2014-06-18 00:47:35 +02:00
Holger Weiss
f94e95785c lib/parse_ini.c: Read "monitoring-plugins.ini"
Read "monitoring-plugins.ini" if that file exists, but fall back to
reading "plugins.ini" or "nagios-plugins.ini" for backward
compatibility.
2014-06-18 00:39:38 +02:00
Holger Weiss
f02b3f6b28 lib/parse_ini.[ch]: Simplify code
Rewrite the code that looks up the INI configuration file path (used by
the Extra-Opts feature) in order to improve readability.  The behaviour
should not have changed.
2014-06-18 00:37:45 +02:00
Sven Nierlein
b2fed383b1 tests: freebsds snmpd does not use quotes
when returning syscontact. So make them optional since we want to test
check_snmp and not the snmpd.

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2014-06-13 16:34:03 +02:00
Sven Nierlein
4102eaae0e tests: check_proc tests fail if uid -2 does not map to nobody
so make sure our tests only run if -2 maps to nobody

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2014-06-13 15:57:21 +02:00
Sven Nierlein
93901d5ff1 tests: fping checks require being root or setuid root
on the fping binary. Check this before running the test.

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2014-06-13 15:23:18 +02:00
Sven Nierlein
fb89accaaa require at least HTTP::Daemon 6.01
since the test uses send_header from HTTP::Daemon::ClientConn which has been introduced in
HTTP::Daemon 6.01
2014-06-13 14:01:12 +02:00
Sven Nierlein
c5a6c5136a tests: testCmd has own timeout which overwrites local one
so add configurable/optional timeout to testCmd.

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2014-06-12 13:56:48 +02:00
Sven Nierlein
3529d7465d tests: parts of the check_procs test only work when uid -2 exists
skip those tests if the uid does not exist

Signed-off-by: Sven Nierlein <Sven.Nierlein@consol.de>
2014-06-12 11:45:49 +02:00
Holger Weiss
a10b93eef2 configure.ac: Remove unused code
We no longer set LIBGNUTLS_CONFIG, as GnuTLS no longer ships a
"libgnutls-config" tool.
2014-06-12 00:10:07 +02:00
Holger Weiss
083952c426 Fix compilation with GnuTLS
GnuTLS doesn't provide a SSL_CTX_check_private_key() function.

Closes #1254.
2014-06-12 00:02:26 +02:00
Gunnar Beutner
1b3890572e Make check_disk work on Windows. 2014-04-27 19:59:06 +02:00
Gunnar Beutner
5e03bd8e8c Make check_users work on Windows. 2014-04-27 19:59:06 +02:00
Gunnar Beutner
e0af39d7e9 Make check_ping work on Windows. 2014-04-27 19:59:06 +02:00
Gunnar Beutner
d00efeb872 Add missing file extensions for some of the plugins. 2014-04-27 19:59:06 +02:00
Anton Lofgren
4e0da0216d check_snmp: Handle SNMPv3 noAuthNoPriv properly
The SNMPv3 noAuthNoPriv security level, somewhat unintuitively, requires
a security name to be passed along together with the request. Check_snmp
previously did not do this, causing snmpget to throw an error:

"External command error: No log handling enabled - turning on stderr
logging
snmpget: No securityName specified"

This patch fixes the issue by always providing the security name when
noAuthNoPriv is specified.

See also:
https:://bugs.op5.com/view.php?id=8385.

Signed-off-by: Anton Lofgren <alofgren@op5.com>
2014-04-24 08:49:54 +02:00
Sam Kottler
c887890e9f Remove the suggestion to run check_apt with --verbose since it doesn't do anything 2014-04-04 16:55:59 +06:00
Holger Weiss
0457c4b2f1 Add Sam Kottler to the list of AUTHORS 2014-04-04 10:28:50 +02:00
Jan Wagner
a271ad24f4 check_nt: add UPTIME to perfdata [sf#3434647] 2014-04-04 12:42:59 +06:00
awiddersheim
70314c62fc Fix check_mysql.c client options from file
If you don't specify a group or a file to read data from the plugin tries to read from several files that don't exist and no groups.
2014-04-03 23:41:37 +06:00
Sam Kottler
97b0780376 Update the last remaining instance of the old FSF address 2014-03-20 10:01:31 +01:00
Holger Weiss
3f4419c07e check_pgsql: Add missing newline to --help output 2014-03-13 12:52:48 +01:00
Davide Madrisan
546e15a8e8 build - avoid deprecated INCLUDES
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
2014-03-09 11:02:18 +01:00
Holger Weiss
0c5b362c30 Disable Perl's "taint" checks
Perl's "taint" checks don't like `use lib "$FindBin::Bin"'.

Cf. http://www.perlmonks.org/?node_id=585299
2014-02-28 22:05:18 +01:00
Jan Wagner
694307cdde travis-ci: remove mawk build-deps 2014-02-28 15:35:41 +01:00
Holger Weiss
0d87a626d5 configure.ac: Remove unused AC_PATH_PROG() calls 2014-02-28 13:31:15 +01:00
Holger Weiss
c08d6a429b Replace "plugins-scripts/subst.in" foo
Remove the buggy and complex awk(1) magic in "plugins-scripts/subst.in"
in favor of simple sed(1) substitutions.

The plugins in the "plugins-scripts" directory now always use the PATH
specified via "./configure --trusted-path", or the default PATH
hard-coded in "configure.ac".

Fixes #1242.
2014-02-28 13:28:33 +01:00
Holger Weiss
e260efb256 Merge remote-tracking branch 'awiddersheim/fix_trusted_path'
* awiddersheim/fix_trusted_path:
  Fix trusted path

Conflicts:
	plugins-scripts/check_ntp.pl
	plugins-scripts/subst.in

Closes #1212.
2014-02-28 13:22:34 +01:00
Jan Wagner
5f77fa7510 travis-ci: Remove gawk to build against mawk 2014-02-27 22:23:44 +01:00
Evgeni Golov
2d49468a25 subst.in: remove the led() function
It was only used to replace the 'use lib utils.pm' with the proper
libexec dir, which is now solved by using Perl's FinBin.

Closes #1241
2014-02-27 20:58:49 +01:00
Evgeni Golov
9408c975fe utils.pm: use FindBin instead of awk to find the path to
'use lib utils.pm' is not valid Perl syntax:
 Bareword "utils" not allowed while "strict subs" in use at plugins-scripts/check_ircd.pl line 52.
 Bareword "pm" not allowed while "strict subs" in use at plugins-scripts/check_ircd.pl line 52.

This makes it impossible to use the plugins directly from the git tree,
e.g. while hacking on them.

Using FindBin::Bin as the library path allows that, while preserving
the original behaviour of adding the libexec path when the plugin is
properly installed.
2014-02-27 20:56:50 +01:00