![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 16b9a96e1b1f2306242c54a0dd4160e08a1dd9be..d56ce9b0e2b5e5264440e552c939c24c325df915 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ $Id$
+
*****************************************************************************/
+const char *progname = "check_pgsql";
+const char *revision = "$Revision$";
+const char *copyright = "1999-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+#include "common.h"
+#include "utils.h"
+
+#include "netutils.h"
+#include <libpq-fe.h>
+
#define DEFAULT_DB "template1"
#define DEFAULT_HOST "127.0.0.1"
DEFAULT_CRIT = 8
};
-#include "common.h"
-#include "utils.h"
-#include "netutils.h"
-#include <libpq-fe.h>
+
int process_arguments (int, char **);
int validate_arguments (void);
char dbName[NAMEDATALEN] = DEFAULT_DB;
char *pguser = NULL;
char *pgpasswd = NULL;
-int twarn = DEFAULT_WARN;
-int tcrit = DEFAULT_CRIT;
+double twarn = (double)DEFAULT_WARN;
+double tcrit = (double)DEFAULT_CRIT;
PGconn *conn;
/*PGresult *res;*/
-const char *progname = "check_pgsql";
-const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
-\f
/******************************************************************************
<title>Functions</title>
-@@
******************************************************************************/
-\f
-
main (int argc, char **argv)
{
int elapsed_time;
+ int status = STATE_UNKNOWN;
/* begin, by setting the parameters for a backend connection if the
* parameters are null, then the system will try to use reasonable
textdomain (PACKAGE);
if (process_arguments (argc, argv) == ERROR)
- usage ("Could not parse arguments");
+ usage4 (_("Could not parse arguments"));
/* Set signal handling and alarm */
if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
- printf (_("Cannot catch SIGALRM"));
- return STATE_UNKNOWN;
+ usage4 (_("Cannot catch SIGALRM"));
}
alarm (timeout_interval);
/* check to see that the backend connection was successfully made */
if (PQstatus (conn) == CONNECTION_BAD) {
- printf (_("PGSQL: CRITICAL - no connection to '%s' (%s).\n"), dbName,
- PQerrorMessage (conn));
+ printf (_("CRITICAL - no connection to '%s' (%s).\n"),
+ dbName, PQerrorMessage (conn));
PQfinish (conn);
return STATE_CRITICAL;
}
else if (elapsed_time > tcrit) {
- PQfinish (conn);
- printf (_("PGSQL: CRITICAL - database %s (%d sec.)\n"), dbName,
- elapsed_time);
- return STATE_CRITICAL;
+ status = STATE_CRITICAL;
}
else if (elapsed_time > twarn) {
- PQfinish (conn);
- printf (_("PGSQL: WARNING - database %s (%d sec.)\n"), dbName, elapsed_time);
- return STATE_WARNING;
+ status = STATE_WARNING;
}
else {
- PQfinish (conn);
- printf (_("PGSQL: ok - database %s (%d sec.)\n"), dbName, elapsed_time);
- return STATE_OK;
+ status = STATE_OK;
}
+ PQfinish (conn);
+ printf (_(" %s - database %s (%d sec.)|%s\n"),
+ state_text(status), dbName, elapsed_time,
+ fperfdata("time", elapsed_time, "s",
+ (int)twarn, twarn, (int)tcrit, tcrit, TRUE, 0, FALSE,0));
+ return status;
}
-\f
+
/* process command-line arguments */
switch (c) {
case '?': /* usage */
- usage3 (_("Unknown argument"), optopt);
- break;
+ usage2 (_("Unknown argument"), optarg);
case 'h': /* help */
print_help ();
exit (STATE_OK);
exit (STATE_OK);
case 't': /* timeout period */
if (!is_integer (optarg))
- usage2 (_("Timeout Interval must be an integer"), optarg);
+ usage2 (_("Timeout interval must be a positive integer"), optarg);
else
timeout_interval = atoi (optarg);
break;
case 'c': /* critical time threshold */
- if (!is_integer (optarg))
- usage2 (_("Invalid critical threshold"), optarg);
+ if (!is_nonnegative (optarg))
+ usage2 (_("Critical threshold must be a positive integer"), optarg);
else
- tcrit = atoi (optarg);
+ tcrit = strtod (optarg, NULL);
break;
case 'w': /* warning time threshold */
- if (!is_integer (optarg))
- usage2 (_("Invalid critical threshold"), optarg);
+ if (!is_nonnegative (optarg))
+ usage2 (_("Warning threshold must be a positive integer"), optarg);
else
- twarn = atoi (optarg);
+ twarn = strtod (optarg, NULL);
break;
case 'H': /* host */
if (!is_host (optarg))
- usage2 (_("You gave an invalid host name"), optarg);
+ usage2 (_("Invalid hostname/address"), optarg);
else
pghost = optarg;
break;
case 'P': /* port */
if (!is_integer (optarg))
- usage2 (_("Port must be an integer"), optarg);
+ usage2 (_("Port must be a positive integer"), optarg);
else
pgport = optarg;
break;
break;
case 'l': /* login name */
if (!is_pg_logname (optarg))
- usage2 (_("user name is not valid"), optarg);
+ usage2 (_("User name is not valid"), optarg);
else
pguser = optarg;
break;
-@@
******************************************************************************/
+
+
int
validate_arguments ()
{
return OK;
}
-\f
/******************************************************************************
-@@
******************************************************************************/
+
+
int
is_pg_dbname (char *dbname)
{
-@@
******************************************************************************/
+
+
int
is_pg_logname (char *username)
{
</article>
-@@
******************************************************************************/
-\f
-
print_revision (progname, revision);
- printf (_(COPYRIGHT), copyright, email);
+ printf (COPYRIGHT, copyright, email);
- printf (_("Test whether a PostgreSQL DBMS is accepting connections.\n\n"));
+ printf (_("Test whether a PostgreSQL Database is accepting connections.\n\n"));
print_usage ();
printf (_(UT_IPv46));
- printf (S_("\
+ printf (_("\
-d, --database=STRING\n\
Database to check (default: %s)\n\
-l, --logname = STRING\n\
printf (_(UT_VERBOSE));
- printf (S_("\nAll parameters are optional.\n\
+ printf (_("\nAll parameters are optional.\n\
\n\
This plugin tests a PostgreSQL DBMS to determine whether it is active and\n\
accepting queries. In its current operation, it simply connects to the\n\
specified database, and then disconnects. If no database is specified, it\n\
connects to the template1 database, which is present in every functioning \n\
PostgreSQL DBMS.\n"));
- printf (S_("\n\
+ printf (_("\n\
The plugin will connect to a local postmaster if no host is specified. To\n\
connect to a remote host, be sure that the remote postmaster accepts TCP/IP\n\
connections (start the postmaster with the -i option).\n"));
- printf (S_("\n\
+ printf (_("\n\
Typically, the nagios user (unless the --logname option is used) should be\n\
able to connect to the database without a password. The plugin can also send\n\
a password, but no effort is made to obsure or encrypt the password.\n"));
-
void
print_usage (void)
{
- printf (S_("\
-Usage:\n %s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n\
- [-t <timeout>]"), progname);
- printf (S_("[-d <database>] [-l <logname>] [-p <password>]\n"));
- printf (S_("\
- %s (-h | --help) for detailed help\n\
- %s (-V | --version) for version information\n"),
- progname, progname);
+ printf ("\
+Usage: %s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n\
+ [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n", progname);
}
-