![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 2d2f6d31e356f6262c3d409156a808352befc146..bbf47f07be755ec298d22ee5271f424090953e49 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
/******************************************************************************
- *
- * Program: PostgreSQL plugin for Nagios
- * License: GPL
- *
- * License Information:
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- *
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id$
+
*****************************************************************************/
#define DEFAULT_DB "template1"
DEFAULT_CRIT = 8
};
-#include "config.h"
#include "common.h"
#include "utils.h"
+#include "netutils.h"
#include <libpq-fe.h>
int process_arguments (int, char **);
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 *revision = "$Revision$";
const char *copyright = "1999-2003";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
-\f
+
/******************************************************************************
<title>Functions</title>
-@@
******************************************************************************/
-\f
-
-
-
-void
-print_help (void)
-{
- char *myport;
-
- asprintf (&myport, "%d", DEFAULT_PORT);
-
- print_revision (progname, revision);
-
- printf (_(COPYRIGHT), copyright, email);
-
- printf (_("Test whether a PostgreSQL DBMS is accepting connections.\n\n"));
-
- print_usage ();
-
- printf (_(HELP_VRSN));
-
- printf (_(HOST_PORT), 'P', myport);
-
- printf (_(IPv46));
-
- printf (S_("\
- -d, --database=STRING\n\
- Database to check (default: %s)\n\
- -l, --logname = STRING\n\
- Login name of user\n\
- -p, --password = STRING\n\
- Password (BIG SECURITY ISSUE)\n"), DEFAULT_DB);
-
- printf (_(WARN_CRIT_TO), DEFAULT_SOCKET_TIMEOUT);
-
- printf (_(VRBS));
-
- printf (S_("\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\
-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\
-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"));
- support ();
-}
-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);
-}
int
main (int argc, char **argv)
{
- int elapsed_time;
+ int elapsed_time, status;
/* begin, by setting the parameters for a backend connection if the
* parameters are null, then the system will try to use reasonable
pgoptions = NULL; /* special options to start up the backend server */
pgtty = NULL; /* debugging tty for the backend server */
- if (process_arguments (argc, argv) == ERROR)
- usage ("Could not parse arguments");
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
+ if (process_arguments (argc, argv) != OK)
+ usage (_("check_pgsql: could not parse arguments\n"));
/* Set signal handling and alarm */
if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
/* 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 */
{
int c;
- int option_index = 0;
- static struct option long_options[] = {
+ int option = 0;
+ static struct option longopts[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
{"timeout", required_argument, 0, 't'},
while (1) {
c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:",
- long_options, &option_index);
+ longopts, &option);
if (c == EOF)
break;
switch (c) {
case '?': /* usage */
- usage3 (_("Unknown argument"), optopt);
+ printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+ print_usage ();
+ exit (STATE_UNKNOWN);
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);
- timeout_interval = atoi (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);
- tcrit = atoi (optarg);
+ if (!is_nonnegative (optarg))
+ usage2 (_("Critical threshold must be a positive integer"), optarg);
+ else
+ tcrit = strtod (optarg, NULL);
break;
case 'w': /* warning time threshold */
- if (!is_integer (optarg))
- usage2 (_("Invalid critical threshold"), optarg);
- twarn = atoi (optarg);
+ if (!is_nonnegative (optarg))
+ usage2 (_("Critical threshold must be a positive integer"), optarg);
+ else
+ twarn = strtod (optarg, NULL);
break;
case 'H': /* host */
if (!is_host (optarg))
- usage2 (_("You gave an invalid host name"), optarg);
- pghost = optarg;
+ usage2 (_("Invalid hostname/address"), optarg);
+ else
+ pghost = optarg;
break;
case 'P': /* port */
if (!is_integer (optarg))
- usage2 (_("Port must be an integer"), optarg);
- pgport = optarg;
+ usage2 (_("Port must be a positive integer"), optarg);
+ else
+ pgport = optarg;
break;
case 'd': /* database name */
- if (!is_pg_dbname (optarg))
+ if (!is_pg_dbname (optarg)) /* checks length and valid chars */
usage2 (_("Database name is not valid"), optarg);
- strncpy (dbName, optarg, NAMEDATALEN - 1);
- dbName[NAMEDATALEN - 1] = 0;
+ else /* we know length, and know optarg is terminated, so us strcpy */
+ strcpy (dbName, optarg);
break;
case 'l': /* login name */
if (!is_pg_logname (optarg))
usage2 (_("user name is not valid"), optarg);
- pguser = optarg;
+ else
+ pguser = optarg;
break;
case 'p': /* authentication password */
case 'a':
-@@
******************************************************************************/
+
+
int
validate_arguments ()
{
return OK;
}
-\f
/******************************************************************************
-@@
******************************************************************************/
+
+
int
is_pg_dbname (char *dbname)
{
-@@
******************************************************************************/
+
+
int
is_pg_logname (char *username)
{
</article>
-@@
******************************************************************************/
+
+
+
+void
+print_help (void)
+{
+ char *myport;
+
+ asprintf (&myport, "%d", DEFAULT_PORT);
+
+ print_revision (progname, revision);
+
+ printf (_(COPYRIGHT), copyright, email);
+
+ printf (_("Test whether a PostgreSQL Database is accepting connections.\n\n"));
+
+ print_usage ();
+
+ printf (_(UT_HELP_VRSN));
+
+ printf (_(UT_HOST_PORT), 'P', myport);
+
+ printf (_(UT_IPv46));
+
+ printf (S_("\
+ -d, --database=STRING\n\
+ Database to check (default: %s)\n\
+ -l, --logname = STRING\n\
+ Login name of user\n\
+ -p, --password = STRING\n\
+ Password (BIG SECURITY ISSUE)\n"), DEFAULT_DB);
+
+ printf (_(UT_WARN_CRIT));
+
+ printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+
+ printf (_(UT_VERBOSE));
+
+ printf (S_("\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\
+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\
+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"));
+
+ printf (_(UT_SUPPORT));
+}
+
+
+
+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);
+}