Merge pull request #2173 from RincewindsHat/modern_output/check_pgsqlHEADmaster

Modern output/check pgsql

1 files changed, 19 insertions, 10 deletions

diff --git a/plugins/check_pgsql.d/config.h b/plugins/check_pgsql.d/config.h
index 2d4b8b89..7cf0637b 100644
--- a/plugins/check_pgsql.d/config.h
+++ b/plugins/check_pgsql.d/config.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
+#include "perfdata.h"
 #include "thresholds.h"
 #include <stddef.h>
 #include <pg_config_manual.h>
@@ -24,11 +26,11 @@ typedef struct {
         char *pgquery;
         char *pgqueryname;
 
-        double twarn;
-        double tcrit;
-        thresholds *qthresholds;
-        char *query_warning;
-        char *query_critical;
+        mp_thresholds time_thresholds;
+        mp_thresholds qthresholds;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_pgsql_config;
 
 /* begin, by setting the parameters for a backend connection if the
@@ -51,11 +53,18 @@ check_pgsql_config check_pgsql_config_init() {
                 .pgquery = NULL,
                 .pgqueryname = NULL,
 
-                .twarn = (double)DEFAULT_WARN,
-                .tcrit = (double)DEFAULT_CRIT,
-                .qthresholds = NULL,
-                .query_warning = NULL,
-                .query_critical = NULL,
+                .time_thresholds = mp_thresholds_init(),
+                .qthresholds = mp_thresholds_init(),
+
+                .output_format_is_set = false,
         };
+
+        mp_range tmp_range = mp_range_init();
+        tmp_range = mp_range_set_end(tmp_range, mp_create_pd_value(DEFAULT_WARN));
+        tmp.time_thresholds = mp_thresholds_set_warn(tmp.time_thresholds, tmp_range);
+
+        tmp_range = mp_range_set_end(tmp_range, mp_create_pd_value(DEFAULT_CRIT));
+        tmp.time_thresholds = mp_thresholds_set_crit(tmp.time_thresholds, tmp_range);
+
         return tmp;
 }