From 8fba840f123d095a52861b853ce017452e969fbb Mon Sep 17 00:00:00 2001
From: niki <niki91m@yandex.ru>
Date: Tue, 3 Mar 2020 17:04:11 +0500
Subject: [PATCH] Add files via upload

---
 Template smartmonitor.xml      |  4 ++--
 smartctl-storage-discovery.ps1 | 21 +++++++++++++--------
 smartctl-storage-discovery.sh  | 21 +++++++++++++--------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Template smartmonitor.xml b/Template smartmonitor.xml
index 7e0aa5d..7dcb266 100644
--- a/Template smartmonitor.xml	
+++ b/Template smartmonitor.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>4.4</version>
-    <date>2020-02-17T07:56:44Z</date>
+    <date>2020-03-02T12:56:26Z</date>
     <groups>
         <group>
             <name>Templates Users</name>
@@ -150,7 +150,7 @@
                             <preprocessing>
                                 <step>
                                     <type>REGEX</type>
-                                    <params>[Ss]erial [Nn]umber:\s+([\d-\w]+)+
+                                    <params>[Ss]erial [Nn]umber:\s+([\d\w-]+)
 \1</params>
                                 </step>
                             </preprocessing>
diff --git a/smartctl-storage-discovery.ps1 b/smartctl-storage-discovery.ps1
index 75ef6ab..bfd26be 100644
--- a/smartctl-storage-discovery.ps1
+++ b/smartctl-storage-discovery.ps1
@@ -1,6 +1,6 @@
 <#
     .VERSION
-    0.1
+    0.2
 
     .DESCRIPTION
     Author: Nikitin Maksim
@@ -74,15 +74,20 @@ foreach ($device in $smart_scan) {
                 if ($d) {
                     $storage_model = $d.Trim()
                 } else {
-                    $p = (($info | Select-String "Product:") -replace "Product:")
-                    if ($p) {
-                        $storage_model = $p.Trim()
+                    $m = (($info | Select-String "Model Number:") -replace "Model Number:")
+                    if ($m) {
+                        $storage_model = $m.Trim()
                     } else {
-                        $v = (($info | Select-String "Vendor:") -replace "Vendor:")
-                        if ($v) {
-                            $storage_model = $v.Trim()
+                        $p = (($info | Select-String "Product:") -replace "Product:")
+                        if ($p) {
+                            $storage_model = $p.Trim()
                         } else {
-                            $storage_model = "Not find"
+                            $v = (($info | Select-String "Vendor:") -replace "Vendor:")
+                            if ($v) {
+                                $storage_model = $v.Trim()
+                            } else {
+                                $storage_model = "Not find"
+                            }
                         }
                     }
                 }
diff --git a/smartctl-storage-discovery.sh b/smartctl-storage-discovery.sh
index 5688df1..52de25b 100644
--- a/smartctl-storage-discovery.sh
+++ b/smartctl-storage-discovery.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #    .VERSION
-#    0.1
+#    0.2
 #
 #    .DESCRIPTION
 #    Author: Nikitin Maksim
@@ -66,15 +66,20 @@ LLDSmart()
                 if [ -n $d ]; then
                     storage_model=$d
                 else
-                    p=$(/bin/echo $temp_info | grep "Product:" | cut -f2 -d":" | sed -e 's/^\s*//')
-                    if [ -n $p ]; then
-                        storage_model=$p
+                    m=$(/bin/echo $temp_info | grep "Model Number:" | cut -f2 -d":" | sed -e 's/^\s*//')
+                    if [ -n $m ]; then
+                        storage_model=$m
                     else
-                        v=$(/bin/echo $temp_info | grep "Vendor:" | cut -f2 -d":" | sed -e 's/^\s*//')
-                        if [ -n $v ]; then
-                            storage_model=$v
+                        p=$(/bin/echo $temp_info | grep "Product:" | cut -f2 -d":" | sed -e 's/^\s*//')
+                        if [ -n $p ]; then
+                            storage_model=$p
                         else
-                            storage_model="Not find"
+                            v=$(/bin/echo $temp_info | grep "Vendor:" | cut -f2 -d":" | sed -e 's/^\s*//')
+                            if [ -n $v ]; then
+                                storage_model=$v
+                            else
+                                storage_model="Not find"
+                            fi
                         fi
                     fi
                 fi