diff options
| author | Greg Sabino Mullane | 2008-09-22 15:58:02 +0000 |
|---|---|---|
| committer | Greg Sabino Mullane | 2008-09-22 15:58:02 +0000 |
| commit | 19c5423e20208a6e31d6cf22874d59359c1f5a1f (patch) | |
| tree | 2bee0aafa2ac2580a107361f99e004a0d113fc8d | |
| parent | 3b0dd0d1894ad251faf63c4bc4c212ec718b7c57 (diff) | |
Version bump and minor tweaks.
| -rw-r--r-- | .perlcriticrc | 2 | ||||
| -rwxr-xr-x | check_postgres.pl | 13 | ||||
| -rw-r--r-- | check_postgres.pl.asc | 6 | ||||
| -rw-r--r-- | check_postgres.pl.html | 25 | ||||
| -rw-r--r-- | index.html | 6 | ||||
| -rw-r--r-- | t/99_spellcheck.t | 1 |
6 files changed, 36 insertions, 17 deletions
diff --git a/.perlcriticrc b/.perlcriticrc index 940238045..98f0b8288 100644 --- a/.perlcriticrc +++ b/.perlcriticrc @@ -4,7 +4,7 @@ verbose = 8 severity = 1 [Documentation::PodSpelling] -stop_words = Mullane Nagios Slony nols salesrep psql dbname postgres USERNAME usernames dbuser pgpass nagios stderr showperf symlinked timesync criticals quirm lancre exabytes sami includeuser excludeuser flagg tardis WAL tablespaces tablespace perflimit burrick mallory grimm oskar ExclusiveLock garrett artemus queryname speedtest checksum checksums morpork klatch pluto faceoff slon greg watson franklin wilkins scott Sabino Seklecki dbpass autovacuum Astill refactoring NAGIOS localhost cronjob symlink symlinks backends snazzo logfile syslog parens plugin Cwd Ioannis Tambouras schemas SQL MRTG mrtg uptime datallowconn dbhost dbport +stop_words = Mullane Nagios Slony nols salesrep psql dbname postgres USERNAME usernames dbuser pgpass nagios stderr showperf symlinked timesync criticals quirm lancre exabytes sami includeuser excludeuser flagg tardis WAL tablespaces tablespace perflimit burrick mallory grimm oskar ExclusiveLock garrett artemus queryname speedtest checksum checksums morpork klatch pluto faceoff slon greg watson franklin wilkins scott Sabino Seklecki dbpass autovacuum Astill refactoring NAGIOS localhost cronjob symlink symlinks backends snazzo logfile syslog parens plugin Cwd Ioannis Tambouras schemas SQL MRTG mrtg uptime datallowconn dbhost dbport ok ## Severity 5: [-Subroutines::ProhibitNestedSubs] diff --git a/check_postgres.pl b/check_postgres.pl index 6ab86d71d..e04d982c2 100755 --- a/check_postgres.pl +++ b/check_postgres.pl @@ -419,8 +419,8 @@ sub finishup { } sub dumpresult { - my $SEP = ' * '; my ($type,$info) = @_; + my $SEP = ' * '; ## Are we showing DEBUG_INFO? my $showdebug = 0; if ($DEBUGOUTPUT) { @@ -3514,7 +3514,7 @@ Creates symlinks to the main program for each action. =item B<--output=VAL> -Determines the format of the output, for use in various programs. The default is 'nagios'. No +Determines the format of the output, for use in various programs. The default is 'nagios'. No other systems are supported yet. =item B<--mrtg=VAL> @@ -3523,8 +3523,8 @@ Used only for the MRTG or simple output, for a few specific actions. =item B<--debugoutput=VAL> -Outputs the exact string returned by psql, for use in debugging. The value is one or more letters, -deterining if the output is displayed or not, where 'a' = all, 'c' = critical, 'w' = warning, +Outputs the exact string returned by psql, for use in debugging. The value is one or more letters, +which determine if the output is displayed or not, where 'a' = all, 'c' = critical, 'w' = warning, 'o' = ok, and 'u' = unknown. Letters can be combined. =back @@ -4364,6 +4364,11 @@ Items not specifically attributed are by Greg Sabino Mullane. =over 4 +=item B<Version 2.1.4> (September 22, 2008) + + Fix for race condition in txn_time action. + Add --debugoutput option. + =item B<Version 2.1.3> (September 22, 2008) Allow alternate arguments "dbhost" for "host" and "dbport" for "port". diff --git a/check_postgres.pl.asc b/check_postgres.pl.asc index 8bbc541fe..2ce5ae707 100644 --- a/check_postgres.pl.asc +++ b/check_postgres.pl.asc @@ -1,6 +1,6 @@ -----BEGIN PGP SIGNATURE----- -iEYEABEDAAYFAkjXt0UACgkQvJuQZxSWSsgH8wCgsyZaQ6n4XnIfIX3HtpjUz+U6 -UrUAn31OXoEDPW84JNhhiMlycNFxAiv7 -=4Zkz +iEYEABEDAAYFAkjXwIcACgkQvJuQZxSWSshPfwCfdotYQx8VG0ib68byMj4likfR +f14AoKbtj1D7545jSuOwmDdCljovI02y +=iF8H -----END PGP SIGNATURE----- diff --git a/check_postgres.pl.html b/check_postgres.pl.html index d47946b52..2ee4119b5 100644 --- a/check_postgres.pl.html +++ b/check_postgres.pl.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>B<check_postgres.pl> - a Postgres monitoring script for Nagios, MRTG, and others -This documents describes check_postgres.pl version 2.1.3</title> +This documents describes check_postgres.pl version 2.1.4</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> </head> @@ -87,7 +87,7 @@ This documents describes check_postgres.pl version 2.1.3</title> <hr /> <h1><a name="name">NAME</a></h1> <p><strong>check_postgres.pl</strong> - a Postgres monitoring script for Nagios, MRTG, and others -This documents describes check_postgres.pl version 2.1.3</p> +This documents describes check_postgres.pl version 2.1.4</p> <p> </p> <hr /> @@ -333,6 +333,13 @@ other systems are supported yet.</p> <dd> <p>Used only for the MRTG or simple output, for a few specific actions.</p> </dd> +<dt><strong><a name="item__2d_2ddebugoutput_3dval"><strong>--debugoutput=VAL</strong></a></strong></dt> + +<dd> +<p>Outputs the exact string returned by psql, for use in debugging. The value is one or more letters, +deterining if the output is displayed or not, where 'a' = all, 'c' = critical, 'w' = warning, +'o' = ok, and 'u' = unknown. Letters can be combined.</p> +</dd> </dl> <p> </p> @@ -1051,12 +1058,18 @@ feature requests, and commit notices, send email to <a href="mailto:check_postgr <h1><a name="history">HISTORY</a></h1> <p>Items not specifically attributed are by Greg Sabino Mullane.</p> <dl> -<dt><strong><a name="item_3"><strong>Version 2.1.3</strong> (September 22, 2008)</a></strong></dt> +<dt><strong><a name="item_4"><strong>Version 2.1.4</strong> (September 22, 2008)</a></strong></dt> <dd> <pre> - Allow alternate arguments "dbhost" for "host" and "dbport" for "port".</pre> + Fix for race condition in txn_time action. + Add --debugoutput option.</pre> +</dd> +<dt><strong><a name="item_3"><strong>Version 2.1.3</strong> (September 22, 2008)</a></strong></dt> + +<dd> <pre> + Allow alternate arguments "dbhost" for "host" and "dbport" for "port". Output a zero as default value for second line of MRTG output.</pre> </dd> <dt><strong><a name="item_2"><strong>Version 2.1.2</strong> (July 28, 2008)</a></strong></dt> @@ -1115,7 +1128,7 @@ feature requests, and commit notices, send email to <a href="mailto:check_postgr Output schema name before table name where appropriate. Thanks to Jeff Frost.</pre> </dd> -<dt><strong><a name="item_4"><strong>Version 1.8.4</strong> (June 19, 2008)</a></strong></dt> +<dt><strong><strong>Version 1.8.4</strong> (June 19, 2008)</strong></dt> <dd> <pre> @@ -1125,7 +1138,7 @@ feature requests, and commit notices, send email to <a href="mailto:check_postgr <dd> <pre> - Fix check_backends action: there may be no rows in pg_stat_activity, so run a second + Fix check_backends action: there may be no rows in pg_stat_activity, so run a second query if needed to find the max_connections setting. Thanks to Jeff Frost for the bug report.</pre> </dd> diff --git a/index.html b/index.html index f31066dec..98c41becb 100644 --- a/index.html +++ b/index.html @@ -21,13 +21,13 @@ h1 { <h1>check_postgres.pl</h1> -<p><b>check_postgres.pl</b> is a script for checking the state of one or more Postgres databases and reporting back in a Nagios-friendly manner. It was developed by Greg Sabino Mullane of <a href="http://www.endpoint.com/">End Point Corporation</a> and is BSD-licensed. The latest version is <b>2.1.3</b>, and was released on September 22, 2008.</p> +<p><b>check_postgres.pl</b> is a script for checking the state of one or more Postgres databases and reporting back in a Nagios-friendly manner. It was developed by Greg Sabino Mullane of <a href="http://www.endpoint.com/">End Point Corporation</a> and is BSD-licensed. The latest version is <b>2.1.4</b>, and was released on September 22, 2008.</p> <ul> - <li><a href="/check_postgres/check_postgres.pl.html">Documentation for check_postgres 2.1.3</a></li> + <li><a href="/check_postgres/check_postgres.pl.html">Documentation for check_postgres 2.1.4</a></li> </ul> <ul> - <li><a href="/check_postgres/check_postgres.pl">Download check_postgres.pl 2.1.3</a></li> + <li><a href="/check_postgres/check_postgres.pl">Download check_postgres.pl 2.1.4</a></li> <li><a href="/check_postgres/check_postgres.pl.asc">PGP signature for check_postgres.pl</a></li> </ul> diff --git a/t/99_spellcheck.t b/t/99_spellcheck.t index f4e1d29af..d9f44cd03 100644 --- a/t/99_spellcheck.t +++ b/t/99_spellcheck.t @@ -219,6 +219,7 @@ MRTG nagios NAGIOS nols +ok oskar perflimit pgpass |