From 4092f4a87476fb7b715619e7ef31563b263aa9fa Mon Sep 17 00:00:00 2001
From: Sims24 <sbomm@centreon.com>
Date: Wed, 15 Apr 2020 12:13:25 +0200
Subject: [PATCH] + add capability to NOT aggregate

---
 apps/centreon/sql/mode/virtualservice.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/centreon/sql/mode/virtualservice.pm b/apps/centreon/sql/mode/virtualservice.pm
index 389597712..911381522 100644
--- a/apps/centreon/sql/mode/virtualservice.pm
+++ b/apps/centreon/sql/mode/virtualservice.pm
@@ -323,7 +323,10 @@ sub manage_selection {
             $self->{vmetrics}->{$vcurve}->{aggregated_value} = sprintf(
                 $config_data->{formatting}->{printf_metric_value},
                 max(@{$self->{vmetrics}->{$vcurve}->{values}})) if ($config_data->{virtualcurve}->{$vcurve}->{aggregation} eq 'max');
-            $self->{vmetrics}->{$vcurve}->{aggregated_value} = eval "$self->{vmetrics}->{$vcurve}->{aggregated_value} $config_data->{virtualcurve}->{$vcurve}->{custom}" if (defined($config_data->{virtualcurve}->{$vcurve}->{custom}));
+
+            $self->{vmetrics}->{$vcurve}->{aggregated_value} = ($config_data->{virtualcurve}->{$vcurve}->{aggregation} eq 'none' && defined($config_data->{virtualcurve}->{$vcurve}->{custom})) ?
+								  eval "$config_data->{virtualcurve}->{$vcurve}->{custom}" : 
+								  eval "$self->{vmetrics}->{$vcurve}->{aggregated_value} $config_data->{virtualcurve}->{$vcurve}->{custom}";
 
             $self->{vmetrics}->{$vcurve}->{unit} = (defined($config_data->{virtualcurve}->{$vcurve}->{unit})) ? $config_data->{virtualcurve}->{$vcurve}->{unit} : '';
             $self->{vmetrics}->{$vcurve}->{min} = (defined($config_data->{virtualcurve}->{$vcurve}->{min})) ? $config_data->{virtualcurve}->{$vcurve}->{min} : '';