summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-02-15Merge pull request #1584 from DerDakon/typoSven Nierlein1-1/+1
check_dns: fix typo in parameter description
2019-02-15check_dns: fix typo in parameter descriptionrefs/pull/1584/headRolf Eike Beer1-1/+1
2019-02-15check_by_ssh: fix child process leak on timeoutsrefs/pull/1583/headSven Nierlein11-107/+70
When check_by_ssh runs into a timeout it simply exits keeping all child processes running. Simply adopting the kill loop from runcmd_timeout_alarm_handler() fixes this. Signed-off-by: Sven Nierlein <sven@nierlein.de>
2019-02-15Merge pull request #1582 from towolf/show_body_for_http_expect_caseSven Nierlein1-0/+2
Also support the --show-body/-B flag when --expect is used
2019-02-15Merge pull request #1545 from DerDakon/dns_orderSven Nierlein3-9/+30
check_dns: improve support for checking multiple addresses
2019-02-12Also support the --show-body/-B flag when --expect is usedrefs/pull/1582/headTobias Wolf1-0/+2
2019-02-06Merge branch 'travis-ci-xenial'Jan Wagner2-8/+8
2019-02-04travis-ci: Use RSA keys for SSH testsrefs/pull/1580/headJan Wagner2-3/+3
2019-02-02travis-ci: Restart mysqlJan Wagner1-0/+1
2019-02-02travis-ci: The package name is now 'squid'Jan Wagner1-3/+3
2019-02-02travis-ci: Remove backports ppaJan Wagner1-1/+0
2019-02-02travis-ci: Switch over to xenialJan Wagner1-1/+1
2019-02-01Merge pull request #1578 from sni/tests_fix_snmp_testSven Nierlein1-52/+58
tests: make check_snmp test more reliable
2019-01-21tests: make check_snmp test more reliablerefs/pull/1578/headSven Nierlein1-52/+58
The check_snmp rate tests depend on the exact amount of time spend between the plugin runs and will fail on busy machines, ex. the ci servers. Using faketime mitigates this issue and also removes all the sleeps. Signed-off-by: Sven Nierlein <sven@nierlein.de>
2019-01-20Merge pull request #1574 from waja/check_smtp_custom_command_sslJan Wagner1-0/+1
Simply initializes n before it is used
2019-01-18Simply initializes n before it is usedrefs/pull/1574/headIustin Pop1-0/+1
When SSL is enabled, n is assigned the size of the server's second EHLO response (I think in bytes), which will usually be significantly higher than the command passed. As such, no commands are executed and no responses are checked, which - silently - defeats the desired checks and results in a success value.
2019-01-04Merge pull request #1569 from jacobbaungard/check_hpjd_disable_paper_outSven Nierlein1-3/+9
check_hpjd: Added -D option to disable warning on 'out of paper'
2019-01-04check_hpjd: Added -D option to disable warning on 'out of paper'refs/pull/1569/headKostyantyn Hushchyn1-3/+9
Signed-off-by: Kostyantyn Hushchyn <kgushtin@op5.com>
2018-12-10check_icmp: Do not overwrite -4,-6 on lookuprefs/pull/1563/headJacob Hansen1-2/+10
In case we needed to do a lookup, we previously overwrote the address_family to IPv6, even if we supplied -4 as a cmd line argument. This commit should ensure the cmd line argument is always followed. Signed-off-by: Jacob Hansen <jhansen@op5.com>
2018-12-10check_icmp: emit error if multiple protocol versionJacob Hansen1-0/+4
As we do not support checking both IPv4 and IPv6 hosts in one execution we emit an error if multiple protocol versions are defined in the cmd line args. Signed-off-by: Jacob Hansen <jhansen@op5.com>
2018-12-10check_icmp: move opts string into a variableJacob Hansen1-2/+3
This commit moves the opts string into a variable as it is now used twice. Signed-off-by: Jacob Hansen <jhansen@op5.com>
2018-12-08[check_disk] add support to display inodes usage in perfdatarefs/pull/1567/headVincent Danjean5-5/+58
This is not enabled by default It can be enabled with the -P (--iperfdata) option
2018-12-07Merge pull request #1564 from jacobbaungard/check_cluster_arg_validationSven Nierlein1-0/+10
check_cluster.c: Added data argument validation.
2018-12-07check_icmp: Correctly set address_family on lookupJacob Hansen1-1/+2
If a hostname is supplied instead of an IP address, the automatic address family detection would fail to correctly set the IP protocol version (it would always be IPv6). We now supply AF_UNSPEC to getaddrinfo, which should then return the correct address family in the result. Signed-off-by: Jacob Hansen <jhansen@op5.com>
2018-12-07check_icmp: removed outcommented codeJacob Hansen1-7/+0
Signed-off-by: Jacob Hansen <jhansen@op5.com>
2018-12-07check_icmp: process protocol version args firstJacob Hansen1-10/+22
Detection of protocol version is in the previous patch implemented in the add_target() function, which is called when adding the -H command line argument. That means that if a protocal version argument (-4, -6) is added after the -H then the protocol version might be incorrectly set. This patch ensures that we first process the protocol version arguments, and then we process the rest of the arguments. Signed-off-by: Jacob Hansen <jhansen@op5.com>
2018-12-07check_icmp: Automatically detect IP protocolJacob Hansen1-26/+45
This patch automatically detects whether the protocol version is IPv4 or IPv6 All credits to: https://github.com/ghciv6 Signed-off-by: Jacob Hansen <jhansen@op5.com>
2018-12-07Fixed parameter handling after 01efbb2183d49c5082598d4799788fc385342f28Lars Michelsen1-38/+38
2018-12-07check_icmp: Add IPv6 supportLars Michelsen1-161/+330
This commit adds IPv6 capabilities to check_icmp. It is now possible to specify the address family using the arguments -4 (default) or -6. To make the change possible we had to move the argument parsing previous to creating the socket to be able to create it with the correct address family. This commit also fixes some gcc 4.9.2 compiler warnings. It has been tested with several current linux distributions (debian, ubuntu, rh, sles). This commit fixes monitoring-plugins/monitoring-plugins#1291
2018-12-07Merge pull request #1565 from sni/travis_run_plugin_root_testsSven Nierlein18-438/+212
Travis run plugin root tests
2018-12-05plugins: check_http: Increase regexp limitrefs/pull/1566/headTomas Mozes1-1/+1
2018-12-04tests: rework test parametersrefs/pull/1565/headSven Nierlein16-303/+107
there were 2 variants of calling getTestParameter: - parameter, description, default value - parameter, env value, default value, description, scope While scope was never actually used and having 2 names for the same value led to having 2 different entries in the cache file for the same configuration. This commit removes the variants and simplifies tests parameters by only using the first 3 parameter variant.
2018-12-04NPTest: unify whitespaceSven Nierlein1-73/+73
2018-12-04tests: skip some tests if Monitoring::Plugin::Range isn't availableSven Nierlein1-67/+36
The check_file_age uses Monitoring::Plugin::Range internally. Skip thoses tests if the module isn't available.
2018-12-04tests: enable plugins-root testsSven Nierlein1-0/+1
2018-11-29check_cluster.c: Added data argument validation.refs/pull/1564/headKostyantyn Hushchyn1-0/+10
Signed-off-by: Kostyantyn Hushchyn <kgushtin@op5.com>
2018-11-12set hostname in for CURLOPT_CURL to virtual hostname in case of SSL (for SNI ↵Andreas Baumann1-1/+1
to work)
2018-11-10Merge remote-tracking branch 'monitoring-plugins/pr/1560'Holger Weiss1-1/+11
* monitoring-plugins/pr/1560: Add new flag --show-body/-B to print body
2018-11-09Add new flag --show-body/-B to print bodyrefs/pull/1560/headTobias Wolf1-1/+11
This should help with figuring out ia problem at a glance when enabled for healthz endpoints on web APIs, for example. The content of the body can point to what the problem is and help with diagnostics. Fixes #1559
2018-11-06Merge remote-tracking branch 'monitoring-plugins/pr/1476'Holger Weiss5-5/+8023
* monitoring-plugins/pr/1476: test: Add proxy tests via proxy Allow user to specify HTTP method after proxy CONNECT
2018-11-06test: Add proxy tests via proxyrefs/pull/1476/headMarkus Frosch4-2/+8009
On Travis with a local squid
2018-11-06Allow user to specify HTTP method after proxy CONNECTMarkus Frosch1-3/+14
Simple format, avoids refactoring the CONNECT feature.
2018-10-29check_curl: code cleanupSven Nierlein1-11/+0
CURLOPT_RESOLVE is not required, since we do not verify certificates in any way.
2018-10-25check_curl: rewrite connect_to / host headersSven Nierlein2-28/+35
since CURLOPT_CONNECT_TO is only available in later curl versions, we do it the other way round now and set the url from the address we want to connect to and then set the host header accordingly.
2018-10-24check_curl: code cleanupSven Nierlein1-1/+2
2018-10-24check_curl: handle supplied port correctlySven Nierlein1-4/+6
if a port was given by -p, it should not be overruled by the port extracted from -H.
2018-10-24check_curl: fix builds if curl is not enabledSven Nierlein2-2/+2
2018-10-24travis: --enable-check-curl is no longer requiredSven Nierlein1-1/+1
2018-10-24cleanup gitignoreSven Nierlein1-6/+0
these files have been removed meanwhile
2018-10-24builds: alway put picohttpparser into the dist tarballSven Nierlein2-4/+1
substituting PICOHTTPPARSER_DIR only when curl gets build, leads to different dist tarballs depending on wether libcurl was available or not. This then breaks later builds from this tarball because of the missing files.