From 73e4f9e4d82797f906d05c913678231541a52a95 Mon Sep 17 00:00:00 2001
From: Laurence Oberman <loberman@redhat.com>
Date: Thu, 13 Jun 2024 09:14:33 -0400
Subject: [PATCH] 4.3.10  Jun 12 2024   - Fixed an issue reported by Martin
 where nvme devices were not being aggregated in  the summary display for
 disks   - Tags will be properly updated now, I had missed that when I took
 this over

---
 RELEASE-collectl | 5 +++++
 collectl         | 9 ++++++++-
 collectl.conf    | 2 +-
 formatit.ph      | 4 +++-
 4 files changed, 17 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 collectl.conf
 mode change 100755 => 100644 formatit.ph

diff --git a/RELEASE-collectl b/RELEASE-collectl
index a31b33e..c9126cd 100644
--- a/RELEASE-collectl
+++ b/RELEASE-collectl
@@ -27,6 +27,11 @@ KNOWN PROBLEMS/RESTRICTIONS
 
 COLLECTL CHANGES
 
+4.3.10  Jun 12 2024
+  - Fixed an issue reported by Martin where nvme devices were not being aggregated in
+ the summary display for disks
+  - Tags will be properly updated now, I had missed that when I took this over
+
 4.3.9   Jan 2 2024
   -  Added md devices to disk parse  
 
diff --git a/collectl b/collectl
index 174cfef..c0ac088 100755
--- a/collectl
+++ b/collectl
@@ -111,7 +111,7 @@ $syslogFlag=(eval {require "Sys/Syslog.pm" or die}) ? 1 : 0;
 $rootFlag=(!$PcFlag && `whoami`=~/root/) ? 1 : 0;
 $SrcArch= $Config{"archname"};
 
-$Version=  '4.3.9';
+$Version=  '4.3.10';
 $Copyright='Copyright 2003-2018 Hewlett-Packard Development Company, L.P.';
 $License=  "collectl may be copied only under the terms of either the Artistic License\n";
 $License.= "or the GNU General Public License, which may be found in the source kit";
@@ -6786,8 +6786,15 @@ sub whatsnew
 {
   my $whatsnew=<<EOF6;
 What's new in collectl in the last year or so?
+
+version 4.3.10  Jun 12 2024
+  - Fixed an issue reported by Martin where nvme devices were not being aggregated in
+    the summary display for disks
+  - Tags will be properly updated now, I had missed that when I took this over
+
 version 4.3.9   Jan 2 2024
   -  Added md devices to disk parse  
+
 verson 4.3.8    Feb 7 2023
   -  Added additional network interface names - Reported by Martin A
   -  Added rbd device to collectl disk captures
diff --git a/collectl.conf b/collectl.conf
old mode 100755
new mode 100644
index 9da7e7d..8d65a81
--- a/collectl.conf
+++ b/collectl.conf
@@ -142,7 +142,7 @@ IpmiTypes = fan,temp,current
 # ignored.  To change the filter, set the string below to those you want to keep BUT
 # you need to know what a perl regular expression looks like or you may not get the
 # desired results.  CAUTION - white space is CRITICAL for this to work.
-DiskFilter = /hd[ab] | sd[a-z]+ |dm-\d+ |xvd[a-z] |fio[a-z]+ | vd[a-z]+ |emcpower[a-z]+ |psv\d+ |nvme\d+n\d+ | nvme\d+c\d+ |rbd\d+ |md\d+ /
+DiskFilter = /hd[ab] | sd[a-z]+ |dm-\d+ |xvd[a-z] |fio[a-z]+ | vd[a-z]+ |emcpower[a-z]+ |psv\d+ |nvme\d+n\d+ |nvme\d+c\d+ |nvme\d+c\d+n\d+ |rbd\d+ |md\d+ /
 
 # Kernel Efficiency Test
 # On kernels 2.6.32 forward (and you can't tell how distros patched) there is a read inefficiency
diff --git a/formatit.ph b/formatit.ph
old mode 100755
new mode 100644
index 597bb92..5afc6d9
--- a/formatit.ph
+++ b/formatit.ph
@@ -3401,7 +3401,9 @@ sub dataAnalyze
       # perl lookbehind makes my head explode but what we're doing is to ignore nvme partitions
       # which is any device name that ends in a digit AND not preceded with 'nvme\dn' in which
       # case the digit is part of the device name. whew...
-      if ($diskName!~/(?<!nvme\dn)\d$/ && ($dskFiltKeep eq '' || $diskName=~/$dskFiltKeep/))
+      #  Replaced this line (For issue reprted by Martin     
+      #  if ($diskName!~/(?<!nvme\dn)\d$/ && ($dskFiltKeep eq '' || $diskName=~/$dskFiltKeep/))
+      if ($diskName!~/nvme\w\d$/ && ($dskFiltKeep eq '' || $diskName=~/$dskFiltKeep/))
       {
         $dskReadTot+=      $dskRead[$dskIndex];
         $dskReadMrgTot+=   $dskReadMrg[$dskIndex];