This is an automated email from the ASF dual-hosted git repository.
symat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new efe83ba ZOOKEEPER-3935: Handle float metrics in check_zookeeper
efe83ba is described below
commit efe83baeaa6715c32383a383f33f70522c1b7614
Author: Petter A. Urkedal <[email protected]>
AuthorDate: Mon Sep 14 07:09:01 2020 +0000
ZOOKEEPER-3935: Handle float metrics in check_zookeeper
After upgrading to Zookeeper 3.6, Nagios tests for zk_avg_latency started
failing due to floating point metrics being compared as strings.
Author: Petter A. Urkedal <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Mate Szalay-Beko
<[email protected]>
Closes #1452 from paurkedal/check_zookeeper-float
---
.../zookeeper-contrib-monitoring/check_zookeeper.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py
b/zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py
index cff6a1f..0a08e84 100755
--- a/zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py
+++ b/zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py
@@ -311,10 +311,12 @@ class ZooKeeperServer(object):
if not key:
raise ValueError('The key is mandatory and should not be empty')
- try:
- value = int(value)
- except (TypeError, ValueError):
- pass
+ for typ in [int, float]:
+ try:
+ value = typ(value)
+ break
+ except (TypeError, ValueError):
+ pass
return key, value
