From 2aecd211bf14191e102c281dfcd0bedf8fe7abd7 Mon Sep 17 00:00:00 2001
From: Lucie Dubrunfaut <ldubrunfaut@CNTR-PORT-A198>
Date: Fri, 10 Jan 2025 11:49:25 +0100
Subject: [PATCH 1/3] Fixed wrong count when using threshold-overload option
 and memories are not equipped

---
 .../server/cisco/ucs/snmp/mode/components/memory.pm         | 6 ++++--
 src/hardware/server/cisco/ucs/snmp/mode/equipment.pm        | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/hardware/server/cisco/ucs/snmp/mode/components/memory.pm b/src/hardware/server/cisco/ucs/snmp/mode/components/memory.pm
index b3e905eca..f8bb7ba96 100644
--- a/src/hardware/server/cisco/ucs/snmp/mode/components/memory.pm
+++ b/src/hardware/server/cisco/ucs/snmp/mode/components/memory.pm
@@ -77,8 +77,10 @@ sub check {
             );
             next;
         }
-        
-        $self->{components}->{memory}->{total}++;
+
+        if($result->{cucsMemoryUnitPresence} eq "equipped") {
+            $self->{components}->{memory}->{total}++;
+        }
 
         $exit = $self->get_severity(section => 'memory.operability', label => 'default.operability', value => $result2->{cucsMemoryUnitOperState});
         if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
diff --git a/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm b/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm
index c356b82c9..18628086b 100644
--- a/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm
+++ b/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm
@@ -89,6 +89,9 @@ Use this option to override the status returned by the plugin when the status la
 Example: --threshold-overload='fan.operability,OK,poweredOff|removed' 
 --threshold-overload='presence,OK,missing' 
 --threshold-overload='operability,OK,removed'
+NB: For the memory component you may need to set this option twice if presence status doesn't
+return OK state and you want to override the operability status. Example when memories are missing because of removing.
+--threshold-overload='presence,OK,missing' --threshold-overload='operability,OK,removed'
 
 =back
 

From f4d4ccbca5dbe58ba316182e6b5eb91110708926 Mon Sep 17 00:00:00 2001
From: EvanAdam <eadam@centreon.com>
Date: Tue, 25 Feb 2025 14:47:50 +0100
Subject: [PATCH 2/3] fix(cisco): fix spellcheck

Refs:CTOR-1294
---
 src/hardware/server/cisco/ucs/snmp/mode/equipment.pm | 4 ++--
 tests/resources/spellcheck/stopwords.txt             | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm b/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm
index 18628086b..78eeb7bad 100644
--- a/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm
+++ b/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm
@@ -60,14 +60,14 @@ __END__
 
 =head1 MODE
 
-Check Hardware (Fans, Power supplies, chassis, io cards, blades, fabric extenders).
+Check Hardware (Fans, Power supplies, chassis, io-cards, blades, fabric extenders).
 
 =over 8
 
 =item B<--component>
 
 Which component to check (default: '.*').
-Can be: 'fan', 'psu', 'chassis', 'iocard', 'blade', 'fex', 'cpu', 'memory', 'localdisk'.
+Can be: C<fan>, C<psu>, C<chassis>, C<iocard>, C<blade>, C<fex>, C<cpu>, C<memory>, C<localdisk>.
 
 =item B<--filter>
 
diff --git a/tests/resources/spellcheck/stopwords.txt b/tests/resources/spellcheck/stopwords.txt
index 87cf6dbf9..553927ba6 100644
--- a/tests/resources/spellcheck/stopwords.txt
+++ b/tests/resources/spellcheck/stopwords.txt
@@ -109,6 +109,7 @@ in-mcast
 interface-dsl-name
 InterrupibleSleep
 in-ucast
+io-cards
 iops
 IpAddr
 ip-label

From e2c193f941b3bcf7f07f3c911e0a0073cc4a7236 Mon Sep 17 00:00:00 2001
From: Lucie Dubrunfaut <123162035+lucie-dubrunfaut@users.noreply.github.com>
Date: Thu, 27 Feb 2025 15:17:19 +0100
Subject: [PATCH 3/3] Update
 src/hardware/server/cisco/ucs/snmp/mode/equipment.pm

Co-authored-by: sdepassio <114986849+sdepassio@users.noreply.github.com>
---
 src/hardware/server/cisco/ucs/snmp/mode/equipment.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm b/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm
index 78eeb7bad..57e170ede 100644
--- a/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm
+++ b/src/hardware/server/cisco/ucs/snmp/mode/equipment.pm
@@ -60,7 +60,7 @@ __END__
 
 =head1 MODE
 
-Check Hardware (Fans, Power supplies, chassis, io-cards, blades, fabric extenders).
+Check Hardware (Fans, Power supplies, chassis, I/O cards, blades, fabric extenders).
 
 =over 8