![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index f97ef66ce17db2ceb95b4c52e38d377869d10039..869ef673401574c582a105959b77e96bbf7fe49f 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
-/******************************************************************************
-
- 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$
-
- *****************************************************************************/
+/*****************************************************************************
+*
+* Nagios check_pgsql plugin
+*
+* License: GPL
+* Copyright (c) 1999-2007 Nagios Plugins Development Team
+*
+* Last Modified: $Date$
+*
+* Description:
+*
+* This file contains the check_pgsql plugin
+*
+* Test whether a PostgreSQL Database is accepting connections.
+*
+*
+* 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 3 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, see <http://www.gnu.org/licenses/>.
+*
+* $Id$
+*
+*****************************************************************************/
const char *progname = "check_pgsql";
const char *revision = "$Revision$";
-const char *copyright = "1999-2004";
+const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#include "common.h"
#include "netutils.h"
#include <libpq-fe.h>
+#include <pg_config_manual.h>
#define DEFAULT_DB "template1"
#define DEFAULT_HOST "127.0.0.1"
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != TRUE)
+ /* Parse extra opts if any */
+ argv=np_extra_opts (&argc, argv, progname);
+
+ if (process_arguments (argc, argv) == ERROR)
usage4 (_("Could not parse arguments"));
/* Set signal handling and alarm */
status = STATE_OK;
}
PQfinish (conn);
- printf (_(" %s - database %s (%d sec.)|%s\n"),
+ 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));
switch (c) {
case '?': /* usage */
- printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
- print_usage ();
- exit (STATE_UNKNOWN);
+ usage5 ();
case 'h': /* help */
print_help ();
exit (STATE_OK);
break;
case 'w': /* warning time threshold */
if (!is_nonnegative (optarg))
- usage2 (_("Critical threshold must be a positive integer"), optarg);
+ usage2 (_("Warning threshold must be a positive integer"), optarg);
else
twarn = strtod (optarg, NULL);
break;
return (FALSE);
strncpy (txt, dbname, NAMEDATALEN - 1);
txt[NAMEDATALEN - 1] = 0;
- if (sscanf (txt, "%[_a-zA-Z]%[^_a-zA-Z0-9]", tmp, tmp) == 1)
+ if (sscanf (txt, "%[_a-zA-Z]%[^_a-zA-Z0-9-]", tmp, tmp) == 1)
return (TRUE);
- if (sscanf (txt, "%[_a-zA-Z]%[_a-zA-Z0-9]%[^_a-zA-Z0-9]", tmp, tmp, tmp) ==
+ if (sscanf (txt, "%[_a-zA-Z]%[_a-zA-Z0-9-]%[^_a-zA-Z0-9-]", tmp, tmp, tmp) ==
2) return (TRUE);
return (FALSE);
}
/**
-the tango program should eventually create an entity here based on the
+the tango program should eventually create an entity here based on the
function prototype
@@-
/******************************************************************************
@@-
-</sect2>
+</sect2>
</sect1>
</article>
-@@
print_revision (progname, revision);
- printf (_(COPYRIGHT), copyright, email);
+ printf (COPYRIGHT, copyright, email);
+
+ printf (_("Test whether a PostgreSQL Database is accepting connections."));
- printf (_("Test whether a PostgreSQL Database is accepting connections.\n\n"));
+ printf ("\n\n");
print_usage ();
printf (_(UT_HELP_VRSN));
+ printf (_(UT_EXTRA_OPTS));
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 (" %s\n", "-d, --database=STRING");
+ printf (" %s", _("Database to check "));
+ printf (_("(default: %s)"), DEFAULT_DB);
+ printf (" %s\n", "-l, --logname = STRING");
+ printf (" %s\n", _("Login name of user"));
+ printf (" %s\n", "-p, --password = STRING");
+ printf (" %s\n", _("Password (BIG SECURITY ISSUE)"));
printf (_(UT_WARN_CRIT));
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 ("\n");
+ printf (" %s\n", _("All parameters are optional."));
+ printf (" %s\n", _("This plugin tests a PostgreSQL DBMS to determine whether it is active and"));
+ printf (" %s\n", _("accepting queries. In its current operation, it simply connects to the"));
+ printf (" %s\n", _("specified database, and then disconnects. If no database is specified, it"));
+ printf (" %s\n", _("connects to the template1 database, which is present in every functioning"));
+ printf (" %s\n\n", _("PostgreSQL DBMS."));
+
+ printf (" %s\n", _("The plugin will connect to a local postmaster if no host is specified. To"));
+ printf (" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP"));
+ printf (" %s\n\n", _("connections (start the postmaster with the -i option)."));
+
+ printf (" %s\n", _("Typically, the nagios user (unless the --logname option is used) should be"));
+ printf (" %s\n", _("able to connect to the database without a password. The plugin can also send"));
+ printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password."));
+
+#ifdef NP_EXTRA_OPTS
+ printf ("\n");
+ printf ("%s\n", _("Notes:"));
+ printf (_(UT_EXTRA_OPTS_NOTES));
+#endif
printf (_(UT_SUPPORT));
}
void
print_usage (void)
{
- printf ("\
-Usage: %s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n\
- [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n", progname);
-
- printf (UT_HLP_VRS, progname, progname);
+ printf (_("Usage:"));
+ printf ("%s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
+ printf (" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n");
}