Merge pull request #129 from varkoly/bsc-1192963

SAPHanaSRTools.pm: bsc#1192963: fixing scanning of attribute ids
SUSE · Oct 19, 2022 · 8cb6354 · 8cb6354
2 parents 9c3756a + a5ac511
commit 8cb6354
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/test/SAPHanaSRTools.pm b/test/SAPHanaSRTools.pm
@@ -288,7 +288,11 @@ while (<$CIB>) {
    #}
    if ( $_ =~ /nvpair.*name="([a-zA-Z0-9\_\-]+_${sid}_([a-zA-Z0-9\-\_]+))"/ ) {
       $name=$1;
-      if ( $_ =~ /id=.(status|nodes)-([a-zA-Z0-9\_\-]+)-/ ) {
+      # Bug 1192963 - L3: SAPHanaSR-monitor not reporting correctly
+      #  - catch also ids: id="host15-instance_attributes-hana_ha1_srmode"
+      #
+      if (( $_ =~ /id=.((.*)-instance_attributes)-([a-zA-Z0-9\_\-]+)/ ) 
+         || ( $_ =~ /id=.(status|nodes)-([a-zA-Z0-9\_\-]+)-/ )) { 
          # found attribute in nodes forever and reboot store
          $host=$2;
          if (defined $id2uname{$host}) {