From 26293bcf3e8eb2055af36d7ac9c7dd2ce61f8d87 Mon Sep 17 00:00:00 2001 From: Henrik Algestam Date: Wed, 20 Apr 2016 04:07:37 -0400 Subject: [PATCH 1/2] Improved version number parsing to allow version strings with characters such as 5.0.0-alpha1 --- check_elasticsearch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/check_elasticsearch b/check_elasticsearch index a1d39a2..48b3444 100755 --- a/check_elasticsearch +++ b/check_elasticsearch @@ -1,5 +1,6 @@ #!/usr/bin/env python +import re import urllib2 from nagioscheck import NagiosCheck, UsageError @@ -612,9 +613,10 @@ def get_json(uri): def version(version_string): - """Accept a typical version string (ex: 1.0.1) and return a tuple - of ints, allowing for reasonable comparison.""" - return tuple([int(i) for i in version_string.split('.')]) + """Accept a typical version string (ex: 1.0.1 or 5.0.0-alpha1) and return a + tuple of ints, allowing for reasonable comparison.""" + #return tuple([int(i) for i in re.findall(r'\d+', version_string)]) + return tuple([int(re.findall(r'^\d+', i)[0]) for i in version_string.split('.')]) if __name__ == '__main__': From c00509b54901fb9328cd119c1ef0ddd2ac830cf2 Mon Sep 17 00:00:00 2001 From: Henrik Algestam Date: Wed, 20 Apr 2016 07:07:02 -0400 Subject: [PATCH 2/2] Removed out-commented code that accidentialy was left after the last change --- check_elasticsearch | 1 - 1 file changed, 1 deletion(-) diff --git a/check_elasticsearch b/check_elasticsearch index 48b3444..34e9558 100755 --- a/check_elasticsearch +++ b/check_elasticsearch @@ -615,7 +615,6 @@ def get_json(uri): def version(version_string): """Accept a typical version string (ex: 1.0.1 or 5.0.0-alpha1) and return a tuple of ints, allowing for reasonable comparison.""" - #return tuple([int(i) for i in re.findall(r'\d+', version_string)]) return tuple([int(re.findall(r'^\d+', i)[0]) for i in version_string.split('.')])