Module: monitoring-plugins
Branch: master
Commit: e2397167c7e5c7a02b68de45de946f63706e7d12
Author: datamuc <d...@consol.de>
Committer: GitHub <nore...@github.com>
Date: Tue Jan 25 10:57:02 2022 +0100
URL:
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=e239716
add --queryname parameter to check_pgsql (#1741)
This is used in the long output instead of the actual query.
So instead of
OK - 'select stuff from various, tables where some_stuff is null and
other_stuff is not null' returned 42
one can use --queryname=check_greatest_basket and it will print
OK - check_greatest_basket returned 42
That's nicer for alerting purposes, at least in our use case.
---
plugins/check_pgsql.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index b8fc5f1..c893386 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -85,6 +85,8 @@ char *pgparams = NULL;
double twarn = (double)DEFAULT_WARN;
double tcrit = (double)DEFAULT_CRIT;
char *pgquery = NULL;
+#define OPTID_QUERYNAME -1000
+char *pgqueryname = NULL;
char *query_warning = NULL;
char *query_critical = NULL;
thresholds *qthresholds = NULL;
@@ -285,6 +287,7 @@ process_arguments (int argc, char **argv)
{"database", required_argument, 0, 'd'},
{"option", required_argument, 0, 'o'},
{"query", required_argument, 0, 'q'},
+ {"queryname", required_argument, 0, OPTID_QUERYNAME},
{"query_critical", required_argument, 0, 'C'},
{"query_warning", required_argument, 0, 'W'},
{"verbose", no_argument, 0, 'v'},
@@ -368,6 +371,9 @@ process_arguments (int argc, char **argv)
case 'q':
pgquery = optarg;
break;
+ case OPTID_QUERYNAME:
+ pgqueryname = optarg;
+ break;
case 'v':
verbose++;
break;
@@ -529,6 +535,9 @@ print_help (void)
printf (" %s\n", "-q, --query=STRING");
printf (" %s\n", _("SQL query to run. Only first column in first row
will be read"));
+ printf (" %s\n", "--queryname=STRING");
+ printf (" %s\n", _("A name for the query, this string is used
instead of the query"));
+ printf (" %s\n", _("in the long output of the plugin"));
printf (" %s\n", "-W, --query-warning=RANGE");
printf (" %s\n", _("SQL query value to result in warning status
(double)"));
printf (" %s\n", "-C, --query-critical=RANGE");
@@ -642,7 +651,13 @@ do_query (PGconn *conn, char *query)
: (my_status == STATE_CRITICAL)
? _("CRITICAL")
: _("UNKNOWN"));
- printf (_("'%s' returned %f"), query, value);
+ if(pgqueryname) {
+ printf (_("%s returned %f"), pgqueryname, value);
+ }
+ else {
+ printf (_("'%s' returned %f"), query, value);
+ }
+
printf ("|query=%f;%s;%s;;\n", value,
query_warning ? query_warning : "",
query_critical ? query_critical : "");
