From ccb5c4fbaba5a6020e8747d59eb6700a1817cd54 Mon Sep 17 00:00:00 2001
From: CPbN <40244829+CPbN@users.noreply.github.com>
Date: Tue, 14 Jan 2020 18:56:16 +0100
Subject: [PATCH 1/8] Add Dynatrace plugin

---
 apps/dynatrace/restapi/custom/api.pm   | 202 +++++++++++++++++++++++++
 apps/dynatrace/restapi/mode/problem.pm | 160 ++++++++++++++++++++
 apps/dynatrace/restapi/plugin.pm       |  54 +++++++
 3 files changed, 416 insertions(+)
 create mode 100644 apps/dynatrace/restapi/custom/api.pm
 create mode 100644 apps/dynatrace/restapi/mode/problem.pm
 create mode 100644 apps/dynatrace/restapi/plugin.pm

diff --git a/apps/dynatrace/restapi/custom/api.pm b/apps/dynatrace/restapi/custom/api.pm
new file mode 100644
index 000000000..958d1353b
--- /dev/null
+++ b/apps/dynatrace/restapi/custom/api.pm
@@ -0,0 +1,202 @@
+#
+# Copyright 2020 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::dynatrace::restapi::custom::api;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use centreon::plugins::http;
+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-token:s"           => { name => 'api_token' },
+            "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);
+
+    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_token} = (defined($self->{option_results}->{api_token})) ? $self->{option_results}->{api_token} : 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_token}) || $self->{api_token} eq '') {
+        $self->{output}->add_option_msg(short_msg => "Need to specify --api-token option.");
+        $self->{output}->option_exit();
+    }
+
+    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};
+}
+
+sub settings {
+    my ($self, %options) = @_;
+
+    $self->build_options_for_httplib();
+    $self->{http}->add_header(key => 'Content-Type', value => 'application/json;charset=UTF-8');
+    $self->{http}->add_header(key => 'Authorization', value => 'Api-Token ' . $self->{option_results}->{api_token});
+    $self->{http}->set_options(%{$self->{option_results}});
+}
+
+sub request_api {
+    my ($self, %options) = @_;
+
+    $self->settings();
+
+    my $content = $self->{http}->request(%options, 
+        warning_status => '', unknown_status => '%{http_code} < 200 or %{http_code} >= 300', critical_status => ''
+    );
+
+    my $decoded;
+    eval {
+        $decoded = JSON::XS->new->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_problem {
+    my ($self, %options) = @_;
+
+    my $status = $self->request_api(method => 'GET', url_path =>'/api/v1/problem/feed?relativeTime=' . $self->{option_results}->{relative_time});
+    return $status;
+}
+
+sub api_problem {
+    my ($self, %options) = @_;
+
+    my $status = $self->internal_problem();
+    return $status->{result}->{problems};
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Dynatrace Rest API
+
+=head1 REST API OPTIONS
+
+=over 8
+
+=item B<--hostname>
+
+Set hostname or IP of Dynatrace server.
+
+=item B<--port>
+
+Set Dynatrace Port (Default: '443').
+
+=item B<--proto>
+
+Specify http if needed (Default: 'https').
+
+=item B<--api-token>
+
+Set Dynatrace API token.
+
+=item B<--timeout>
+
+Threshold for HTTP timeout (Default: '30').
+
+=back
+
+=cut
diff --git a/apps/dynatrace/restapi/mode/problem.pm b/apps/dynatrace/restapi/mode/problem.pm
new file mode 100644
index 000000000..94c0f142c
--- /dev/null
+++ b/apps/dynatrace/restapi/mode/problem.pm
@@ -0,0 +1,160 @@
+#
+# Copyright 2020 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::dynatrace::restapi::mode::problem;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+use List::MoreUtils qw(uniq);
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold);
+
+sub custom_status_output { 
+    my ($self, %options) = @_;
+
+    my $msg = '';
+    return $msg;
+}
+
+sub custom_status_calc {
+    my ($self, %options) = @_;
+
+    $self->{result_values}->{status} = $options{new_datas}->{$self->{instance} . '_status'};
+    $self->{result_values}->{impactLevel} = $options{new_datas}->{$self->{instance} . '_impactLevel'};
+    $self->{result_values}->{severityLevel} = $options{new_datas}->{$self->{instance} . '_severityLevel'};
+    $self->{result_values}->{entityName} = $options{new_datas}->{$self->{instance} . '_entityName'};
+    $self->{result_values}->{eventType} = $options{new_datas}->{$self->{instance} . '_eventType'};
+    $self->{result_values}->{entityId} = $options{new_datas}->{$self->{instance} . '_entityId'};
+    $self->{result_values}->{startTime} = $options{new_datas}->{$self->{instance} . '_startTime'};
+    $self->{result_values}->{endTime} = $options{new_datas}->{$self->{instance} . '_endTime'};
+    $self->{result_values}->{commentCount} = $options{new_datas}->{$self->{instance} . '_commentCount'};
+    return 0;
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+
+    $self->{maps_counters_type} = [
+        { name => 'problem', type => 1, cb_prefix_output => 'prefix_service_output', message_multiple => 'No problem' }
+    ];
+
+    $self->{maps_counters}->{problem} = [
+        { label => 'status', threshold => 0, set => {
+                key_values => [ { name => 'status' }, { name => 'impactLevel' }, { name => 'severityLevel' }, { name => 'entityName' }, { name => 'eventType' }, { name => 'entityId' }, { name => 'startTime' }, { name => 'endTime' }, { name => 'commentCount' } ],
+                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 prefix_service_output {
+    my ($self, %options) = @_;
+
+    return "Problem '" . $options{instance_value}->{displayName} ."'";
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
+    bless $self, $class;
+
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments => {
+        "relative-time:s"  => { name => 'relative_time', default => 'min' },
+        "unknown-status:s"  => { name => 'unknown_status', default => '' },
+        "warning-status:s"  => { name => 'warning_status', default => '' },
+        "critical-status:s" => { name => 'critical_status', default => '%{status} eq "OPEN"' },
+    });
+
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    $self->change_macros(macros => [
+        'warning_status', 'critical_status', 'unknown_status',
+    ]);
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my $problem = $options{custom}->api_problem(relative_time => $options{options}->{relative_time});
+    $self->{problem} = {};
+    foreach my $item (@{$problem}) {
+        $self->{problem}->{$item->{displayName}} = {
+            displayName => $item->{displayName},
+            status => $item->{status},
+            impactLevel => $item->{impactLevel},
+            severityLevel => $item->{severityLevel},
+            entityName => join(",", uniq map { "$_->{entityName}" } @{$item->{rankedImpacts}}),
+            eventType => join(",", uniq map { "$_->{eventType}" } @{$item->{rankedImpacts}}),
+            entityId => join(",", uniq map { "$_->{entityId}" } @{$item->{rankedImpacts}}),
+            startTime => $item->{startTime} / 1000,
+            endTime => $item->{endTime} > -1 ? $item->{endTime} / 1000 : -1,
+            commentCount => $item->{commentCount},
+        };
+    }
+
+use Data::Dumper;
+print Dumper($self->{problem});
+
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check problem
+
+=over 8
+
+=item B<--relative-time>
+
+Set request relative time (Default: 'min').
+Can use: min, 5mins, 10mins, 15mins, 30mins, hour, 2hours, 6hours, day, 3days, week, month.
+
+
+=item B<--unknown-status>
+
+Set unknown threshold for status.
+Can use special variables like: %{status}, %{impactLevel}, %{severityLevel}, %{entityName}, %{eventType}, %{entityId}, %{startTime}, %{endTime}, %{commentCount}
+
+=item B<--warning-status>
+
+Set warning threshold for status.
+Can use special variables like: %{status}, %{impactLevel}, %{severityLevel}, %{entityName}, %{eventType}, %{entityId}, %{startTime}, %{endTime}, %{commentCount}
+
+=item B<--critical-status>
+
+Set critical threshold for status (Default: '%{status} eq "OPEN"').
+Can use special variables like: %{status}, %{impactLevel}, %{severityLevel}, %{entityName}, %{eventType}, %{entityId}, %{startTime}, %{endTime}, %{commentCount}
+
+=back
+
+=cut
diff --git a/apps/dynatrace/restapi/plugin.pm b/apps/dynatrace/restapi/plugin.pm
new file mode 100644
index 000000000..092cfe1d3
--- /dev/null
+++ b/apps/dynatrace/restapi/plugin.pm
@@ -0,0 +1,54 @@
+#
+# Copyright 2020 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::dynatrace::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}} = (
+        'problem' => 'apps::dynatrace::restapi::mode::problem',
+    );
+
+    $self->{custom_modes}{api} = 'apps::dynatrace::restapi::custom::api';
+    return $self;
+}
+
+1;
+
+__END__
+
+=head1 PLUGIN DESCRIPTION
+
+Check Dynatrace through its HTTPS remote API.
+
+=over 8
+
+=back
+
+=cut

From 26c1247b98c9fb693a0ef62970b86eefda1c1ff9 Mon Sep 17 00:00:00 2001
From: CPbN <40244829+CPbN@users.noreply.github.com>
Date: Wed, 15 Jan 2020 10:21:27 +0100
Subject: [PATCH 2/8] Remove Dumper debug

---
 apps/dynatrace/restapi/mode/problem.pm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/dynatrace/restapi/mode/problem.pm b/apps/dynatrace/restapi/mode/problem.pm
index 94c0f142c..ef9a5db24 100644
--- a/apps/dynatrace/restapi/mode/problem.pm
+++ b/apps/dynatrace/restapi/mode/problem.pm
@@ -118,10 +118,6 @@ sub manage_selection {
             commentCount => $item->{commentCount},
         };
     }
-
-use Data::Dumper;
-print Dumper($self->{problem});
-
 }
 
 1;

From b75330dbc171ce3a207cb7eb21fa3879607316d4 Mon Sep 17 00:00:00 2001
From: CPbN <40244829+CPbN@users.noreply.github.com>
Date: Wed, 15 Jan 2020 16:59:12 +0100
Subject: [PATCH 3/8] Add number of problems open

---
 apps/dynatrace/restapi/mode/problem.pm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/apps/dynatrace/restapi/mode/problem.pm b/apps/dynatrace/restapi/mode/problem.pm
index ef9a5db24..0aa038938 100644
--- a/apps/dynatrace/restapi/mode/problem.pm
+++ b/apps/dynatrace/restapi/mode/problem.pm
@@ -53,9 +53,22 @@ sub set_counters {
     my ($self, %options) = @_;
 
     $self->{maps_counters_type} = [
+        { name => 'global', type => 0 },
         { name => 'problem', type => 1, cb_prefix_output => 'prefix_service_output', message_multiple => 'No problem' }
     ];
 
+    $self->{maps_counters}->{global} = [
+        { label => 'problems-open', nlabel => 'problems.open.current', set => {
+                key_values => [ { name => 'problems_open' } ],
+                output_template => 'problems open : %s',
+                perfdatas => [
+                    { label => 'problems_open',  template => '%s', value => 'problems_open_absolute',
+                      min => 0 },
+                ],
+            }
+        },
+    ];
+
     $self->{maps_counters}->{problem} = [
         { label => 'status', threshold => 0, set => {
                 key_values => [ { name => 'status' }, { name => 'impactLevel' }, { name => 'severityLevel' }, { name => 'entityName' }, { name => 'eventType' }, { name => 'entityId' }, { name => 'startTime' }, { name => 'endTime' }, { name => 'commentCount' } ],
@@ -103,6 +116,7 @@ sub manage_selection {
     my ($self, %options) = @_;
 
     my $problem = $options{custom}->api_problem(relative_time => $options{options}->{relative_time});
+    my $problems_open = 0;
     $self->{problem} = {};
     foreach my $item (@{$problem}) {
         $self->{problem}->{$item->{displayName}} = {
@@ -117,7 +131,14 @@ sub manage_selection {
             endTime => $item->{endTime} > -1 ? $item->{endTime} / 1000 : -1,
             commentCount => $item->{commentCount},
         };
+        if ($item->{status} eq 'OPEN') {
+            $problems_open++;
+        }
     }
+
+    $self->{global} = {
+        problems_open => $problems_open,
+    };
 }
 
 1;
@@ -151,6 +172,11 @@ Can use special variables like: %{status}, %{impactLevel}, %{severityLevel}, %{e
 Set critical threshold for status (Default: '%{status} eq "OPEN"').
 Can use special variables like: %{status}, %{impactLevel}, %{severityLevel}, %{entityName}, %{eventType}, %{entityId}, %{startTime}, %{endTime}, %{commentCount}
 
+=item B<--warning-*> B<--critical-*>
+
+Thresholds.
+Can be: 'problems-open'.
+
 =back
 
 =cut

From 529e8c2bf8216adc11b1094843e191480bae58e9 Mon Sep 17 00:00:00 2001
From: CPbN <40244829+CPbN@users.noreply.github.com>
Date: Wed, 15 Jan 2020 17:42:31 +0100
Subject: [PATCH 4/8] Typos

---
 apps/dynatrace/restapi/mode/problem.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/dynatrace/restapi/mode/problem.pm b/apps/dynatrace/restapi/mode/problem.pm
index 0aa038938..fdd0e0fe6 100644
--- a/apps/dynatrace/restapi/mode/problem.pm
+++ b/apps/dynatrace/restapi/mode/problem.pm
@@ -58,12 +58,11 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{global} = [
-        { label => 'problems-open', nlabel => 'problems.open.current', set => {
+        { label => 'problems-open', nlabel => 'problems.open.count', set => {
                 key_values => [ { name => 'problems_open' } ],
-                output_template => 'problems open : %s',
+                output_template => 'Number of problems open : %s',
                 perfdatas => [
-                    { label => 'problems_open',  template => '%s', value => 'problems_open_absolute',
-                      min => 0 },
+                    { template => '%s', value => 'problems_open_absolute', min => 0 },
                 ],
             }
         },

From 5d1a854a04265432f30526814bdba9493e8e15aa Mon Sep 17 00:00:00 2001
From: CPbN <40244829+CPbN@users.noreply.github.com>
Date: Wed, 15 Jan 2020 17:53:25 +0100
Subject: [PATCH 5/8] Simplify

---
 apps/dynatrace/restapi/mode/problem.pm | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/apps/dynatrace/restapi/mode/problem.pm b/apps/dynatrace/restapi/mode/problem.pm
index fdd0e0fe6..1388830f5 100644
--- a/apps/dynatrace/restapi/mode/problem.pm
+++ b/apps/dynatrace/restapi/mode/problem.pm
@@ -25,7 +25,7 @@ use base qw(centreon::plugins::templates::counter);
 use strict;
 use warnings;
 use List::MoreUtils qw(uniq);
-use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold);
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold catalog_status_calc);
 
 sub custom_status_output { 
     my ($self, %options) = @_;
@@ -34,21 +34,6 @@ sub custom_status_output {
     return $msg;
 }
 
-sub custom_status_calc {
-    my ($self, %options) = @_;
-
-    $self->{result_values}->{status} = $options{new_datas}->{$self->{instance} . '_status'};
-    $self->{result_values}->{impactLevel} = $options{new_datas}->{$self->{instance} . '_impactLevel'};
-    $self->{result_values}->{severityLevel} = $options{new_datas}->{$self->{instance} . '_severityLevel'};
-    $self->{result_values}->{entityName} = $options{new_datas}->{$self->{instance} . '_entityName'};
-    $self->{result_values}->{eventType} = $options{new_datas}->{$self->{instance} . '_eventType'};
-    $self->{result_values}->{entityId} = $options{new_datas}->{$self->{instance} . '_entityId'};
-    $self->{result_values}->{startTime} = $options{new_datas}->{$self->{instance} . '_startTime'};
-    $self->{result_values}->{endTime} = $options{new_datas}->{$self->{instance} . '_endTime'};
-    $self->{result_values}->{commentCount} = $options{new_datas}->{$self->{instance} . '_commentCount'};
-    return 0;
-}
-
 sub set_counters {
     my ($self, %options) = @_;
 
@@ -71,7 +56,7 @@ sub set_counters {
     $self->{maps_counters}->{problem} = [
         { label => 'status', threshold => 0, set => {
                 key_values => [ { name => 'status' }, { name => 'impactLevel' }, { name => 'severityLevel' }, { name => 'entityName' }, { name => 'eventType' }, { name => 'entityId' }, { name => 'startTime' }, { name => 'endTime' }, { name => 'commentCount' } ],
-                closure_custom_calc => $self->can('custom_status_calc'),
+                closure_custom_calc => \&catalog_status_calc,
                 closure_custom_output => $self->can('custom_status_output'),
                 closure_custom_perfdata => sub { return 0; },
                 closure_custom_threshold_check => \&catalog_status_threshold,

From c04eac18de95ff18acb43f7ea6eb96d4eb171c9a Mon Sep 17 00:00:00 2001
From: CPbN <40244829+CPbN@users.noreply.github.com>
Date: Wed, 15 Jan 2020 18:13:20 +0100
Subject: [PATCH 6/8] Enhance short output

---
 apps/dynatrace/restapi/mode/problem.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/dynatrace/restapi/mode/problem.pm b/apps/dynatrace/restapi/mode/problem.pm
index 1388830f5..127394ade 100644
--- a/apps/dynatrace/restapi/mode/problem.pm
+++ b/apps/dynatrace/restapi/mode/problem.pm
@@ -30,7 +30,7 @@ use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold
 sub custom_status_output { 
     my ($self, %options) = @_;
 
-    my $msg = '';
+    my $msg = 'detected';
     return $msg;
 }
 
@@ -39,13 +39,13 @@ sub set_counters {
 
     $self->{maps_counters_type} = [
         { name => 'global', type => 0 },
-        { name => 'problem', type => 1, cb_prefix_output => 'prefix_service_output', message_multiple => 'No problem' }
+        { name => 'problem', type => 1, cb_prefix_output => 'prefix_service_output', message_multiple => 'No problem detected' }
     ];
 
     $self->{maps_counters}->{global} = [
         { label => 'problems-open', nlabel => 'problems.open.count', set => {
                 key_values => [ { name => 'problems_open' } ],
-                output_template => 'Number of problems open : %s',
+                output_template => 'Number of open problems : %s',
                 perfdatas => [
                     { template => '%s', value => 'problems_open_absolute', min => 0 },
                 ],
@@ -68,7 +68,7 @@ sub set_counters {
 sub prefix_service_output {
     my ($self, %options) = @_;
 
-    return "Problem '" . $options{instance_value}->{displayName} ."'";
+    return "Problem '" . $options{instance_value}->{displayName} ."' ";
 }
 
 sub new {

From 7b8c412a79f568a8be1f5af9634ef66070e8f294 Mon Sep 17 00:00:00 2001
From: CPbN <40244829+CPbN@users.noreply.github.com>
Date: Thu, 16 Jan 2020 07:46:10 +0100
Subject: [PATCH 7/8] Use --api-password

so that tocken is hidden thanks to https://github.com/centreon/centreon/pull/7975
---
 apps/dynatrace/restapi/custom/api.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/dynatrace/restapi/custom/api.pm b/apps/dynatrace/restapi/custom/api.pm
index 958d1353b..dd346f7f8 100644
--- a/apps/dynatrace/restapi/custom/api.pm
+++ b/apps/dynatrace/restapi/custom/api.pm
@@ -47,7 +47,7 @@ sub new {
             "hostname:s"            => { name => 'hostname' },
             "port:s"                => { name => 'port'},
             "proto:s"               => { name => 'proto' },
-            "api-token:s"           => { name => 'api_token' },
+            "api-password:s"        => { name => 'api_password' },
             "timeout:s"             => { name => 'timeout', default => 30 },
         });
     }
@@ -91,14 +91,14 @@ sub check_options {
     $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_token} = (defined($self->{option_results}->{api_token})) ? $self->{option_results}->{api_token} : 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_token}) || $self->{api_token} eq '') {
-        $self->{output}->add_option_msg(short_msg => "Need to specify --api-token option.");
+    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();
     }
 
@@ -120,7 +120,7 @@ sub settings {
 
     $self->build_options_for_httplib();
     $self->{http}->add_header(key => 'Content-Type', value => 'application/json;charset=UTF-8');
-    $self->{http}->add_header(key => 'Authorization', value => 'Api-Token ' . $self->{option_results}->{api_token});
+    $self->{http}->add_header(key => 'Authorization', value => 'Api-Token ' . $self->{option_results}->{api_password});
     $self->{http}->set_options(%{$self->{option_results}});
 }
 
@@ -189,7 +189,7 @@ Set Dynatrace Port (Default: '443').
 
 Specify http if needed (Default: 'https').
 
-=item B<--api-token>
+=item B<--api-password>
 
 Set Dynatrace API token.
 

From 2d9eba2871ebdf8433a3e1e86beda856a40e980a Mon Sep 17 00:00:00 2001
From: CPbN <40244829+CPbN@users.noreply.github.com>
Date: Thu, 16 Jan 2020 07:58:30 +0100
Subject: [PATCH 8/8] Support Managed endpoints

---
 apps/dynatrace/restapi/custom/api.pm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/dynatrace/restapi/custom/api.pm b/apps/dynatrace/restapi/custom/api.pm
index dd346f7f8..65ca38ca5 100644
--- a/apps/dynatrace/restapi/custom/api.pm
+++ b/apps/dynatrace/restapi/custom/api.pm
@@ -45,6 +45,7 @@ sub new {
     if (!defined($options{noptions})) {
         $options{options}->add_options(arguments =>  {
             "hostname:s"            => { name => 'hostname' },
+            "environment-id:s"      => { name => 'environment_id' },
             "port:s"                => { name => 'port'},
             "proto:s"               => { name => 'proto' },
             "api-password:s"        => { name => 'api_password' },
@@ -86,7 +87,8 @@ sub set_defaults {
 sub check_options {
     my ($self, %options) = @_;
 
-    $self->{hostname} = (defined($self->{option_results}->{hostname})) ? $self->{option_results}->{hostname} : undef;
+    $self->{hostname} = (defined($self->{option_results}->{hostname})) ? $self->{option_results}->{hostname} : 'live.dynatrace.com';
+    $self->{environment_id} = (defined($self->{option_results}->{environment_id})) ? $self->{option_results}->{environment_id} : 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;
@@ -97,6 +99,10 @@ sub check_options {
         $self->{output}->add_option_msg(short_msg => "Need to specify --hostname option.");
         $self->{output}->option_exit();
     }
+    if (!defined($self->{environment_id}) || $self->{environment_id} eq '') {
+        $self->{output}->add_option_msg(short_msg => "Need to specify --environment-id 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();
@@ -108,7 +114,11 @@ sub check_options {
 sub build_options_for_httplib {
     my ($self, %options) = @_;
 
-    $self->{option_results}->{hostname} = $self->{hostname};
+    if ($self->{hostname} eq 'live.dynatrace.com') {
+        $self->{option_results}->{hostname} = $self->{environment_id} . '.' . $self->{hostname};
+    } else {
+        $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};
@@ -154,7 +164,7 @@ sub request_api {
 sub internal_problem {
     my ($self, %options) = @_;
 
-    my $status = $self->request_api(method => 'GET', url_path =>'/api/v1/problem/feed?relativeTime=' . $self->{option_results}->{relative_time});
+    my $status = $self->request_api(method => 'GET', url_path => (($self->{hostname} eq 'live.dynatrace.com') ? '' : '/e') . '/api/v1/problem/feed?relativeTime=' . $self->{option_results}->{relative_time});
     return $status;
 }
 
@@ -179,7 +189,11 @@ Dynatrace Rest API
 
 =item B<--hostname>
 
-Set hostname or IP of Dynatrace server.
+Set hostname or IP of Dynatrace server (Default: live.dynatrace.com).
+
+=item B<--environment-id>
+
+Set Dynatrace environment ID.
 
 =item B<--port>