From d6fa12eff63e3dafd2b7f1a5f96d2b65ed74d032 Mon Sep 17 00:00:00 2001
From: 3err0 <me@876974.ru>
Date: Sat, 6 Jul 2019 15:15:29 +0800
Subject: [PATCH] move temp value to macros

---
 template-l3.xml | 10 +++++++---
 template-s9.xml | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/template-l3.xml b/template-l3.xml
index a8aaa1a..1eed73b 100644
--- a/template-l3.xml
+++ b/template-l3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>4.2</version>
-    <date>2019-07-06T06:06:47Z</date>
+    <date>2019-07-06T07:14:30Z</date>
     <groups>
         <group>
             <name>AntMiner L3</name>
@@ -1705,6 +1705,10 @@
                     <macro>{$HOST.PORT}</macro>
                     <value>4028</value>
                 </macro>
+                <macro>
+                    <macro>{$TEMP_LOW}</macro>
+                    <value>75</value>
+                </macro>
                 <macro>
                     <macro>{$URL1}</macro>
                     <value>stratum+tcp://eu.ltc.sigmapool.com:3333</value>
@@ -1741,9 +1745,9 @@
             <tags/>
         </trigger>
         <trigger>
-            <expression>(({AntMiner L3:AntMinerL3.Temp1.min(15m)}&gt;75 or {AntMiner L3:AntMinerL3.Temp2.min(15m)}&gt;75 or {AntMiner L3:AntMinerL3.Temp3.min(15m)}&gt;75 or {AntMiner L3:AntMinerL3.Temp4.min(15m)}&gt;75) and {AntMiner L3:icmpping.last()}=1)</expression>
+            <expression>(({AntMiner L3:AntMinerL3.Temp1.min(15m)}&gt;{$TEMP_LOW} or {AntMiner L3:AntMinerL3.Temp2.min(15m)}&gt;{$TEMP_LOW} or {AntMiner L3:AntMinerL3.Temp3.min(15m)}&gt;{$TEMP_LOW} or {AntMiner L3:AntMinerL3.Temp4.min(15m)}&gt;{$TEMP_LOW}) and {AntMiner L3:icmpping.last()}=1)</expression>
             <recovery_mode>1</recovery_mode>
-            <recovery_expression>(({AntMiner L3:AntMinerL3.Temp1.last()}&lt;75 or {AntMiner L3:AntMinerL3.Temp2.last()}&lt;75 or {AntMiner L3:AntMinerL3.Temp3.last()}&lt;75 or {AntMiner L3:AntMinerL3.Temp4.last()}&lt;75) and {AntMiner L3:icmpping.last()}=1)</recovery_expression>
+            <recovery_expression>(({AntMiner L3:AntMinerL3.Temp1.min(15m)}&lt;{$TEMP_LOW} or {AntMiner L3:AntMinerL3.Temp2.min(15m)}&lt;{$TEMP_LOW} or {AntMiner L3:AntMinerL3.Temp3.min(15m)}&lt;{$TEMP_LOW} or {AntMiner L3:AntMinerL3.Temp4.min(15m)}&lt;{$TEMP_LOW}) and {AntMiner L3:icmpping.last()}=1)</recovery_expression>
             <name>AntMiner L3 High temp on {HOST.NAME}</name>
             <correlation_mode>0</correlation_mode>
             <correlation_tag/>
diff --git a/template-s9.xml b/template-s9.xml
index 8181669..2cec54c 100644
--- a/template-s9.xml
+++ b/template-s9.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>4.2</version>
-    <date>2019-07-06T03:25:00Z</date>
+    <date>2019-07-06T07:13:00Z</date>
     <groups>
         <group>
             <name>AntMiner S9</name>
@@ -1595,6 +1595,10 @@
                     <macro>{$HOST.PORT}</macro>
                     <value>4028</value>
                 </macro>
+                <macro>
+                    <macro>{$TEMP_LOW}</macro>
+                    <value>90</value>
+                </macro>
                 <macro>
                     <macro>{$URL1}</macro>
                     <value>stratum+tcp://eu1.btc.sigmapool.com:3333</value>
@@ -1631,9 +1635,9 @@
             <tags/>
         </trigger>
         <trigger>
-            <expression>({AntMiner S9:AntMinerS9.Temp6.min(15m)}&gt;90 or {AntMiner S9:AntMinerS9.Temp7.min(15m)}&gt;90 or {AntMiner S9:AntMinerS9.Temp8.min(15m)}&gt;90) and {AntMiner S9:icmpping.last()}=1</expression>
+            <expression>({AntMiner S9:AntMinerS9.Temp6.min(15m)}&gt;{$TEMP_LOW} or {AntMiner S9:AntMinerS9.Temp7.min(15m)}&gt;{$TEMP_LOW} or {AntMiner S9:AntMinerS9.Temp8.min(15m)}&gt;{$TEMP_LOW}) and {AntMiner S9:icmpping.last()}=1</expression>
             <recovery_mode>1</recovery_mode>
-            <recovery_expression>({AntMiner S9:AntMinerS9.Temp6.last()}&lt;90 or {AntMiner S9:AntMinerS9.Temp7.last()}&lt;90 or {AntMiner S9:AntMinerS9.Temp8.last()}&lt;90) and {AntMiner S9:icmpping.last()}=1</recovery_expression>
+            <recovery_expression>({AntMiner S9:AntMinerS9.Temp6.last()}&lt;{$TEMP_LOW} or {AntMiner S9:AntMinerS9.Temp7.last()}&lt;{$TEMP_LOW} or {AntMiner S9:AntMinerS9.Temp8.last()}&lt;{$TEMP_LOW}) and {AntMiner S9:icmpping.last()}=1</recovery_expression>
             <name>AntMiner S9 High temp on {HOST.NAME}</name>
             <correlation_mode>0</correlation_mode>
             <correlation_tag/>