From 8bd920de98170509c8b68c6f6f44ba8bbdefb435 Mon Sep 17 00:00:00 2001
From: UrBnW <40244829+UrBnW@users.noreply.github.com>
Date: Fri, 17 Apr 2020 10:56:30 +0200
Subject: [PATCH] Blade/Flex fix labels

---
 .../network/lenovo/flexsystem/snmp/mode/cpu.pm            | 6 +++---
 .../network/lenovo/flexsystem/snmp/mode/memory.pm         | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/centreon-plugins/network/lenovo/flexsystem/snmp/mode/cpu.pm b/centreon-plugins/network/lenovo/flexsystem/snmp/mode/cpu.pm
index 9f3e87c16..869d1bdb6 100644
--- a/centreon-plugins/network/lenovo/flexsystem/snmp/mode/cpu.pm
+++ b/centreon-plugins/network/lenovo/flexsystem/snmp/mode/cpu.pm
@@ -33,7 +33,7 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{cpu} = [
-        { label => 'average-1m', nlabel => 'switch.cpu.utilization.1m.percentage', set => {
+        { label => 'average-1m', nlabel => 'cpu.utilization.1m.percentage', set => {
                 key_values => [ { name => 'average_1m' }, { name => 'display' } ],
                 output_template => '%.2f %% (1m)',
                 perfdatas => [
@@ -42,7 +42,7 @@ sub set_counters {
                 ]
             }
         },
-        { label => 'average-5m', nlabel => 'switch.cpu.utilization.5m.percentage', set => {
+        { label => 'average-5m', nlabel => 'cpu.utilization.5m.percentage', set => {
                 key_values => [ { name => 'average_5m' }, { name => 'display' } ],
                 output_template => '%.2f %% (5m)',
                 perfdatas => [
@@ -100,7 +100,7 @@ sub manage_selection {
             next;
         }
 
-        $self->{cpu}->{$instance} = {
+        $self->{cpu}->{'switch' . $instance} = {
             display => $instance,
             %$result
         };
diff --git a/centreon-plugins/network/lenovo/flexsystem/snmp/mode/memory.pm b/centreon-plugins/network/lenovo/flexsystem/snmp/mode/memory.pm
index c3eae2c60..aeddb4205 100644
--- a/centreon-plugins/network/lenovo/flexsystem/snmp/mode/memory.pm
+++ b/centreon-plugins/network/lenovo/flexsystem/snmp/mode/memory.pm
@@ -46,7 +46,7 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{memory} = [
-        { label => 'usage', nlabel => 'switch.memory.usage.bytes', set => {
+        { label => 'usage', nlabel => 'memory.usage.bytes', set => {
                 key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ],
                 closure_custom_output => $self->can('custom_usage_output'),
                 perfdatas => [
@@ -55,7 +55,7 @@ sub set_counters {
                 ]
             }
         },
-        { label => 'usage-free', display_ok => 0, nlabel => 'switch.memory.free.bytes', set => {
+        { label => 'usage-free', display_ok => 0, nlabel => 'memory.free.bytes', set => {
                 key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ],
                 closure_custom_output => $self->can('custom_usage_output'),
                 perfdatas => [
@@ -64,7 +64,7 @@ sub set_counters {
                 ]
             }
         },
-        { label => 'usage-prct', display_ok => 0, nlabel => 'switch.memory.usage.percentage', set => {
+        { label => 'usage-prct', display_ok => 0, nlabel => 'memory.usage.percentage', set => {
                 key_values => [ { name => 'prct_used' }, { name => 'display' } ],
                 output_template => 'Ram Used : %.2f %%',
                 perfdatas => [
@@ -124,7 +124,7 @@ sub manage_selection {
         }
 
         my $prct_used = ($result->{total} - $result->{free}) * 100 / $result->{total};
-        $self->{memory}->{$instance} = {
+        $self->{memory}->{'switch' . $instance} = {
             display => $instance,
             prct_used => $prct_used,
             prct_free => 100 - $prct_used,