From 6d3d8b84e2174eb3a04c27c24cd758e32c8b1a5d Mon Sep 17 00:00:00 2001 From: CPbN Date: Sun, 7 Apr 2019 16:45:52 +0200 Subject: [PATCH 1/6] New 3CX plugin --- apps/3cx/plugin.pm | 63 ++++++++ apps/3cx/restapi/custom/api.pm | 269 ++++++++++++++++++++++++++++++++ apps/3cx/restapi/mode/status.pm | 81 ++++++++++ 3 files changed, 413 insertions(+) create mode 100644 apps/3cx/plugin.pm create mode 100644 apps/3cx/restapi/custom/api.pm create mode 100644 apps/3cx/restapi/mode/status.pm diff --git a/apps/3cx/plugin.pm b/apps/3cx/plugin.pm new file mode 100644 index 000000000..b5ee82b48 --- /dev/null +++ b/apps/3cx/plugin.pm @@ -0,0 +1,63 @@ +# +# Copyright 2019 Centreon (http://www.centreon.com/) +# +# Centreon is a full-fledged industry-strength solution that meets +# the needs in IT infrastructure and application monitoring for +# service performance. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +package apps::3cx::restapi::plugin; + +use strict; +use warnings; +use base qw(centreon::plugins::script_custom); + +sub new { + my ($class, %options) = @_; + + my $self = $class->SUPER::new(package => __PACKAGE__, %options); + bless $self, $class; + + $self->{version} = '1.0'; + %{$self->{modes}} = ( + 'status' => 'apps::3cx::restapi::mode::status', + ); + + $self->{custom_modes}{api} = 'apps::3cx::restapi::custom::api'; + + return $self; +} + +sub init { + my ($self, %options) = @_; + + $self->SUPER::init(%options); +} + +1; + +__END__ + +=head1 PLUGIN DESCRIPTION + +Check 3CX ressources through its HTTPS remote API. + +Requirements: at least 3CX 15.5. + +=over 8 + +=back + +=cut diff --git a/apps/3cx/restapi/custom/api.pm b/apps/3cx/restapi/custom/api.pm new file mode 100644 index 000000000..568019210 --- /dev/null +++ b/apps/3cx/restapi/custom/api.pm @@ -0,0 +1,269 @@ +# +# Copyright 2019 Centreon (http://www.centreon.com/) +# +# Centreon is a full-fledged industry-strength solution that meets +# the needs in IT infrastructure and application monitoring for +# service performance. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +package apps::3cx::restapi::custom::api; + +use base qw(centreon::plugins::mode); + +use strict; +use warnings; +use centreon::plugins::http; +use centreon::plugins::statefile; +use JSON::XS; +use Digest::MD5 qw(md5_hex); + +sub new { + my ($class, %options) = @_; + my $self = $class->SUPER::new(package => __PACKAGE__, %options); + bless $self, $class; + + if (!defined($options{output})) { + print "Class Custom: Need to specify 'output' argument.\n"; + exit 3; + } + if (!defined($options{options})) { + $options{output}->add_option_msg(short_msg => "Class Custom: Need to specify 'options' argument."); + $options{output}->option_exit(); + } + + if (!defined($options{noptions})) { + $options{options}->add_options(arguments => { + "hostname:s" => { name => 'hostname' }, + "port:s" => { name => 'port'}, + "proto:s" => { name => 'proto' }, + "api-username:s" => { name => 'api_username' }, + "api-password:s" => { name => 'api_password' }, + "timeout:s" => { name => 'timeout', default => 30 }, + }); + } + + $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); + + $self->{output} = $options{output}; + $self->{mode} = $options{mode}; + $self->{http} = centreon::plugins::http->new(%options); + $self->{cache} = centreon::plugins::statefile->new(%options); + + return $self; +} + +sub set_options { + my ($self, %options) = @_; + + $self->{option_results} = $options{option_results}; +} + +sub set_defaults { + my ($self, %options) = @_; + + foreach (keys %{$options{default}}) { + if ($_ eq $self->{mode}) { + for (my $i = 0; $i < scalar(@{$options{default}->{$_}}); $i++) { + foreach my $opt (keys %{$options{default}->{$_}[$i]}) { + if (!defined($self->{option_results}->{$opt}[$i])) { + $self->{option_results}->{$opt}[$i] = $options{default}->{$_}[$i]->{$opt}; + } + } + } + } + } +} + +sub check_options { + my ($self, %options) = @_; + + $self->{hostname} = (defined($self->{option_results}->{hostname})) ? $self->{option_results}->{hostname} : undef; + $self->{port} = (defined($self->{option_results}->{port})) ? $self->{option_results}->{port} : 443; + $self->{proto} = (defined($self->{option_results}->{proto})) ? $self->{option_results}->{proto} : 'https'; + $self->{timeout} = (defined($self->{option_results}->{timeout})) ? $self->{option_results}->{timeout} : 30; + $self->{ssl_opt} = (defined($self->{option_results}->{ssl_opt})) ? $self->{option_results}->{ssl_opt} : undef; + $self->{api_username} = (defined($self->{option_results}->{api_username})) ? $self->{option_results}->{api_username} : undef; + $self->{api_password} = (defined($self->{option_results}->{api_password})) ? $self->{option_results}->{api_password} : undef; + + if (!defined($self->{hostname}) || $self->{hostname} eq '') { + $self->{output}->add_option_msg(short_msg => "Need to specify --hostname option."); + $self->{output}->option_exit(); + } + if (!defined($self->{api_username}) || $self->{api_username} eq '') { + $self->{output}->add_option_msg(short_msg => "Need to specify --api-username option."); + $self->{output}->option_exit(); + } + if (!defined($self->{api_password}) || $self->{api_password} eq '') { + $self->{output}->add_option_msg(short_msg => "Need to specify --api-password option."); + $self->{output}->option_exit(); + } + + $self->{cache}->check_options(option_results => $self->{option_results}); + + return 0; +} + +sub build_options_for_httplib { + my ($self, %options) = @_; + + $self->{option_results}->{hostname} = $self->{hostname}; + $self->{option_results}->{port} = $self->{port}; + $self->{option_results}->{proto} = $self->{proto}; + $self->{option_results}->{ssl_opt} = $self->{ssl_opt}; + $self->{option_results}->{timeout} = $self->{timeout}; + $self->{option_results}->{warning_status} = ''; + $self->{option_results}->{critical_status} = ''; + $self->{option_results}->{unknown_status} = '%{http_code} < 200 or %{http_code} >= 300'; +} + +sub settings { + my ($self, %options) = @_; + + $self->build_options_for_httplib(); + $self->{http}->add_header(key => 'Content-Type', value => 'application/json;charset=UTF-8'); + if (defined($self->{cookie})) { + $self->{http}->add_header(key => 'Cookie', value => '.AspNetCore.Cookies=' . $self->{cookie}); + } + $self->{http}->set_options(%{$self->{option_results}}); +} + +sub get_cookie { + my ($self, %options) = @_; + + my $has_cache_file = $options{statefile}->read(statefile => '3cx_api_' . md5_hex($self->{option_results}->{hostname}) . '_' . md5_hex($self->{option_results}->{api_username})); + my $cookie = $options{statefile}->get(name => 'cookie'); + my $expires_on = $options{statefile}->get(name => 'expires_on'); + + if ($has_cache_file == 0 || !defined($cookie) || (($expires_on - time()) < 10)) { + my $post_data = '{"Username":"' . $self->{api_username} . '",' . + '"Password":"' . $self->{api_password} . '"}'; + + $self->settings(); + + my $content = $self->{http}->request(method => 'POST', query_form_post => $post_data, + url_path => '/api/login'); + + $cookie = $self->{http}->get_header(name => 'Set-Cookie'); + if (defined ($cookie) && $cookie =~ /^.AspNetCore.Cookies=([^;]+);.*/) { + $cookie = $1; + } else { + $self->{output}->output_add(long_msg => $content, debug => 1); + $self->{output}->add_option_msg(short_msg => "Error retrieving cookie"); + $self->{output}->option_exit(); + } + + my $datas = { last_timestamp => time(), cookie => $cookie, expires_on => time() + 7200 }; + $options{statefile}->write(data => $datas); + } + + return $cookie; +} + +sub request_api { + my ($self, %options) = @_; + + if (!defined($self->{cookie})) { + $self->{cookie} = $self->get_cookie(statefile => $self->{cache}); + } + + $self->settings(); + + my $content = $self->{http}->request(%options); + + my $decoded; + eval { + $decoded = JSON::XS->new->utf8->decode($content); + }; + if ($@) { + $self->{output}->output_add(long_msg => $content, debug => 1); + $self->{output}->add_option_msg(short_msg => "Cannot decode json response: $@"); + $self->{output}->option_exit(); + } + if (!defined($decoded)) { + $self->{output}->output_add(long_msg => $decoded, debug => 1); + $self->{output}->add_option_msg(short_msg => "Error while retrieving data (add --debug option for detailed message)"); + $self->{output}->option_exit(); + } + + return $decoded; +} + +sub internal_single_status { + my ($self, %options) = @_; + + my $status = $self->request_api(method => 'GET', url_path =>'/api/SystemStatus/GetSingleStatus'); + return $status; +} + +sub api_single_status { + my ($self, %options) = @_; + + my $status = $self->internal_single_status(); + return $status->{Health}; +} + +sub internal_system_status { + my ($self, %options) = @_; + + my $status = $self->request_api(method => 'GET', url_path =>'/api/SystemStatus'); + return $status; +} + +sub api_system_status { + my ($self, %options) = @_; + + my $status = $self->internal_system_status(); + return $status; +} + +1; + +__END__ + +=head1 NAME + +3CX Rest API + +=head1 REST API OPTIONS + +=over 8 + +=item B<--hostname> + +Set hostname or IP of 3CX server. + +=item B<--port> + +Set 3CX Port (Default: '443'). + +=item B<--proto> + +Specify https if needed (Default: 'https'). + +=item B<--api-username> + +Set 3CX Username. + +=item B<--api-password> + +Set 3CX Password. + +=item B<--timeout> + +Threshold for HTTP timeout (Default: '30'). + +=back + +=cut diff --git a/apps/3cx/restapi/mode/status.pm b/apps/3cx/restapi/mode/status.pm new file mode 100644 index 000000000..57d7a6c84 --- /dev/null +++ b/apps/3cx/restapi/mode/status.pm @@ -0,0 +1,81 @@ +# +# Copyright 2019 Centreon (http://www.centreon.com/) +# +# Centreon is a full-fledged industry-strength solution that meets +# the needs in IT infrastructure and application monitoring for +# service performance. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +package apps::3cx::restapi::mode::status; + +use base qw(centreon::plugins::mode); + +use strict; +use warnings; + +sub new { + my ($class, %options) = @_; + my $self = $class->SUPER::new(package => __PACKAGE__, %options); + bless $self, $class; + + $self->{version} = '1.0'; + $options{options}->add_options(arguments => + { + }); + return $self; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::init(%options); +} + +sub manage_selection { + my ($self, %options) = @_; + + $self->{single} = $options{custom}->api_single_status(); + $self->{system} = $options{custom}->api_system_status(); +} + +sub run { + my ($self, %options) = @_; + + $self->manage_selection(%options); + foreach my $item (sort keys %{$self->{single}}) { + $self->{output}->output_add(severity => $self->{single}->{$item} ? 'OK' : 'CRITICAL', + short_msg => $item . ': ' . ($self->{single}->{$item} ? 'OK' : 'NOK')); + } + $self->{output}->output_add(severity => $self->{system}->{HasNotRunningServices} ? 'CRITICAL' : 'OK', + short_msg => 'Services: ' . ($self->{system}->{HasNotRunningServices} ? 'NOK' : 'OK')); + $self->{output}->output_add(severity => $self->{system}->{HasUnregisteredSystemExtensions} ? 'CRITICAL' : 'OK', + short_msg => 'Extensions: ' . ($self->{system}->{HasUnregisteredSystemExtensions} ? 'NOK' : 'OK')); + + $self->{output}->display(force_ignore_perfdata => 1); + $self->{output}->exit(); +} + +1; + +__END__ + +=head1 MODE + +List status + +=over 8 + +=back + +=cut From dceb4ca3ca8b3a005fa6647aaddfcf4e9327a5ea Mon Sep 17 00:00:00 2001 From: CPbN Date: Sun, 7 Apr 2019 16:54:17 +0200 Subject: [PATCH 2/6] Cookie expires after one month --- apps/3cx/restapi/custom/api.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/3cx/restapi/custom/api.pm b/apps/3cx/restapi/custom/api.pm index 568019210..158365246 100644 --- a/apps/3cx/restapi/custom/api.pm +++ b/apps/3cx/restapi/custom/api.pm @@ -164,7 +164,7 @@ sub get_cookie { $self->{output}->option_exit(); } - my $datas = { last_timestamp => time(), cookie => $cookie, expires_on => time() + 7200 }; + my $datas = { last_timestamp => time(), cookie => $cookie, expires_on => time() + (3600 * 24) }; $options{statefile}->write(data => $datas); } From 420613a6ac39164ddd3ebcc654c19a92e0f07405 Mon Sep 17 00:00:00 2001 From: CPbN Date: Sun, 7 Apr 2019 17:12:40 +0200 Subject: [PATCH 3/6] Return CRITICAL when portal does not respond as expected --- apps/3cx/restapi/custom/api.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/3cx/restapi/custom/api.pm b/apps/3cx/restapi/custom/api.pm index 158365246..ff314e64a 100644 --- a/apps/3cx/restapi/custom/api.pm +++ b/apps/3cx/restapi/custom/api.pm @@ -124,8 +124,8 @@ sub build_options_for_httplib { $self->{option_results}->{ssl_opt} = $self->{ssl_opt}; $self->{option_results}->{timeout} = $self->{timeout}; $self->{option_results}->{warning_status} = ''; - $self->{option_results}->{critical_status} = ''; - $self->{option_results}->{unknown_status} = '%{http_code} < 200 or %{http_code} >= 300'; + $self->{option_results}->{critical_status} = '%{http_code} < 200 or %{http_code} >= 300'; + $self->{option_results}->{unknown_status} = ''; } sub settings { From bbd5339f4962a0a996407c87c943715a421e2070 Mon Sep 17 00:00:00 2001 From: CPbN Date: Mon, 8 Apr 2019 08:57:39 +0200 Subject: [PATCH 4/6] Move plugin to voip folder --- apps/{ => voip}/3cx/plugin.pm | 6 +++--- apps/{ => voip}/3cx/restapi/custom/api.pm | 2 +- apps/{ => voip}/3cx/restapi/mode/status.pm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename apps/{ => voip}/3cx/plugin.pm (86%) rename apps/{ => voip}/3cx/restapi/custom/api.pm (99%) rename apps/{ => voip}/3cx/restapi/mode/status.pm (98%) diff --git a/apps/3cx/plugin.pm b/apps/voip/3cx/plugin.pm similarity index 86% rename from apps/3cx/plugin.pm rename to apps/voip/3cx/plugin.pm index b5ee82b48..7bd976b30 100644 --- a/apps/3cx/plugin.pm +++ b/apps/voip/3cx/plugin.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package apps::3cx::restapi::plugin; +package apps::voip::3cx::restapi::plugin; use strict; use warnings; @@ -32,10 +32,10 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'status' => 'apps::3cx::restapi::mode::status', + 'status' => 'apps::voip::3cx::restapi::mode::status', ); - $self->{custom_modes}{api} = 'apps::3cx::restapi::custom::api'; + $self->{custom_modes}{api} = 'apps::voip::3cx::restapi::custom::api'; return $self; } diff --git a/apps/3cx/restapi/custom/api.pm b/apps/voip/3cx/restapi/custom/api.pm similarity index 99% rename from apps/3cx/restapi/custom/api.pm rename to apps/voip/3cx/restapi/custom/api.pm index ff314e64a..cf98ddb37 100644 --- a/apps/3cx/restapi/custom/api.pm +++ b/apps/voip/3cx/restapi/custom/api.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package apps::3cx::restapi::custom::api; +package apps::voip::3cx::restapi::custom::api; use base qw(centreon::plugins::mode); diff --git a/apps/3cx/restapi/mode/status.pm b/apps/voip/3cx/restapi/mode/status.pm similarity index 98% rename from apps/3cx/restapi/mode/status.pm rename to apps/voip/3cx/restapi/mode/status.pm index 57d7a6c84..31156133c 100644 --- a/apps/3cx/restapi/mode/status.pm +++ b/apps/voip/3cx/restapi/mode/status.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package apps::3cx::restapi::mode::status; +package apps::voip::3cx::restapi::mode::status; use base qw(centreon::plugins::mode); From 608181aa16e0b08e58b28e33923ee165c9ea725a Mon Sep 17 00:00:00 2001 From: CPbN Date: Mon, 8 Apr 2019 11:47:01 +0200 Subject: [PATCH 5/6] Add soem perfdata --- apps/voip/3cx/restapi/custom/api.pm | 26 ++++++++++++++++++-------- apps/voip/3cx/restapi/mode/status.pm | 11 +++++++---- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/apps/voip/3cx/restapi/custom/api.pm b/apps/voip/3cx/restapi/custom/api.pm index cf98ddb37..4284beac0 100644 --- a/apps/voip/3cx/restapi/custom/api.pm +++ b/apps/voip/3cx/restapi/custom/api.pm @@ -133,20 +133,22 @@ sub settings { $self->build_options_for_httplib(); $self->{http}->add_header(key => 'Content-Type', value => 'application/json;charset=UTF-8'); - if (defined($self->{cookie})) { + if (defined($self->{cookie}) && defined($self->{xsrf})) { $self->{http}->add_header(key => 'Cookie', value => '.AspNetCore.Cookies=' . $self->{cookie}); + $self->{http}->add_header(key => 'X-XSRF-TOKEN', value => $self->{xsrf}); } $self->{http}->set_options(%{$self->{option_results}}); } -sub get_cookie { +sub authenticate { my ($self, %options) = @_; my $has_cache_file = $options{statefile}->read(statefile => '3cx_api_' . md5_hex($self->{option_results}->{hostname}) . '_' . md5_hex($self->{option_results}->{api_username})); my $cookie = $options{statefile}->get(name => 'cookie'); + my $xsrf = $options{statefile}->get(name => 'xsrf'); my $expires_on = $options{statefile}->get(name => 'expires_on'); - if ($has_cache_file == 0 || !defined($cookie) || (($expires_on - time()) < 10)) { + if ($has_cache_file == 0 || !defined($cookie) || !defined($xsrf) || (($expires_on - time()) < 10)) { my $post_data = '{"Username":"' . $self->{api_username} . '",' . '"Password":"' . $self->{api_password} . '"}'; @@ -155,27 +157,35 @@ sub get_cookie { my $content = $self->{http}->request(method => 'POST', query_form_post => $post_data, url_path => '/api/login'); - $cookie = $self->{http}->get_header(name => 'Set-Cookie'); - if (defined ($cookie) && $cookie =~ /^.AspNetCore.Cookies=([^;]+);.*/) { + my $header = $self->{http}->get_header(name => 'Set-Cookie'); + if (defined ($header) && $header =~ /(?:^| ).AspNetCore.Cookies=([^;]+);.*/) { $cookie = $1; } else { $self->{output}->output_add(long_msg => $content, debug => 1); $self->{output}->add_option_msg(short_msg => "Error retrieving cookie"); $self->{output}->option_exit(); } + if (defined ($header) && $header =~ /(?:^| )XSRF-TOKEN=([^;]+);.*/) { + $xsrf = $1; + } else { + $self->{output}->output_add(long_msg => $content, debug => 1); + $self->{output}->add_option_msg(short_msg => "Error retrieving xsrf-token"); + $self->{output}->option_exit(); + } - my $datas = { last_timestamp => time(), cookie => $cookie, expires_on => time() + (3600 * 24) }; + my $datas = { last_timestamp => time(), cookie => $cookie, xsrf => $xsrf, expires_on => time() + (3600 * 24) }; $options{statefile}->write(data => $datas); } - return $cookie; + $self->{cookie} = $cookie; + $self->{xsrf} = $xsrf; } sub request_api { my ($self, %options) = @_; if (!defined($self->{cookie})) { - $self->{cookie} = $self->get_cookie(statefile => $self->{cache}); + $self->authenticate(statefile => $self->{cache}); } $self->settings(); diff --git a/apps/voip/3cx/restapi/mode/status.pm b/apps/voip/3cx/restapi/mode/status.pm index 31156133c..bf7aeb592 100644 --- a/apps/voip/3cx/restapi/mode/status.pm +++ b/apps/voip/3cx/restapi/mode/status.pm @@ -55,14 +55,17 @@ sub run { $self->manage_selection(%options); foreach my $item (sort keys %{$self->{single}}) { $self->{output}->output_add(severity => $self->{single}->{$item} ? 'OK' : 'CRITICAL', - short_msg => $item . ': ' . ($self->{single}->{$item} ? 'OK' : 'NOK')); + short_msg => $item); } $self->{output}->output_add(severity => $self->{system}->{HasNotRunningServices} ? 'CRITICAL' : 'OK', - short_msg => 'Services: ' . ($self->{system}->{HasNotRunningServices} ? 'NOK' : 'OK')); + short_msg => 'Services'); $self->{output}->output_add(severity => $self->{system}->{HasUnregisteredSystemExtensions} ? 'CRITICAL' : 'OK', - short_msg => 'Extensions: ' . ($self->{system}->{HasUnregisteredSystemExtensions} ? 'NOK' : 'OK')); + short_msg => 'Extensions'); - $self->{output}->display(force_ignore_perfdata => 1); + $self->{output}->perfdata_add(label => "CallsActive", unit => '', value => $self->{system}->{CallsActive}); + $self->{output}->perfdata_add(label => "ExtensionsRegistered", unit => '', value => $self->{system}->{ExtensionsRegistered}); + + $self->{output}->display(); $self->{output}->exit(); } From d89ff9184effb8965d5fa9764442eb5e85a03c74 Mon Sep 17 00:00:00 2001 From: CPbN Date: Sun, 14 Apr 2019 14:56:35 +0200 Subject: [PATCH 6/6] Typo & comments --- apps/voip/3cx/restapi/mode/status.pm | 1 + apps/voip/3cx/{ => restapi}/plugin.pm | 0 2 files changed, 1 insertion(+) rename apps/voip/3cx/{ => restapi}/plugin.pm (100%) diff --git a/apps/voip/3cx/restapi/mode/status.pm b/apps/voip/3cx/restapi/mode/status.pm index bf7aeb592..246a846b5 100644 --- a/apps/voip/3cx/restapi/mode/status.pm +++ b/apps/voip/3cx/restapi/mode/status.pm @@ -54,6 +54,7 @@ sub run { $self->manage_selection(%options); foreach my $item (sort keys %{$self->{single}}) { + # As of 3CX 15.5 / 16, we have Firewall, Phones, Trunks $self->{output}->output_add(severity => $self->{single}->{$item} ? 'OK' : 'CRITICAL', short_msg => $item); } diff --git a/apps/voip/3cx/plugin.pm b/apps/voip/3cx/restapi/plugin.pm similarity index 100% rename from apps/voip/3cx/plugin.pm rename to apps/voip/3cx/restapi/plugin.pm