Add files via upload

nikimaxim · Mar 13, 2020 · 2d51257 · 2d51257
1 parent 8fba840
commit 2d51257
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git 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-03-02T12:56:26Z</date>
+    <date>2020-03-13T05:49:23Z</date>
     <groups>
         <group>
             <name>Templates Users</name>
@@ -21,9 +21,30 @@
                     <name>SMART monitoring (smartctl)</name>
                 </application>
             </applications>
+            <items>
+                <item>
+                    <name>Smartctl version</name>
+                    <key>smartctl.version</key>
+                    <delay>1h</delay>
+                    <trends>0</trends>
+                    <value_type>CHAR</value_type>
+                    <applications>
+                        <application>
+                            <name>SMART monitoring (smartctl)</name>
+                        </application>
+                    </applications>
+                    <triggers>
+                        <trigger>
+                            <expression>{change()}=1</expression>
+                            <name>Version of smartctl was changed on {HOST.NAME}</name>
+                            <priority>INFO</priority>
+                        </trigger>
+                    </triggers>
+                </item>
+            </items>
             <discovery_rules>
                 <discovery_rule>
-                    <name>smartctl-storage-discovery</name>
+                    <name>Smartctl storage discovery</name>
                     <key>storage.discovery</key>
                     <delay>1d;1h/1-7,08:00-21:00</delay>
                     <filter>
@@ -37,7 +58,7 @@
                     </filter>
                     <item_prototypes>
                         <item_prototype>
-                            <name>{#STORAGE.NAME}: smartctl</name>
+                            <name>{#STORAGE.NAME}: Smartctl</name>
                             <key>storage.get[&quot;{#STORAGE.CMD}&quot;]</key>
                             <delay>1h;10m/1-7,08:00-21:00</delay>
                             <history>30d</history>

diff --git a/zabbix_agentd.conf b/zabbix_agentd.conf
@@ -1,7 +1,9 @@
 # Windows smartctl monitor
 UserParameter=storage.get[*],for /F "tokens=* usebackq" %a in (`""C:\Program Files\smartmontools\bin\smartctl.exe" -i -H -A -l error -l background $1"`) do @echo %a
-UserParameter=storage.discovery[*],powershell -NoProfile -ExecutionPolicy Bypass -File "C:\service\zabbix_agent\smartctl-storage-discovery.ps1"
+UserParameter=storage.discovery[*],powershell -NoProfile -ExecutionPolicy Bypass -File "C:\service\smartctl-storage-discovery.ps1"
+UserParameter=smartctl.version,powershell -NoProfile -ExecutionPolicy Bypass -Command "(((& 'C:\Program Files\smartmontools\bin\smartctl.exe' --version | Where-Object {$_ -match '^smartctl\s\d'}) -ireplace 'smartctl\s') -ireplace '\s\[.+$').Trim()"
 
 # Linux smartctl monitor
 UserParameter=storage.get[*],sudo smartctl -i -H -A -l error -l background $1
 UserParameter=storage.discovery[*],sudo /opt/zabbix_s/smartctl-storage-discovery.sh
+UserParameter=smartctl.version,smartctl --version | grep -Eo "^smartctl\s[0-9\.[:space:]\r-]+" | sed -e 's/^smartctl\s//'