upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-21 22:29:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

check_ntp_time: add cli option for output format

Browse source
This commit is contained in:
Lorenz Kästle 2025-11-05 12:19:20 +01:00
parent 8062f83675
commit 71e0d5e073
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/check_ntp_time.c
View file

@ -505,6 +505,11 @@ static offset_request_wrapper offset_request(const char *host, const char *port,
}
static check_ntp_time_config_wrapper process_arguments(int argc, char **argv) {
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'},
@ -517,6 +522,7 @@ static check_ntp_time_config_wrapper process_arguments(int argc, char **argv) {
{"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) {
@ -536,6 +542,17 @@ static check_ntp_time_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);
@ -623,6 +640,10 @@ int main(int argc, char *argv[]) {
const check_ntp_time_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);
@ -687,6 +708,7 @@ void print_help(void) {
printf(" %s\n", _("Expected offset of the ntp server relative to local server (seconds)"));
printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
printf(UT_VERBOSE);
printf(UT_OUTPUT_FORMAT);
printf("\n");
printf("%s\n", _("This plugin checks the clock offset between the local host and a"));

6
plugins/check_ntp_time.d/config.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "../../config.h"
#include "output.h"
#include "thresholds.h"
#include <stddef.h>
@ -12,6 +13,9 @@ typedef struct {
int time_offset;
mp_thresholds offset_thresholds;
bool output_format_is_set;
mp_output_format output_format;
} check_ntp_time_config;
check_ntp_time_config check_ntp_time_config_init() {
@ -23,6 +27,8 @@ check_ntp_time_config check_ntp_time_config_init() {
.time_offset = 0,
.offset_thresholds = mp_thresholds_init(),
.output_format_is_set = false,
};
mp_range warning = mp_range_init();