Module: monitoring-plugins
Branch: master
Commit: a9b63deedb1775271fa1335a5d3eb034d0628e91
Author: Lorenz Kästle <[email protected]>
Date: Wed Nov 5 12:04:30 2025 +0100
URL:
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=a9b63dee
check_ntp_peer: add cli param to set output format
---
plugins/check_ntp_peer.c | 50 +++++++++++++++++++++++++++++++--------
plugins/check_ntp_peer.d/config.h | 6 +++++
2 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 032f8ea4..f7cad630 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -478,16 +478,30 @@ ntp_request_result ntp_request(const
check_ntp_peer_config config) {
}
check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) {
- static struct option longopts[] = {
- {"version", no_argument, 0, 'V'}, {"help", no_argument,
0, 'h'},
- {"verbose", no_argument, 0, 'v'}, {"use-ipv4",
no_argument, 0, '4'},
- {"use-ipv6", no_argument, 0, '6'}, {"quiet", no_argument,
0, 'q'},
- {"warning", required_argument, 0, 'w'}, {"critical",
required_argument, 0, 'c'},
- {"swarn", required_argument, 0, 'W'}, {"scrit",
required_argument, 0, 'C'},
- {"jwarn", required_argument, 0, 'j'}, {"jcrit",
required_argument, 0, 'k'},
- {"twarn", required_argument, 0, 'm'}, {"tcrit",
required_argument, 0, 'n'},
- {"timeout", required_argument, 0, 't'}, {"hostname",
required_argument, 0, 'H'},
- {"port", required_argument, 0, 'p'}, {0, 0, 0, 0}};
+
+ enum {
+ output_format_index = CHAR_MAX + 1,
+ };
+
+ static struct option longopts[] = {{"version", no_argument, 0, 'V'},
+
{"help", no_argument, 0, 'h'},
+
{"verbose", no_argument, 0, 'v'},
+
{"use-ipv4", no_argument, 0, '4'},
+
{"use-ipv6", no_argument, 0, '6'},
+
{"quiet", no_argument, 0, 'q'},
+
{"warning", required_argument, 0, 'w'},
+
{"critical", required_argument, 0, 'c'},
+
{"swarn", required_argument, 0, 'W'},
+
{"scrit", required_argument, 0, 'C'},
+
{"jwarn", required_argument, 0, 'j'},
+
{"jcrit", required_argument, 0, 'k'},
+
{"twarn", required_argument, 0, 'm'},
+
{"tcrit", required_argument, 0, 'n'},
+
{"timeout", required_argument, 0, 't'},
+
{"hostname", required_argument, 0, 'H'},
+
{"port", required_argument, 0, 'p'},
+
{"output-format", required_argument, 0, output_format_index},
+ {0,
0, 0, 0}};
if (argc < 2) {
usage("\n");
@@ -507,6 +521,17 @@ check_ntp_peer_config_wrapper process_arguments(int argc,
char **argv) {
}
switch (option_char) {
+ case output_format_index: {
+ parsed_output_format parser =
mp_parse_output_format(optarg);
+ if (!parser.parsing_success) {
+ printf("Invalid output format: %s\n", optarg);
+ exit(STATE_UNKNOWN);
+ }
+
+ result.config.output_format_is_set = true;
+ result.config.output_format = parser.output_format;
+ break;
+ }
case 'h':
print_help();
exit(STATE_UNKNOWN);
@@ -673,6 +698,10 @@ int main(int argc, char *argv[]) {
const check_ntp_peer_config config = tmp_config.config;
+ if (config.output_format_is_set) {
+ mp_set_format(config.output_format);
+ }
+
/* initialize alarm signal handling */
signal(SIGALRM, socket_timeout_alarm_handler);
@@ -825,6 +854,7 @@ void print_help(void) {
printf(" %s\n", _("Critical threshold for number of usable time
sources (\"truechimers\")"));
printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
printf(UT_VERBOSE);
+ printf(UT_OUTPUT_FORMAT);
printf("\n");
printf("%s\n", _("This plugin checks an NTP server independent of any
commandline"));
diff --git a/plugins/check_ntp_peer.d/config.h
b/plugins/check_ntp_peer.d/config.h
index a6dd5c4c..488d936c 100644
--- a/plugins/check_ntp_peer.d/config.h
+++ b/plugins/check_ntp_peer.d/config.h
@@ -1,6 +1,7 @@
#pragma once
#include "../../config.h"
+#include "output.h"
#include "perfdata.h"
#include "thresholds.h"
#include <stddef.h>
@@ -29,6 +30,9 @@ typedef struct {
// jitter stuff
bool do_jitter;
mp_thresholds jitter_thresholds;
+
+ bool output_format_is_set;
+ mp_output_format output_format;
} check_ntp_peer_config;
check_ntp_peer_config check_ntp_peer_config_init() {
@@ -47,6 +51,8 @@ check_ntp_peer_config check_ntp_peer_config_init() {
.do_jitter = false,
.jitter_thresholds = mp_thresholds_init(),
+
+ .output_format_is_set = false,
};
mp_range stratum_default = mp_range_init();
