Delete import json. Several syntax changes.

Import json called twice. In first it will call an exception, if json
module not installed.
pull/9527/head
Sergei Antipov 10 years ago
parent 3ff8f01087
commit 8e32dda2e2

@ -20,7 +20,7 @@
###################################################################### ######################################################################
""" """
Zabbix Server external inventory script. Zabbix Server external inventory script.
======================================== ========================================
Returns hosts and hostgroups from Zabbix Server. Returns hosts and hostgroups from Zabbix Server.
@ -31,7 +31,6 @@ Tested with Zabbix Server 2.0.6.
""" """
import os, sys import os, sys
import json
import argparse import argparse
import ConfigParser import ConfigParser
@ -55,7 +54,7 @@ class ZabbixInventory(object):
if config.has_option('zabbix', 'server'): if config.has_option('zabbix', 'server'):
self.zabbix_server = config.get('zabbix', 'server') self.zabbix_server = config.get('zabbix', 'server')
# login # login
if config.has_option('zabbix', 'username'): if config.has_option('zabbix', 'username'):
self.zabbix_username = config.get('zabbix', 'username') self.zabbix_username = config.get('zabbix', 'username')
if config.has_option('zabbix', 'password'): if config.has_option('zabbix', 'password'):
@ -84,7 +83,7 @@ class ZabbixInventory(object):
for host in hostsData: for host in hostsData:
hostname = host['name'] hostname = host['name']
data[self.defaultgroup]['hosts'].append(hostname) data[self.defaultgroup]['hosts'].append(hostname)
for group in host['groups']: for group in host['groups']:
groupname = group['name'] groupname = group['name']

Loading…
Cancel
Save