upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-03-16 15:42:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

check_smtp: implement output format cli parameter

Browse source
This commit is contained in:
Lorenz Kästle 2025-11-09 11:32:43 +01:00
parent 4442ea917b
commit 62035adf6c
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/check_smtp.c
View file

@ -115,6 +115,10 @@ int main(int argc, char **argv) {
const check_smtp_config config = tmp_config.config;
if (config.output_format_is_set) {
mp_set_format(config.output_format);
}
/* If localhostname not set on command line, use gethostname to set */
char *localhostname = config.localhostname;
if (!localhostname) {
@ -578,7 +582,8 @@ int main(int argc, char **argv) {
/* process command-line arguments */
check_smtp_config_wrapper process_arguments(int argc, char **argv) {
enum {
SNI_OPTION = CHAR_MAX + 1
SNI_OPTION = CHAR_MAX + 1,
output_format_index,
};
int option = 0;
@ -608,6 +613,7 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) {
{"certificate", required_argument, 0, 'D'},
{"ignore-quit-failure", no_argument, 0, 'q'},
{"proxy", no_argument, 0, 'r'},
{"output-format", required_argument, 0, output_format_index},
{0, 0, 0, 0}};
check_smtp_config_wrapper result = {
@ -809,6 +815,18 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) {
exit(STATE_UNKNOWN);
case '?': /* help */
usage5();
case output_format_index: {
parsed_output_format parser = mp_parse_output_format(optarg);
if (!parser.parsing_success) {
// TODO List all available formats here, maybe add anothoer usage function
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;
}
}
}
@ -1015,6 +1033,8 @@ void print_help(void) {
printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
printf(UT_OUTPUT_FORMAT);
printf(UT_VERBOSE);
printf("\n");

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

@ -1,6 +1,7 @@
#pragma once
#include "../../config.h"
#include "output.h"
#include "thresholds.h"
#include <stddef.h>
#include <string.h>
@ -46,6 +47,9 @@ typedef struct {
bool use_starttls;
bool use_sni;
#endif
bool output_format_is_set;
mp_output_format output_format;
} check_smtp_config;
check_smtp_config check_smtp_config_init() {
@ -83,6 +87,8 @@ check_smtp_config check_smtp_config_init() {
.use_starttls = false,
.use_sni = false,
#endif
.output_format_is_set = false,
};
return tmp;
}