From f2ab1d89c56175aafc020989dd3f72bf083fcb92 Mon Sep 17 00:00:00 2001
From: 3err0 <mail@3err0.ru>
Date: Thu, 4 Jun 2020 12:01:18 +0800
Subject: [PATCH] low hash trigger fix

---
 template-aixin-a1.xml    | 6 +++---
 template-antminer-s9.xml | 4 ++--
 template-cheetah-f1.xml  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/template-aixin-a1.xml b/template-aixin-a1.xml
index 95dbf47..75893f3 100644
--- a/template-aixin-a1.xml
+++ b/template-aixin-a1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>5.0</version>
-    <date>2020-06-04T01:49:15Z</date>
+    <date>2020-06-04T03:56:25Z</date>
     <groups>
         <group>
             <name>Aixin A1</name>
@@ -213,7 +213,7 @@
                 </macro>
                 <macro>
                     <macro>{$HASH_LOW}</macro>
-                    <value>19000</value>
+                    <value>18000</value>
                 </macro>
                 <macro>
                     <macro>{$HOST.PORT}</macro>
@@ -255,7 +255,7 @@
             <manual_close>YES</manual_close>
         </trigger>
         <trigger>
-            <expression>({Aixin A1:AntMinerA1.Hashrate.last(#3)}&lt;{$HASH_LOW} and {Aixin A1:AntMinerA1.Elapsed.last()}&gt;600) and {Aixin A1:icmpping.last()}=1</expression>
+            <expression>({Aixin A1:AntMinerA1.Hashrate.last()}&lt;{$HASH_LOW} and {Aixin A1:AntMinerA1.Elapsed.last()}&gt;600) and ({Aixin A1:icmpping.last()}=1 and {Aixin A1:net.tcp.service[tcp,,4028].last()}=1)</expression>
             <recovery_mode>RECOVERY_EXPRESSION</recovery_mode>
             <recovery_expression>{Aixin A1:AntMinerA1.Hashrate.last(#3)}&gt;{$HASH_LOW}</recovery_expression>
             <name>AntMiner A1 Low hashrate on {HOST.NAME}</name>
diff --git a/template-antminer-s9.xml b/template-antminer-s9.xml
index dc951cc..c8e22d0 100644
--- a/template-antminer-s9.xml
+++ b/template-antminer-s9.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>4.2</version>
-    <date>2020-06-01T23:29:29Z</date>
+    <date>2020-06-04T03:56:42Z</date>
     <groups>
         <group>
             <name>AntMiner S9</name>
@@ -1916,7 +1916,7 @@ return $123;</params>
             <tags/>
         </trigger>
         <trigger>
-            <expression>({AntMiner S9:AntMinerS9.Hashrate.last(#3)}&lt;{$HASH_LOW} and {AntMiner S9:AntMinerS9.Elapsed.last()}&gt;600) and {AntMiner S9:icmpping.last()}=1</expression>
+            <expression>({AntMiner S9:AntMinerS9.Hashrate.last()}&lt;{$HASH_LOW} and {AntMiner S9:AntMinerS9.Elapsed.last()}&gt;600) and ({AntMiner S9:icmpping.last()}=1 and {AntMiner S9:net.tcp.service[tcp,,4028].last()}=1)</expression>
             <recovery_mode>1</recovery_mode>
             <recovery_expression>{AntMiner S9:AntMinerS9.Hashrate.last()}&gt;{$HASH_LOW}</recovery_expression>
             <name>AntMiner S9 Low hashrate on {HOST.NAME}</name>
diff --git a/template-cheetah-f1.xml b/template-cheetah-f1.xml
index 13469ef..63a10ca 100644
--- a/template-cheetah-f1.xml
+++ b/template-cheetah-f1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>5.0</version>
-    <date>2020-06-04T01:49:43Z</date>
+    <date>2020-06-04T03:58:28Z</date>
     <groups>
         <group>
             <name>Cheetah F1</name>
@@ -231,7 +231,7 @@
                 </macro>
                 <macro>
                     <macro>{$HASH_LOW}</macro>
-                    <value>19000</value>
+                    <value>18000</value>
                 </macro>
                 <macro>
                     <macro>{$HOST.PORT}</macro>
@@ -273,7 +273,7 @@
             <manual_close>YES</manual_close>
         </trigger>
         <trigger>
-            <expression>({Cheetah F1:AntMinerF1.Hashrate.last(#3)}&lt;{$HASH_LOW} and {Cheetah F1:AntMinerF1.Elapsed.last()}&gt;600) and {Cheetah F1:icmpping.last()}=1</expression>
+            <expression>({Cheetah F1:AntMinerF1.Hashrate.last()}&lt;{$HASH_LOW} and {Cheetah F1:AntMinerF1.Elapsed.last()}&gt;600) and ({Cheetah F1:icmpping.last()}=1 and {Cheetah F1:net.tcp.service[tcp,,4028].last()}=1)</expression>
             <recovery_mode>RECOVERY_EXPRESSION</recovery_mode>
             <recovery_expression>{Cheetah F1:AntMinerF1.Hashrate.last(#3)}&gt;{$HASH_LOW}</recovery_expression>
             <name>AntMiner F1 Low hashrate on {HOST.NAME}</name>