diff options
author | Oliver Skibbe <oliskibbe@gmail.com> | 2016-11-19 15:36:26 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-19 15:36:26 (GMT) |
commit | 6026ff5c1899b7b2516f9fb21b8ffb4b73168722 (patch) | |
tree | d8406d6a002a2e7e114224b2d78f81fb750dbe4a | |
parent | 4430b63b0f6e1388a0f931b597fef64817ce0614 (diff) | |
parent | d9d82309e25780629e428b10c6f7d7cadc93b048 (diff) | |
download | monitoring-plugins-6026ff5c1899b7b2516f9fb21b8ffb4b73168722.tar.gz |
Merge pull request #1374 from riskersen/check_http_perfdata_timeo
check_http: added timeout to perfdata as max val
Resolves #1350
-rw-r--r-- | plugins/check_http.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/check_http.c b/plugins/check_http.c index 2347a6f..e5ef7cc 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
@@ -1479,32 +1479,32 @@ char *perfd_time (double elapsed_time) | |||
1479 | return fperfdata ("time", elapsed_time, "s", | 1479 | return fperfdata ("time", elapsed_time, "s", |
1480 | thlds->warning?TRUE:FALSE, thlds->warning?thlds->warning->end:0, | 1480 | thlds->warning?TRUE:FALSE, thlds->warning?thlds->warning->end:0, |
1481 | thlds->critical?TRUE:FALSE, thlds->critical?thlds->critical->end:0, | 1481 | thlds->critical?TRUE:FALSE, thlds->critical?thlds->critical->end:0, |
1482 | TRUE, 0, FALSE, 0); | 1482 | TRUE, 0, TRUE, socket_timeout); |
1483 | } | 1483 | } |
1484 | 1484 | ||
1485 | char *perfd_time_connect (double elapsed_time_connect) | 1485 | char *perfd_time_connect (double elapsed_time_connect) |
1486 | { | 1486 | { |
1487 | return fperfdata ("time_connect", elapsed_time_connect, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0); | 1487 | return fperfdata ("time_connect", elapsed_time_connect, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout); |
1488 | } | 1488 | } |
1489 | 1489 | ||
1490 | char *perfd_time_ssl (double elapsed_time_ssl) | 1490 | char *perfd_time_ssl (double elapsed_time_ssl) |
1491 | { | 1491 | { |
1492 | return fperfdata ("time_ssl", elapsed_time_ssl, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0); | 1492 | return fperfdata ("time_ssl", elapsed_time_ssl, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout); |
1493 | } | 1493 | } |
1494 | 1494 | ||
1495 | char *perfd_time_headers (double elapsed_time_headers) | 1495 | char *perfd_time_headers (double elapsed_time_headers) |
1496 | { | 1496 | { |
1497 | return fperfdata ("time_headers", elapsed_time_headers, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0); | 1497 | return fperfdata ("time_headers", elapsed_time_headers, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout); |
1498 | } | 1498 | } |
1499 | 1499 | ||
1500 | char *perfd_time_firstbyte (double elapsed_time_firstbyte) | 1500 | char *perfd_time_firstbyte (double elapsed_time_firstbyte) |
1501 | { | 1501 | { |
1502 | return fperfdata ("time_firstbyte", elapsed_time_firstbyte, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0); | 1502 | return fperfdata ("time_firstbyte", elapsed_time_firstbyte, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout); |
1503 | } | 1503 | } |
1504 | 1504 | ||
1505 | char *perfd_time_transfer (double elapsed_time_transfer) | 1505 | char *perfd_time_transfer (double elapsed_time_transfer) |
1506 | { | 1506 | { |
1507 | return fperfdata ("time_transfer", elapsed_time_transfer, "s", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0); | 1507 | return fperfdata ("time_transfer", elapsed_time_transfer, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout); |
1508 | } | 1508 | } |
1509 | 1509 | ||
1510 | char *perfd_size (int page_len) | 1510 | char *perfd_size (int page_len) |