From 6cf3b1f6d1218f0d1434daac9779c59bb3c03d9a Mon Sep 17 00:00:00 2001
From: 3err0 <mail@err0.ru>
Date: Thu, 7 Oct 2021 09:15:19 +0800
Subject: [PATCH] zerro trigger hashrate fixes

---
 template-antminer-s19.yaml | 6 +++---
 template-antminer-s9.xml   | 5 +++--
 template-antminer-t17.xml  | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/template-antminer-s19.yaml b/template-antminer-s19.yaml
index 8e37774..46dd4a4 100644
--- a/template-antminer-s19.yaml
+++ b/template-antminer-s19.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '5.2'
-  date: '2021-03-09T09:31:19Z'
+  date: '2021-10-07T01:08:08Z'
   groups:
     -
       name: 'Antminer S19'
@@ -400,7 +400,7 @@ zabbix_export:
           macro: '{$UPASS}'
   triggers:
     -
-      expression: '{AntMiner S19:AntMinerT17.Hashrate.nodata(15m)}=1 and {AntMiner S19:icmpping.last()}=1'
+      expression: '({AntMiner S19:AntMinerT17.Hashrate.nodata(15m)}=1 or {AntMiner S19:AntMinerT17.Hashrate.last(5m)}=0) and {AntMiner S19:icmpping.last()}=1'
       name: 'AntMiner S19 Hashrate information not available on {HOST.NAME}'
       priority: HIGH
       manual_close: 'YES'
@@ -434,7 +434,7 @@ zabbix_export:
       recovery_mode: RECOVERY_EXPRESSION
       recovery_expression: '({AntMiner S19:AntMinerT17.LS_online_pool1.str(true, #3)}=1 and {AntMiner S19:AntMinerT17.LS_pool1.last()}<{$LS_TIME}) or ({AntMiner S19:AntMinerT17.LS_online_pool2.str(true, #3)}=1 and {AntMiner S19:AntMinerT17.LS_pool2.last()}<{$LS_TIME}) or ({AntMiner S19:AntMinerT17.LS_online_pool3.str(true, #3)}=1 and {AntMiner S19:AntMinerT17.LS_pool3.last()}<{$LS_TIME})'
       name: 'AntMiner S19 превышено время шары {HOST.NAME}'
-      priority: AVERAGE
+      priority: INFO
       manual_close: 'YES'
     -
       expression: '({AntMiner S19:AntMinerT17.Fan_num.last()}=0) and ({AntMiner S19:icmpping.last()}=1) and ({AntMiner S19:AntMinerT17.Elapsed.last()}={AntMiner S19:AntMinerT17.Elapsed.prev()}) and ({AntMiner S19:AntMinerT17.Elapsed.last()}>0)'
diff --git a/template-antminer-s9.xml b/template-antminer-s9.xml
index 662f974..791c8fc 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>5.2</version>
-    <date>2021-06-16T05:53:07Z</date>
+    <date>2021-10-07T01:07:35Z</date>
     <groups>
         <group>
             <name>AntMiner S9</name>
@@ -730,7 +730,7 @@ return $123;</parameter>
     </templates>
     <triggers>
         <trigger>
-            <expression>{AntMiner S9:AntMinerS9.Hashrate.nodata(15m)}=1 and {AntMiner S9:icmpping.last()}=1</expression>
+            <expression>({AntMiner S9:AntMinerS9.Hashrate.nodata(15m)}=1 or {AntMiner S9:AntMinerS9.Hashrate.last(5m)}=0) and {AntMiner S9:icmpping.last()}=1</expression>
             <name>AntMiner S9 Hashrate information not available on {HOST.NAME}</name>
             <priority>HIGH</priority>
             <manual_close>YES</manual_close>
@@ -776,6 +776,7 @@ return $123;</parameter>
             <recovery_mode>RECOVERY_EXPRESSION</recovery_mode>
             <recovery_expression>{AntMiner S9:AntMinerS9.Fan_num.last()}=2</recovery_expression>
             <name>Асик завис !!!</name>
+            <status>DISABLED</status>
             <manual_close>YES</manual_close>
         </trigger>
         <trigger>
diff --git a/template-antminer-t17.xml b/template-antminer-t17.xml
index 074c40e..1607e83 100644
--- a/template-antminer-t17.xml
+++ b/template-antminer-t17.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>5.2</version>
-    <date>2021-06-11T02:59:57Z</date>
+    <date>2021-10-07T01:08:45Z</date>
     <groups>
         <group>
             <name>Antminer T17</name>
@@ -552,7 +552,7 @@ return $123;</parameter>
     </templates>
     <triggers>
         <trigger>
-            <expression>{AntMiner T17:AntMinerT17.Hashrate.nodata(15m)}=1 and {AntMiner T17:icmpping.last()}=1</expression>
+            <expression>({AntMiner T17:AntMinerT17.Hashrate.nodata(15m)}=1 or {AntMiner T17:AntMinerT17.Hashrate.last(5m)}=0) and {AntMiner T17:icmpping.last()}=1</expression>
             <name>AntMiner T17 Hashrate information not available on {HOST.NAME}</name>
             <priority>HIGH</priority>
             <manual_close>YES</manual_close>