Changes to support new pg.query2.* keys

Author: robbrucks

Diff for: ChangeLog

@@ -1,3 +1,7 @@
+v1.1.0 19 Aug 2016
+
+* Implemented `pg.query2.*` keys - Rob Brucks
+
 v1.0.0 26 Jun 2016
 
 * Added support for Zabbix v3

Diff for: configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libzbxpgsql], [1.0.0], [[email protected]])
+AC_INIT([libzbxpgsql], [1.1.0], [[email protected]])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 m4_pattern_allow([AM_PROG_AR])
 AM_PROG_AR

Diff for: query.conf

@@ -0,0 +1,24 @@
+# file: /etc/libzbxpgsql.d/query.conf
+# 
+# This file contains SQL to be executed by `pg_query2.*` keys
+# It is parsed by the C libconfig module 
+#    http://www.hyperrealm.com/main.php?s=libconfig
+#
+# The format of the file is:
+#   SQLkey = "SQL statement"
+#
+# SQL must be enclosed in double quotes.  Double quotes
+# inside the SQL must be escaped with a backslash.
+#
+# Any syntax error in the file will prevent the entire
+# file from being parsed correctly.
+#
+# SQL statements can span multiple lines:
+#   longsql = "select count(*)
+#                from pg_stat_activity;"
+#
+#  Testing Queries
+test1 = "SELECT 'Lorem ipsum dolor';"
+test2 = "SELECT pg_backend_pid();"
+test3 = "SELECT CAST(1234 AS double precision);"
+test4 = "SELECT * FROM pg_database;"

Diff for: src/Makefile.am

@@ -12,6 +12,7 @@ libzbxpgsql_la_SOURCES = \
 	pg_namespace.c \
 	pg_params.c \
 	pg_query.c \
+	pg_query2.c \
 	pg_server.c \
 	pg_setting.c \
 	pg_table.c \
@@ -26,6 +27,7 @@ libzbxpgsql_la_CFLAGS = \
 
 libzbxpgsql_la_LDFLAGS = \
 	-shared \
+	-lconfig \
 	-avoid-version
 
 # Prevent install of the redundant *.la files

Diff for: src/libzbxpgsql.c

@@ -46,6 +46,12 @@ static ZBX_METRIC keys[] =
     {"pg.query.integer",            CF_HAVEPARAMS,  PG_QUERY,                       ",,SELECT pg_backend_pid();"},
     {"pg.query.double",             CF_HAVEPARAMS,  PG_QUERY,                       ",,SELECT CAST(1234 AS double precision);"},
     {"pg.query.discovery",          CF_HAVEPARAMS,  PG_QUERY,                       ",,SELECT * FROM pg_database;"},
+
+    // User queries from config file
+    {"pg.query2.string",            CF_HAVEPARAMS,  PG_QUERY2,                      ",,test1"},
+    {"pg.query2.integer",           CF_HAVEPARAMS,  PG_QUERY2,                      ",,test2"},
+    {"pg.query2.double",            CF_HAVEPARAMS,  PG_QUERY2,                      ",,test3"},
+    {"pg.query2.discovery",         CF_HAVEPARAMS,  PG_QUERY2,                      ",,test4"},
 
     // Client connection statistics
     {"pg.backends.count",           CF_HAVEPARAMS,  PG_BACKENDS_COUNT,              NULL},

Diff for: src/libzbxpgsql.h

@@ -27,6 +27,11 @@
 // PostgreSQL headers
 #include <libpq-fe.h>
 
+// Reading Config Files
+#include <stdio.h>
+#include <stdlib.h>
+#include <libconfig.h>
+
 // Zabbix source headers
 #include <sysinc.h>
 #include <module.h>
@@ -108,6 +113,7 @@ int     PG_SETTING(AGENT_REQUEST *request, AGENT_RESULT *result);
 int     PG_SETTING_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result);
 
 int     PG_QUERY(AGENT_REQUEST *request, AGENT_RESULT *result);
+int     PG_QUERY2(AGENT_REQUEST *request, AGENT_RESULT *result);
 
 int     PG_BACKENDS_COUNT(AGENT_REQUEST *request, AGENT_RESULT *result);
 int     PG_BACKENDS_FREE(AGENT_REQUEST *request, AGENT_RESULT *result);
@@ -155,4 +161,4 @@ int     PG_INDEX_IDX_BLKS_RATIO(AGENT_REQUEST *request, AGENT_RESULT *result);
 int     PG_INDEX_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result);
 int     PG_INDEX_ROWS(AGENT_REQUEST *request, AGENT_RESULT *result);
 
-#endif
+#endif