From cd1e0469296d6b24cfc611f1dcf65068a1d71466 Mon Sep 17 00:00:00 2001
From: garnier-quentin <garnier.quentin@gmail.com>
Date: Tue, 2 Jul 2019 16:11:41 +0200
Subject: [PATCH] Fix #1560

---
 .../network/checkpoint/snmp/mode/memory.pm    | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/centreon-plugins/network/checkpoint/snmp/mode/memory.pm b/centreon-plugins/network/checkpoint/snmp/mode/memory.pm
index fbc9166ac..ba780f7d5 100644
--- a/centreon-plugins/network/checkpoint/snmp/mode/memory.pm
+++ b/centreon-plugins/network/checkpoint/snmp/mode/memory.pm
@@ -124,26 +124,29 @@ sub manage_selection {
     my $oid_memFreeReal64 = '.1.3.6.1.4.1.2620.1.6.7.4.5.0';
     my $oid_fwKmemFailedAlloc = '.1.3.6.1.4.1.2620.1.1.26.2.15.0';
 
-    my $results = $options{snmp}->get_leef(oids => [$oid_memTotalVirtual64, $oid_memActiveVirtual64, $oid_fwKmemFailedAlloc,
-                                                    $oid_memTotalReal64, $oid_memActiveReal64, $oid_memFreeReal64],
-                                           nothing_quit => 1);
+    my $results = $options{snmp}->get_leef(
+        oids => [
+            $oid_memTotalVirtual64, $oid_memActiveVirtual64, $oid_fwKmemFailedAlloc,
+            $oid_memTotalReal64, $oid_memActiveReal64, $oid_memFreeReal64
+        ],
+        nothing_quit => 1
+    );
 
-    my $free_bytes_swap = $results->{$oid_memTotalVirtual64} - $results->{$oid_memActiveVirtual64};
+    $self->{memory} = {
+        prct_used => $results->{$oid_memActiveReal64} * 100 / $results->{$oid_memTotalReal64},
+        used => $results->{$oid_memActiveReal64},
+        free => $results->{$oid_memFreeReal64},
+        total => $results->{$oid_memTotalReal64},
+    };
 
-    $self->{memory} = {prct_used => $results->{$oid_memActiveReal64} * 100 / $results->{$oid_memTotalReal64},
-                       used => $results->{$oid_memActiveReal64},
-                       free => $results->{$oid_memFreeReal64},
-                       total => $results->{$oid_memTotalReal64},
-                      };
-
-    $self->{swap} = {prct_used => $results->{$oid_memActiveVirtual64} * 100 / $results->{$oid_memTotalVirtual64},
-                     used => $results->{$oid_memActiveVirtual64},
-                     free => $free_bytes_swap,
-                     total => $results->{$oid_memTotalVirtual64},
-                    };
-
-    $self->{malloc} = {failed_mallocs => $results->{$oid_fwKmemFailedAlloc}};
+    $self->{swap} = {
+        prct_used => ($results->{$oid_memActiveVirtual64} - $results->{$oid_memActiveReal64}) * 100 / ($results->{$oid_memTotalVirtual64} - $results->{$oid_memTotalReal64}),
+        used => $results->{$oid_memActiveVirtual64} - $results->{$oid_memActiveReal64},
+        free => $results->{$oid_memTotalVirtual64} - $results->{$oid_memTotalReal64} - ($results->{$oid_memActiveVirtual64} - $results->{$oid_memActiveReal64})
+        total => $results->{$oid_memTotalVirtual64} - $results->{$oid_memTotalReal64}
+    };
 
+    $self->{malloc} = { failed_mallocs => $results->{$oid_fwKmemFailedAlloc} };
 }
 
 1;