From 92e396e6fdfc2310498944e0188a5261bb4ca960 Mon Sep 17 00:00:00 2001 From: Emre Hasegeli Date: Sat, 15 May 2021 11:21:20 +0300 Subject: [PATCH 1/5] Trim trailing whitespaces on README --- README.md | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 9823de9..14b4d28 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ This document will cover how to install the script. Quick method ------------ -For the impatient Nagios admin, just copy the "check_postgres.pl" file -to your Nagios scripts directory, and perhaps symlink entries to that +For the impatient Nagios admin, just copy the "check_postgres.pl" file +to your Nagios scripts directory, and perhaps symlink entries to that file by: cd @@ -35,17 +35,17 @@ The better way to install this script is via the standard Perl process: env -i make test make install -The last step usually needs to be done as the root user. You may want to -copy the script to a place that makes more sense for Nagios, if using it +The last step usually needs to be done as the root user. You may want to +copy the script to a place that makes more sense for Nagios, if using it for that purpose. See the "Quick" instructions above. -For `make test`, please report any failing tests to check_postgres@bucardo.org. -The tests need to have some standard Postgres binaries available, such as -`initdb`, `psql`, and `pg_ctl`. If these are not in your path, or you want to -use specific ones, please set the environment variable `PGBINDIR` first. More +For `make test`, please report any failing tests to check_postgres@bucardo.org. +The tests need to have some standard Postgres binaries available, such as +`initdb`, `psql`, and `pg_ctl`. If these are not in your path, or you want to +use specific ones, please set the environment variable `PGBINDIR` first. More details on running the testsuite are available in `README.dev`. -Once `make install` has been done, you should have access to the complete +Once `make install` has been done, you should have access to the complete documentation by typing: man check_postgres @@ -57,13 +57,13 @@ https://bucardo.org/check_postgres/check_postgres.pl.html Mailing lists ------------- -The final step should be to subscribe to the low volume check_postgres-announce -mailing list, so you learn of new versions and important changes. Information +The final step should be to subscribe to the low volume check_postgres-announce +mailing list, so you learn of new versions and important changes. Information on joining can be found at: https://mail.endcrypt.com/mailman/listinfo/check_postgres-announce -General questions and development issues are discussed on the check_postgres list, +General questions and development issues are discussed on the check_postgres list, which we recommend people join as well: https://mail.endcrypt.com/mailman/listinfo/check_postgres @@ -81,22 +81,22 @@ COPYRIGHT LICENSE INFORMATION ------------------- -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From c7a7e1dd595fe8ddf1d040dae0a2a0d87fb6e11c Mon Sep 17 00:00:00 2001 From: Emre Hasegeli Date: Sat, 15 May 2021 11:21:50 +0300 Subject: [PATCH 2/5] Change the build link to travis-ci.com --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14b4d28..e6495e4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ check_postgres ============== -[![Build Status](https://travis-ci.org/bucardo/check_postgres.svg?branch=master)](https://travis-ci.org/bucardo/check_postgres) +[![Build Status](https://travis-ci.com/bucardo/check_postgres.svg?branch=master)](https://travis-ci.com/bucardo/check_postgres) This is check_postgres, a monitoring tool for Postgres. From 901e585d9c2581738ebb9410528e60381c54e2a4 Mon Sep 17 00:00:00 2001 From: Emre Hasegeli Date: Sat, 15 May 2021 11:11:35 +0300 Subject: [PATCH 3/5] CI: Don't test versions before 9.3 --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b47e717..6a3f216 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,6 @@ env: - PGVERSION=9.5 - PGVERSION=9.4 - PGVERSION=9.3 - - PGVERSION=9.2 - - PGVERSION=9.1 - - PGVERSION=9.0 - - PGVERSION=8.4 dist: focal sudo: required From d184cedcec54667643fde2693467ba1c57fd72b4 Mon Sep 17 00:00:00 2001 From: Emre Hasegeli Date: Sat, 15 May 2021 11:17:05 +0300 Subject: [PATCH 4/5] CI: Fix the recent Perl version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6a3f216..065291e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ dist: focal sudo: required language: perl perl: - - '5.30' + - '5.30.0' - '5.14' # 5.14 is shipped with Ubuntu precise (12.04), also oldest version supported by Travis on focal before_install: From 3f97b50ccc8d5682e7e265a7d83b17b2255352d8 Mon Sep 17 00:00:00 2001 From: Emre Hasegeli Date: Sat, 15 May 2021 11:15:13 +0300 Subject: [PATCH 5/5] CI: Fix installing Postgres --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 065291e..eb1333a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,11 @@ before_install: - sudo apt-get -qq update install: - # upgrade postgresql-common for new apt.postgresql.org.sh - - sudo apt-get install -y postgresql-common - - sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -p -v $PGVERSION -i + - sudo apt-get install curl ca-certificates gnupg + - curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - + - sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' + - sudo apt-get update + - sudo apt-get install postgresql-$PGVERSION - pg_lsclusters - dpkg -l postgresql\* | cat - printenv | sort