Commit graph

30 commits

Author SHA1 Message Date
RincewindsHat
8df8460c6c
Fix syntax error resulting from merging 2021-12-02 15:26:31 +01:00
RincewindsHat
df1e9e975f
Merge branch 'master' into mailq-add-config-dir 2021-12-02 15:11:21 +01:00
RincewindsHat
f589b7041f
Merge pull request #1493 from darksoul42/master
Fix regexp for nullmailer "mailq" output.
Looks good. Thank you very much.
2021-11-29 15:39:28 +01:00
Sven Nierlein
aa79ab278f check_mailq: restore accidentially removed options
with https://github.com/monitoring-plugins/monitoring-plugins/issues/381 -W and -C have been removed. It
would have been sufficient to only remove the long options. Restoring short options..

 - fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954961
2020-12-08 16:24:10 +01:00
Stephane Lapie
541322969e Fix regexp for nullmailer "mailq" output
As it currently is, the regular expression does not match mailq command
output on a Debian Jessie setup.

Three erroneous behaviors fixed :
- Meaningful lines do not end with the "bytes" word
- There might be one or more space before the byte count, not 2
- Time match was completely broken, it only accounted for 0-29 minutes
and 0-29 seconds.
2017-06-07 15:12:53 +09:00
Lee Clemens
6246b8f183 Add mailq -C option for config dir or config file
New variable, mailq_args, is appended for postfix mta mailq commands

Fixes #1489
2017-05-16 11:29:01 -04:00
Sven Nierlein
d6baf9dbce change exit code to unknown on help and version info
Signed-off-by: Sven Nierlein <sven@nierlein.de>
2015-10-04 19:24:30 +02:00
Elan Ruusamäe
8079ead7fa drop superfluous libexecdir
utils.pm locate is already convered by FindBin
2015-10-02 13:58:43 +02:00
Holger Weiss
8235fd0aef check_mailq: Add sudo support
This addition is based on a patch contributed by Christopher Schultz.

Closes #1099.
Closes #1171.
2014-12-02 21:13:38 +01:00
Simon Meggle
37b8081504 check_mailq: fixed mailer names
(Closes #1289)
2014-09-29 10:21:11 +02:00
Holger Weiss
1f4fd12845 Don't rely on FindBin module to locate utils.pm
As the FindBin module doesn't work with ePN, set the path to utils.pm
explicitly at build time.  Keep using FindBin additionally, so that the
plugins can also be executed from the build directory.

Closes #1271.
2014-07-06 19:55:03 +02: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
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
Evgeni Golov
1988e49fce check_mailq: add $mailq to check output, so it is easily visible what was autodetected
Closes: #1242
2014-02-27 20:44:58 +01:00
Evgeni Golov
f14ae4b99a check_mailq: document autodetection in the usage output 2014-02-27 20:33:35 +01:00
Evgeni Golov
be9aa5aba2 check_mailq: try to autodetect which mailq implementation we are using
This is done by looking at some common directories and files each
MTA installs on the system. If no known file is found, the old default
sendmail is used. Of course this still can be overridden by -M.
2014-02-27 20:33:14 +01:00
Jan Wagner
2dc150da81 check_mailq: adding nullmailer support
Adding nullmailer support to check_mailq submitted by Luca Corti

Closes: #740
Closes: #1189
2014-01-29 13:45:36 +01:00
Jan Wagner
297d0535c2 Just fixing small typo in comment 2014-01-29 10:12:31 +01:00
Lars Vogdt
42e77f9f51 fix outdated Free Software Foundation address 2014-01-22 11:43:31 +01:00
awiddersheim
0a3252d88d Fix trusted path
When configuring the plugins you have the option to specify a trusted path with --with-trusted-path. This option seems to have been deprecated at some point for unknown reasons and had typically had no affect. This commit makes this option work again for those who have a desire to use it. There should be no affect on those who have not chosen to specify a trusted path.
2013-10-22 10:33:56 -04:00
Ton Voon
5324544855 Typo fixes (Jan Wagner - SF 1878971) 2009-02-20 00:00:13 +00: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
Ton Voon
5f9761ed60 Fixed checking of return codes from external mailq programs
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1443 f882894a-f735-0410-b71e-b25c423dba1c
2006-07-05 13:45:57 +00:00
M. Sean Finney
7a930f77c5 check_mailq fix, don't be case sensitive matching /^\s+Total\sRequests:\s(\d+)$/
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1162 f882894a-f735-0410-b71e-b25c423dba1c
2005-04-14 04:13:13 +00:00
Benoit Mortier
6fc70bc896 fixes for #1094324
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1076 f882894a-f735-0410-b71e-b25c423dba1c
2005-01-03 00:59:48 +00:00
Ton Voon
9328b58595 Added Exim support (768445 - Eric Bollengier)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@726 f882894a-f735-0410-b71e-b25c423dba1c
2003-09-15 15:28:35 +00:00
Ton Voon
2b88e43c88 Added postfix support (Thomas Nilsen - 735218)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@513 f882894a-f735-0410-b71e-b25c423dba1c
2003-05-14 21:59:53 +00:00
Subhendu Ghosh
664be83730 Added sendmail multi-queue support (Canau), merged qmail support (Schmid)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@490 f882894a-f735-0410-b71e-b25c423dba1c
2003-04-13 04:23:56 +00:00
Subhendu Ghosh
ce72bc784d monitor mailq
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@163 f882894a-f735-0410-b71e-b25c423dba1c
2002-10-30 05:07:29 +00:00