Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved version number parsing to allow version strings with charact… #42

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improved version number parsing to allow version strings with charact… #42

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26293bc
Improved version number parsing to allow version strings with charact…
algestam Apr 20, 2016
c00509b
Removed out-commented code that accidentialy was left after the last …
algestam Apr 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions check_elasticsearch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python

import re
import urllib2

from nagioscheck import NagiosCheck, UsageError
Expand Down Expand Up @@ -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)])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to leave this in? Probably shouldn't commit commented-out code.

return tuple([int(re.findall(r'^\d+', i)[0]) for i in version_string.split('.')])


if __name__ == '__main__':
Expand Down