From 775f5e41d1ce5952efb51d930ed91f9e30d15730 Mon Sep 17 00:00:00 2001 From: CPbN <40244829+CPbN@users.noreply.github.com> Date: Mon, 8 Jul 2019 11:15:08 +0200 Subject: [PATCH] 3CX API update --- apps/voip/3cx/restapi/custom/api.pm | 15 ++++++++-- apps/voip/3cx/restapi/mode/system.pm | 45 +++++++++++++++------------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/apps/voip/3cx/restapi/custom/api.pm b/apps/voip/3cx/restapi/custom/api.pm index af5642fa8..6e79b0864 100644 --- a/apps/voip/3cx/restapi/custom/api.pm +++ b/apps/voip/3cx/restapi/custom/api.pm @@ -194,9 +194,13 @@ sub request_api { warning_status => '', unknown_status => '', critical_status => '%{http_code} < 200 or %{http_code} >= 300' ); - # Some content may be strangely returned, for example : "[{\"Category\":\"provider\",\"Count\":1}]" + # Some content may be strangely returned, for example : + # 3CX < 16.0.2.910 : "[{\"Category\":\"provider\",\"Count\":1}]" + # 3CX >= 16.0.2.910 : {"tcxUpdate":"[{\"Category\":\"provider\",\"Count\":5},{\"Category\":\"sp150\",\"Count\":1}]","perPage":"[]"} if (defined($options{eval_content}) && $options{eval_content} == 1) { - $content = eval "$content"; + if (my $evcontent = eval "$content") { + $content = $evcontent; + } } my $decoded; @@ -249,6 +253,13 @@ sub internal_update_checker { my ($self, %options) = @_; my $status = $self->request_api(method => 'GET', url_path =>'/api/UpdateChecker/GetFromParams', eval_content => 1); + if(ref($status) eq 'HASH') { + $status = $status->{tcxUpdate}; + if(ref($status) ne 'ARRAY') { + # See above not about strange content + $status = JSON::XS->new->utf8->decode($status); + } + } return $status; } diff --git a/apps/voip/3cx/restapi/mode/system.pm b/apps/voip/3cx/restapi/mode/system.pm index 3492a77ee..7b69c8d3b 100644 --- a/apps/voip/3cx/restapi/mode/system.pm +++ b/apps/voip/3cx/restapi/mode/system.pm @@ -29,15 +29,19 @@ use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold) sub custom_status_output { my ($self, %options) = @_; - my $msg = 'health : ' . $self->{result_values}->{health}; + my $msg = ''; + if ($self->{result_values}->{service} !~ /^Has[A-Z]/) { + $msg .= 'error '; + } + $msg .= ': ' . $self->{result_values}->{error}; return $msg; } sub custom_status_calc { my ($self, %options) = @_; - $self->{result_values}->{health} = $options{new_datas}->{$self->{instance} . '_health'}; - $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'}; + $self->{result_values}->{error} = $options{new_datas}->{$self->{instance} . '_error'}; + $self->{result_values}->{service} = $options{new_datas}->{$self->{instance} . '_service'}; return 0; } @@ -72,7 +76,7 @@ sub set_counters { $self->{maps_counters}->{service} = [ { label => 'status', threshold => 0, set => { - key_values => [ { name => 'health' }, { name => 'display' } ], + key_values => [ { name => 'error' }, { name => 'service' } ], closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, @@ -85,7 +89,7 @@ sub set_counters { sub prefix_service_output { my ($self, %options) = @_; - return "Service '" . $options{instance_value}->{display} . "' "; + return "3CX '" . $options{instance_value}->{service} ."' "; } sub new { @@ -93,10 +97,11 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1); bless $self, $class; + $self->{version} = '1.0'; $options{options}->add_options(arguments => { "unknown-status:s" => { name => 'unknown_status', default => '' }, "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{health} =~ /false/' }, + "critical-status:s" => { name => 'critical_status', default => '%{error} =~ /true/' }, }); return $self; @@ -122,27 +127,27 @@ sub manage_selection { foreach my $item (keys %$single) { # As of 3CX 15.5 / 16, we have Firewall, Phones, Trunks $self->{service}->{$item} = { - display => $item, - health => $single->{$item} ? 'true' : 'false', + service => $item, + error => $single->{$item} ? 'false' : 'true', }; } # As per 3CX support, $single->{Trunks} does not trigger if TrunksRegistered != TrunksTotal, # but only if "trunk is unsupported", so let's workaround $self->{service}->{HasUnregisteredTrunks} = { - display => 'HasUnregisteredTrunks', - health => ($system->{TrunksRegistered} < $system->{TrunksTotal}) ? 'false' : 'true', + service => 'HasUnregisteredTrunks', + error => ($system->{TrunksRegistered} < $system->{TrunksTotal}) ? 'true' : 'false', }; $self->{service}->{HasNotRunningServices} = { - display => 'HasNotRunningServices', - health => $system->{HasNotRunningServices} ? 'false' : 'true', + service => 'HasNotRunningServices', + error => $system->{HasNotRunningServices} ? 'true' : 'false', }; $self->{service}->{HasUnregisteredSystemExtensions} = { - display => 'HasUnregisteredSystemExtensions', - health => $system->{HasUnregisteredSystemExtensions} ? 'false' : 'true', + service => 'HasUnregisteredSystemExtensions', + error => $system->{HasUnregisteredSystemExtensions} ? 'true' : 'false', }; $self->{service}->{HasUpdatesAvailable} = { - display => 'HasUpdatesAvailable', - health => scalar(@$update) ? 'false' : 'true', + service => 'HasUpdatesAvailable', + error => scalar(@$update) ? 'true' : 'false', }; $self->{global} = { @@ -164,17 +169,17 @@ Check system health =item B<--unknown-status> Set unknown threshold for status. -Can used special variables like: %{health}, %{display} +Can used special variables like: %{error}, %{service} =item B<--warning-status> Set warning threshold for status. -Can used special variables like: %{health}, %{display} +Can used special variables like: %{error}, %{service} =item B<--critical-status> -Set critical threshold for status (Default: '%{health} =~ /false/'). -Can used special variables like: %{health}, %{display} +Set critical threshold for status (Default: '%{error} =~ /false/'). +Can used special variables like: %{error}, %{service} =item B<--warning-*> B<--critical-*>