[monitoring-plugins] Rename icingaweb2 format to multi-line
Lorenz Kästle
git at monitoring-plugins.org
Fri Feb 21 14:40:12 CET 2025
Module: monitoring-plugins
Branch: master
Commit: 1d590a0efe4193ac9298d3eba448ab8bc3bb665b
Author: Lorenz Kästle <12514511+RincewindsHat at users.noreply.github.com>
Date: Thu Feb 20 23:52:32 2025 +0100
URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=1d590a0e
Rename icingaweb2 format to multi-line
---
lib/output.c | 8 ++++----
lib/output.h | 4 ++--
plugins/utils.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/output.c b/lib/output.c
index 07a77165..17919afc 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -235,7 +235,7 @@ char *mp_fmt_output(mp_check check) {
char *result = NULL;
switch (check.format) {
- case MP_FORMAT_ICINGA_WEB_2: {
+ case MP_FORMAT_MULTI_LINE: {
if (check.summary == NULL) {
check.summary = get_subcheck_summary(check);
}
@@ -245,7 +245,7 @@ char *mp_fmt_output(mp_check check) {
mp_subcheck_list *subchecks = check.subchecks;
while (subchecks != NULL) {
- asprintf(&result, "%s\n%s", result, fmt_subcheck_output(MP_FORMAT_ICINGA_WEB_2, subchecks->subcheck, 1));
+ asprintf(&result, "%s\n%s", result, fmt_subcheck_output(MP_FORMAT_MULTI_LINE, subchecks->subcheck, 1));
subchecks = subchecks->next;
}
@@ -330,7 +330,7 @@ static inline char *fmt_subcheck_output(mp_output_format output_format, mp_subch
mp_subcheck_list *subchecks = NULL;
switch (output_format) {
- case MP_FORMAT_ICINGA_WEB_2:
+ case MP_FORMAT_MULTI_LINE:
asprintf(&result, "%s\\_[%s] - %s", generate_indentation_string(indentation), state_text(mp_compute_subcheck_state(check)),
check.output);
@@ -510,7 +510,7 @@ mp_subcheck mp_set_subcheck_default_state(mp_subcheck check, mp_state_enum state
}
char *mp_output_format_map[] = {
- [MP_FORMAT_ICINGA_WEB_2] = "icingaweb2",
+ [MP_FORMAT_MULTI_LINE] = "multi-line",
[MP_FORMAT_TEST_JSON] = "mp-test-json",
};
diff --git a/lib/output.h b/lib/output.h
index 14c4bcf4..ffc36f53 100644
--- a/lib/output.h
+++ b/lib/output.h
@@ -29,11 +29,11 @@ typedef struct subcheck_list {
* Possible output formats
*/
typedef enum output_format {
- MP_FORMAT_ICINGA_WEB_2,
+ MP_FORMAT_MULTI_LINE,
MP_FORMAT_TEST_JSON,
} mp_output_format;
-#define MP_FORMAT_DEFAULT MP_FORMAT_ICINGA_WEB_2
+#define MP_FORMAT_DEFAULT MP_FORMAT_MULTI_LINE
/*
* The main state object of a plugin. Exists only ONCE per plugin.
diff --git a/plugins/utils.h b/plugins/utils.h
index bc26f704..029ae5a6 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -197,6 +197,6 @@ For more information about these matters, see the file named COPYING.\n")
#define UT_OUTPUT_FORMAT _("\
--output-format=OUTPUT_FORMAT\n\
- Select output format. Valid values: \"icingaweb2\", \"mp-test-json\"\n")
+ Select output format. Valid values: \"multi-line\", \"mp-test-json\"\n")
#endif /* NP_UTILS_H */
More information about the Commits
mailing list