Merge pull request ceph#26146 from snijhuis/master

mgr: zabbix triggers never triggered due to wrong trigger function Reviewed-by: Wido den Hollander <[email protected]> Reviewed-by: Dmitriy Rabotjagov <[email protected]>
zmc · Oct 11, 2019 · 44a32df · 44a32df
2 parents a7fbcf3 + e9d9259
commit 44a32df
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/pybind/mgr/zabbix/zabbix_template.xml b/src/pybind/mgr/zabbix/zabbix_template.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>3.0</version>
-    <date>2017-10-24T07:00:13Z</date>
+    <date>2019-01-25T10:12:41Z</date>
     <groups>
         <group>
             <name>Templates</name>
@@ -2829,22 +2829,22 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{ceph-mgr Zabbix module:ceph.num_osd_in.change()}&gt;0</expression>
-            <name>Number of IN OSDs decreased</name>
+            <expression>{ceph-mgr Zabbix module:ceph.num_osd_in.abschange()}&gt;0</expression>
+            <name>Number of IN OSDs changed</name>
             <url/>
             <status>0</status>
             <priority>2</priority>
-            <description>Amount of OSDs in IN state decreased</description>
+            <description>Amount of OSDs in IN state changed</description>
             <type>0</type>
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{ceph-mgr Zabbix module:ceph.num_osd_up.change()}&gt;0</expression>
-            <name>Number of UP OSDs decreased</name>
+            <expression>{ceph-mgr Zabbix module:ceph.num_osd_up.abschange()}&gt;0</expression>
+            <name>Number of UP OSDs changed</name>
             <url/>
             <status>0</status>
             <priority>2</priority>
-            <description>Amount of OSDs in UP state decreased</description>
+            <description>Amount of OSDs in UP state changed</description>
             <type>0</type>
             <dependencies/>
         </trigger>