From: Sebastiaan Nijhuis <sebastiaan.nijhuis@maastrichtuniversity.nl>
Date: Fri, 25 Jan 2019 12:06:33 +0000 (+0100)
Subject: mgr: zabbix triggers never triggered due to wrong trigger function
X-Git-Tag: v15.1.0~1278^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9d925952de5fe416fdc1101c64206527820c59f;p=ceph.git

mgr: zabbix triggers never triggered due to wrong trigger function

Triggers "Number of IN OSDs decreased" and "Number of UP OSDs decresed" never triggered due to change()>0 in trigger expression. If the numder of OSD's IN or UP changed, the change would be negative. Changed change() to abschange() to fix this.

Signed-off-by: Sebastiaan Nijhuis <sebastiaan.nijhuis@maastrichtuniversity.nl>
---

diff --git a/src/pybind/mgr/zabbix/zabbix_template.xml b/src/pybind/mgr/zabbix/zabbix_template.xml
index 1ce76605ac0..f1a1495d433 100644
--- 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>
@@ -2149,22 +2149,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>