diff --git a/network/cisco/cces/restapi/custom/api.pm b/network/cisco/cces/restapi/custom/api.pm
index c97a700ea..ea5a00a2b 100644
--- a/network/cisco/cces/restapi/custom/api.pm
+++ b/network/cisco/cces/restapi/custom/api.pm
@@ -193,18 +193,18 @@ sub authenticate {
 sub request_api {
     my ($self, %options) = @_;
 
-    #my $plop = do {
-    #    local $/ = undef;
-    #    if (!open my $fh, "<", '/tmp/plop2.txt') {
-    #        $self->{output}->add_option_msg(short_msg => "Could not open file $self->{option_results}->{$_} : $!");
-    #        $self->{output}->option_exit();
-    #    }
-    #    <$fh>;
-    #};
-    #eval {
-    #    $plop = XMLin($plop, ForceArray => $options{ForceArray}, KeyAttr => []);
-    #};
-    #return $plop;
+    my $plop = do {
+        local $/ = undef;
+        if (!open my $fh, "<", '/tmp/plop3.txt') {
+            $self->{output}->add_option_msg(short_msg => "Could not open file $self->{option_results}->{$_} : $!");
+            $self->{output}->option_exit();
+        }
+        <$fh>;
+    };
+    eval {
+        $plop = XMLin($plop, ForceArray => $options{ForceArray}, KeyAttr => []);
+    };
+    return $plop;
 
     $self->settings();
     if (!defined($self->{session_cookie})) {
diff --git a/network/cisco/cces/restapi/mode/callssummary.pm b/network/cisco/cces/restapi/mode/callssummary.pm
index a174e583b..fc66c5a39 100644
--- a/network/cisco/cces/restapi/mode/callssummary.pm
+++ b/network/cisco/cces/restapi/mode/callssummary.pm
@@ -58,7 +58,7 @@ sub set_counters {
     $self->{maps_counters}->{global} = [
         { label => 'total-finished', nlabel => 'calls.total.finished.count', set => {
                 key_values => [ { name => 'new_calls' } ],
-                output_template => 'total calls finished: %s',
+                output_template => 'total calls finished: %d',
                 output_change_bytes => 1,
                 perfdatas => [
                     { value => 'new_calls_absolute', template => '%d', min => 0 },
diff --git a/network/cisco/cces/restapi/mode/diagnostics.pm b/network/cisco/cces/restapi/mode/diagnostics.pm
new file mode 100644
index 000000000..a3cec6eb4
--- /dev/null
+++ b/network/cisco/cces/restapi/mode/diagnostics.pm
@@ -0,0 +1,141 @@
+#
+# Copyright 2018 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 network::cisco::cces::restapi::mode::diagnostics;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+use POSIX;
+use centreon::plugins::misc;
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold);
+
+sub custom_status_output {
+    my ($self, %options) = @_;
+
+    return sprintf(
+        'alarm [level: %s] [type: %s] [description: %s]',
+        $self->{result_values}->{level},
+        $self->{result_values}->{type}, 
+        $self->{result_values}->{description}
+    );
+}
+
+sub custom_status_calc {
+    my ($self, %options) = @_;
+
+    $self->{result_values}->{description} = $options{new_datas}->{$self->{instance} . '_Description'};
+    $self->{result_values}->{level} = $options{new_datas}->{$self->{instance} . '_Level'};
+    $self->{result_values}->{type} = $options{new_datas}->{$self->{instance} . '_Type'};
+    return 0;
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+
+    $self->{maps_counters_type} = [
+        { name => 'alarms', type => 2, message_multiple => '0 problem(s) detected', display_counter_problem => { label => 'alerts', min => 0 },
+          group => [ { name => 'alarm', skipped_code => { -11 => 1 } } ] 
+        }
+    ];
+
+    $self->{maps_counters}->{alarm} = [
+        { label => 'status', threshold => 0, set => {
+                key_values => [ { name => 'Description' }, { name => 'Level' }, { name => 'Type' } ],
+                closure_custom_calc => $self->can('custom_status_calc'),
+                closure_custom_output => $self->can('custom_status_output'),
+                closure_custom_perfdata => sub { return 0; },
+                closure_custom_threshold_check => \&catalog_status_threshold,
+            }
+        },
+    ];
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $options{options}->add_options(arguments => {
+        'filter-msg:s'        => { name => 'filter_msg' },
+        'warning-status:s'    => { name => 'warning_status', default => '%{level} =~ /warning|minor/i' },
+        'critical-status:s'   => { name => 'critical_status', default => '%{level} =~ /critical|major/i' },
+    });
+
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    $self->change_macros(macros => ['warning_status', 'critical_status']);
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    $self->{alarms}->{global} = { alarm => {} };
+    my $result = $options{custom}->request_api(
+        method => 'POST',
+        url_path => '/putxml',
+        query_form_post => '<Command><Diagnostics><Run><ResultSet>Alerts</ResultSet></Run></Diagnostics></Command>',
+        ForceArray => ['Message']
+    );
+
+    foreach (@{$result->{DiagnosticsRunResult}->{Message}}) {
+        if (defined($self->{option_results}->{filter_msg}) && $self->{option_results}->{filter_msg} ne '' &&
+            $_->{Description} !~ /$self->{option_results}->{filter_msg}/) {
+            $self->{output}->output_add(long_msg => "skipping '" . $_->{Description} . "': no matching filter.", debug => 1);
+            next;
+        }
+
+        $self->{alarms}->{global}->{alarm}->{$_->{item}} = $_;
+    }
+}
+        
+1;
+
+__END__
+
+=head1 MODE
+
+Check diagnostic messages.
+
+=over 8
+
+=item B<--filter-msg>
+
+Filter by message (can be a regexp).
+
+=item B<--warning-status>
+
+Set warning threshold for status (Default: '%{level} =~ /warning|minor/i')
+Can used special variables like: %{description}, %{level}, %{type}
+
+=item B<--critical-status>
+
+Set critical threshold for status (Default: '%{level} =~ /critical|major/i').
+Can used special variables like: %{description}, %{level}, %{type}
+
+=back
+
+=cut
diff --git a/network/cisco/cces/restapi/plugin.pm b/network/cisco/cces/restapi/plugin.pm
index 965327d65..0a5a1c442 100644
--- a/network/cisco/cces/restapi/plugin.pm
+++ b/network/cisco/cces/restapi/plugin.pm
@@ -35,6 +35,7 @@ sub new {
         'components'    => 'network::cisco::cces::restapi::mode::components',
         'calls-summary' => 'network::cisco::cces::restapi::mode::callssummary',
         'calls-rt'      => 'network::cisco::cces::restapi::mode::callsrt',
+        'diagnostics'   => 'network::cisco::cces::restapi::mode::diagnostics',
     );
 
     $self->{custom_modes}{api} = 'network::cisco::cces::restapi::custom::api';