cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix py3 issue in nagios_livestatus inv script. (#21687)

Browse source 
* Fix py3 issue in nagios_livestatus inv script.
* Fix PEP 8 issues.
This commit is contained in:
Matt Clay 2017-02-20 11:52:47 -08:00 committed by GitHub
parent 5d0805b25a
commit 3f91e3531a
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
contrib/inventory/nagios_livestatus.py
View file

@ -53,7 +53,8 @@ class NagiosLivestatusInventory(object):
config = configparser.SafeConfigParser()
config.read(os.path.dirname(os.path.realpath(__file__)) + '/nagios_livestatus.ini')
for section in config.sections():
if not config.has_option(section, 'livestatus_uri'): continue
if not config.has_option(section, 'livestatus_uri'):
continue
# If fields_to_retrieve is not set, using default fields
fields_to_retrieve = self.default_fields_to_retrieve
@ -63,12 +64,12 @@ class NagiosLivestatusInventory(object):
# default section values
section_values = {
'var_prefix' : 'livestatus_',
'host_filter': None,
'host_field' : 'name',
'group_field': 'groups'
'var_prefix': 'livestatus_',
'host_filter': None,
'host_field': 'name',
'group_field': 'groups'
}
for key,value in section_values.iteritems():
for key, value in section_values.items():
if config.has_option(section, key):
section_values[key] = config.get(section, key).strip()
@ -93,7 +94,7 @@ class NagiosLivestatusInventory(object):
# Updating backend_definition with current value
backend_definition['name'] = section
backend_definition['fields'] = fields_to_retrieve
for key, value in section_values.iteritems():
for key, value in section_values.items():
backend_definition[key] = value
self.backends.append(backend_definition)