diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2020-03-06 14:38:59 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2020-03-06 14:38:59 +0200 |
commit | 417659b757afc85fc437f3da462c09a4b86c1282 (patch) | |
tree | 5430de4b239bbcd71247407f44e3279d5390f2e1 | |
parent | 9358876eb9b42408cef571052c6e997aa77f0c77 (diff) | |
download | ping903-417659b757afc85fc437f3da462c09a4b86c1282.tar.gz ping903-417659b757afc85fc437f3da462c09a4b86c1282.tar.bz2 |
Version 0.5v0.5
* NEWS: Update.
* configure.ac: Raise version number.
* examples/lib/LWP/Ping903.pm: Remove.
* examples/README: Mention Mangemanche. Remove references to
lib/LWP/Ping903.pm
* examples/dbload: Revert to LWP::UserAgent
* examples/inspect: Likewise.
* examples/ipadd: Likewise.
* examples/ipdel: Likewise.
-rw-r--r-- | NEWS | 11 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | examples/README | 15 | ||||
-rwxr-xr-x | examples/dbload | 4 | ||||
-rwxr-xr-x | examples/inspect | 4 | ||||
-rwxr-xr-x | examples/ipadd | 4 | ||||
-rwxr-xr-x | examples/ipdel | 4 | ||||
-rw-r--r-- | examples/lib/LWP/Ping903.pm | 49 |
8 files changed, 21 insertions, 72 deletions
@@ -1,9 +1,11 @@ -Ping903 -- history of user-visible changes. 2020-02-28 +Ping903 -- history of user-visible changes. 2020-03-06 See the end of file for copying conditions. Please send Ping903 bug reports to <gray@gnu.org> -Version 0.4.90 (Git) +Version 0.5, 2020-03-06 + +* Implement detection of duplicate replies. * Support for HTTP basic authorization. @@ -18,6 +20,11 @@ trusted-ip. Example: 192.0.2.15 EOF +* ping903q in nagios mode treats initial state as OK + +New option -N is provided to treat the initial state as UNKNOWN +(as it was in previous versions). + Version 0.4, 2020-92-27 diff --git a/configure.ac b/configure.ac index aea8e93..ab90ecc 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ # along with Ping903. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ([2.69]) -AC_INIT([Ping903], [0.4.90], [gray@gnu.org], +AC_INIT([Ping903], [0.5], [gray@gnu.org], [ping903], [https://puszcza.gnu.org.ua/projects/ping903/]) AC_CONFIG_SRCDIR([src/main.c]) diff --git a/examples/README b/examples/README index f5a1c50..df17f0c 100644 --- a/examples/README +++ b/examples/README @@ -5,6 +5,9 @@ facilities via REST API. You can use them as templates for writing your own configuration system, or just run them as they are, if you prefer. +For a mature, advanced ping903 remote management system, please see +<http://git.gnu.org.ua/cgit/ping903/mangemanche.git>. + * Programs - inspect @@ -20,18 +23,6 @@ prefer. - dbload Populates the list of monitored addresses from a SQL database. -All these programs use the LWP::Ping903 module, which provides support -for parsing the ".ping903.cred" file. The source file for the module is -lib/LWP/Ping903.pm. To run the programs from the examples directory, -define the following environment variable: - - export PERL5LIB=lib - -If you don't plan to use basic authorization, you can get rid of this -dependency using the following command: - - sed -i 's/LWP::Ping903/LWP::UserAgent/' inspect ipadd ipdel dbload - * Documentation Each example is self-documented. To access the description, run the diff --git a/examples/dbload b/examples/dbload index 245ace2..4502d55 100755 --- a/examples/dbload +++ b/examples/dbload @@ -179,7 +179,7 @@ L<DBI>. use strict; use warnings; use JSON; -use LWP::Ping903; +use LWP::UserAgent; use DBI; use Getopt::Long qw(:config gnu_getopt no_ignore_case); use File::Spec; @@ -253,7 +253,7 @@ my $json_text = JSON->new->encode({ 'ip-list' => [ map { $_->[0] } @$res ] }); -my $ua = new LWP::Ping903; +my $ua = new LWP::UserAgent; my $response = $ua->post("$baseurl/config/ip-list", 'Content-Type' => 'application/json', diff --git a/examples/inspect b/examples/inspect index af3d3de..0aa2fb5 100755 --- a/examples/inspect +++ b/examples/inspect @@ -73,7 +73,7 @@ L<DBI>. use strict; use warnings; -use LWP::Ping903; +use LWP::UserAgent; use HTTP::Status qw(:constants); use JSON; use Getopt::Long qw(:config gnu_getopt no_ignore_case); @@ -99,7 +99,7 @@ GetOptions( ) or exit(1); die "too many arguments; try `$0 --help' for more info\n" if @ARGV; -my $ua = new LWP::Ping903; +my $ua = new LWP::UserAgent; my $response = $ua->get("$baseurl/config"); unless ($response->is_success) { diff --git a/examples/ipadd b/examples/ipadd index d6195da..f001950 100755 --- a/examples/ipadd +++ b/examples/ipadd @@ -57,7 +57,7 @@ L<DBI>. use strict; use warnings; -use LWP::Ping903; +use LWP::UserAgent; use JSON; use Getopt::Long qw(:config gnu_getopt no_ignore_case); use Pod::Usage; @@ -82,7 +82,7 @@ GetOptions( my $ip = shift @ARGV or die "not enough arguments"; die "too many arguments; try `$0 --help' for more info\n" if @ARGV; -my $ua = new LWP::Ping903; +my $ua = new LWP::UserAgent; my $response = $ua->put("$baseurl/config/ip-list/$ip"); unless ($response->is_success) { print $response->status_line,"\n"; diff --git a/examples/ipdel b/examples/ipdel index 8eed7eb..fa4cb8f 100755 --- a/examples/ipdel +++ b/examples/ipdel @@ -57,7 +57,7 @@ L<DBI>. use strict; use warnings; -use LWP::Ping903; +use LWP::UserAgent; use JSON; use Getopt::Long qw(:config gnu_getopt no_ignore_case); use Pod::Usage; @@ -83,7 +83,7 @@ my $ip = shift @ARGV or die "not enough arguments"; die "too many arguments; try `$0 --help' for more info\n" if @ARGV; -my $ua = new LWP::Ping903; +my $ua = new LWP::UserAgent; my $response = $ua->delete("$baseurl/config/ip-list/$ip"); unless ($response->is_success) { print $response->status_line,"\n"; diff --git a/examples/lib/LWP/Ping903.pm b/examples/lib/LWP/Ping903.pm deleted file mode 100644 index 8fc398e..0000000 --- a/examples/lib/LWP/Ping903.pm +++ /dev/null @@ -1,49 +0,0 @@ -package LWP::Ping903; -use parent 'LWP::UserAgent'; -use File::Spec; -use HTTP::Status qw(:constants); -use strict; -use warnings; -use Carp; - -my $VERSION = '0.3'; - -sub new { - my $class = shift; - my $self = bless $class->SUPER::new(@_), $class; - $self->agent("$class/$VERSION"); - return $self; -} - -sub get_basic_credentials { - my ($self, $realm, $uri, $isproxy) = @_; - my $cf = File::Spec->catfile($ENV{HOME}, ".ping903.cred"); - if (open(my $fh, '<', $cf)) { - while (<$fh>) { - chomp; - s/^\s+//; - s/\s+$//; - next if /^(#.*)?$/; - my @words; - while ($_) { - no warnings 'uninitialized'; - if (s/^"(.*?)(?<!\\)"(?:\s+(.*))?$/$2/) { - (my $s = $1) =~ s/\\([\\\"])/$1/g; - push @words, $s; - } else { - s/^(.+?)(?:\s+(.+))?$/$2/; - push @words, $1; - } - } - if (@words == 4) { - my($h,$p) = split /:/, $words[0], 2; - if (($h eq '*' || $h eq $uri->host) - && (!$p || $p eq '*' || $p eq $uri->port) - && ($words[1] eq $realm || $words[1] eq '*')) { - return @words[2..3]; - } - } - } - } - return (); -} |