upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-06-08 16:26:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Remove output formats one-line and summary-only

Browse source
This commit is contained in:
Lorenz Kästle 2025-02-20 23:45:13 +01:00
parent f7f958eee7
commit 3cd29d86cc
3 changed files with 1 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
lib/output.c
View file

@ -235,35 +235,6 @@ char *mp_fmt_output(mp_check check) {
char *result = NULL;
switch (check.format) {
case MP_FORMAT_SUMMARY_ONLY:
if (check.summary == NULL) {
check.summary = get_subcheck_summary(check);
}
asprintf(&result, "%s: %s", state_text(mp_compute_check_state(check)), check.summary);
return result;
case MP_FORMAT_ONE_LINE: {
/* SERVICE STATUS: First line of output | First part of performance data
* Any number of subsequent lines of output, but note that buffers
* may have a limited size | Second part of performance data, which
* may have continuation lines, too
*/
if (check.summary == NULL) {
check.summary = get_subcheck_summary(check);
}
asprintf(&result, "%s: %s", state_text(mp_compute_check_state(check)), check.summary);
mp_subcheck_list *subchecks = check.subchecks;
while (subchecks != NULL) {
asprintf(&result, "%s - %s", result, fmt_subcheck_output(MP_FORMAT_ONE_LINE, subchecks->subcheck, 1));
subchecks = subchecks->next;
}
return result;
}
case MP_FORMAT_ICINGA_WEB_2: {
if (check.summary == NULL) {
check.summary = get_subcheck_summary(check);
@ -370,18 +341,6 @@ static inline char *fmt_subcheck_output(mp_output_format output_format, mp_subch
subchecks = subchecks->next;
}
return result;
case MP_FORMAT_ONE_LINE:
asprintf(&result, "[%s] - %s", state_text(mp_compute_subcheck_state(check)), check.output);
subchecks = check.subchecks;
while (subchecks != NULL) {
asprintf(&result, " - %s\n%s", result, fmt_subcheck_output(output_format, subchecks->subcheck, indentation + 1));
subchecks = subchecks->next;
}
return result;
case MP_FORMAT_SUMMARY_ONLY:
return result;
default:
die(STATE_UNKNOWN, "Invalid format");
}
@ -551,9 +510,7 @@ mp_subcheck mp_set_subcheck_default_state(mp_subcheck check, mp_state_enum state
}
char *mp_output_format_map[] = {
[MP_FORMAT_ONE_LINE] = "one-line",
[MP_FORMAT_ICINGA_WEB_2] = "icingaweb2",
[MP_FORMAT_SUMMARY_ONLY] = "summary-only",
[MP_FORMAT_TEST_JSON] = "mp-test-json",
};

2
lib/output.h
View file

@ -29,9 +29,7 @@ typedef struct subcheck_list {
* Possible output formats
*/
typedef enum output_format {
MP_FORMAT_ONE_LINE,
MP_FORMAT_ICINGA_WEB_2,
MP_FORMAT_SUMMARY_ONLY,
MP_FORMAT_TEST_JSON,
} mp_output_format;

2
plugins/check_swap.c
View file

@ -382,7 +382,7 @@ void print_help(swap_config config) {
"Default:"),
state_text(config.no_swap_state));
printf(" %s\n", "--output-format");
printf(" %s\n", _("Select output format. Valid values: \"one-line\", \"icingaweb2\", \"summary-only\", \"mp-test-json\""));
printf(" %s\n", _("Select output format. Valid values: \"icingaweb2\", \"mp-test-json\""));
printf(UT_VERBOSE);
printf("\n");