summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-11-24 15:03:23 -0500
committerKenny Woodson <kwoodson@redhat.com>2015-11-24 15:03:23 -0500
commit89c20890323f2693fdc3174c4cd3d19e7addc817 (patch)
treebbd48e7058a813d09fbb268397cef2e8d86062d9
parent4591db0eb0ac70599293fbbce65cf402e0ec1bc1 (diff)
parent55c65f440f00de42dd2d8f2940cfc738493edcba (diff)
downloadopenshift-89c20890323f2693fdc3174c4cd3d19e7addc817.tar.gz
openshift-89c20890323f2693fdc3174c4cd3d19e7addc817.tar.bz2
openshift-89c20890323f2693fdc3174c4cd3d19e7addc817.tar.xz
openshift-89c20890323f2693fdc3174c4cd3d19e7addc817.zip
Merge pull request #974 from kwoodson/actionfix
Fixed a bug. opsconditions now updates propertly.
-rw-r--r--roles/lib_zabbix/library/zbx_action.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/lib_zabbix/library/zbx_action.py b/roles/lib_zabbix/library/zbx_action.py
index d64cebae1..24693e5db 100644
--- a/roles/lib_zabbix/library/zbx_action.py
+++ b/roles/lib_zabbix/library/zbx_action.py
@@ -89,6 +89,9 @@ def operation_differences(zabbix_ops, user_ops):
for zab, user in zip(zabbix_ops, user_ops):
for key, val in user.items():
if key == 'opconditions':
+ if len(zab[key]) != len(val):
+ rval[key] = val
+ break
for z_cond, u_cond in zip(zab[key], user[key]):
if not all([str(u_cond[op_key]) == z_cond[op_key] for op_key in \
['conditiontype', 'operator', 'value']]):
@@ -330,9 +333,9 @@ def get_action_operations(zapi, inc_operations):
condition['operator'] = 0
if condition['value'] == 'acknowledged':
- condition['operator'] = 1
+ condition['value'] = 1
else:
- condition['operator'] = 0
+ condition['value'] = 0
return inc_operations