git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved nodecommon.py into monitor module
[monitor.git]
/
zabbix
/
zabbixsync.py
diff --git
a/zabbix/zabbixsync.py
b/zabbix/zabbixsync.py
index
1c0e405
..
e35798c
100755
(executable)
--- a/
zabbix/zabbixsync.py
+++ b/
zabbix/zabbixsync.py
@@
-20,9
+20,10
@@
def get_site_iplist(loginbase):
# TODO: if it is, then we need to break up the discovery rule.
ip_list = ""
for node in node_list:
# TODO: if it is, then we need to break up the discovery rule.
ip_list = ""
for node in node_list:
- ip = netid2ip[node['nodenetwork_ids'][0]]
- if len(ip_list) > 0: ip_list += ","
- ip_list += ip
+ if len(node['nodenetwork_ids']) > 0:
+ ip = netid2ip[node['nodenetwork_ids'][0]]
+ if len(ip_list) > 0: ip_list += ","
+ ip_list += ip
return ip_list
return ip_list
@@
-59,7
+60,7
@@
if __name__=="__main__":
query.update({'login_base' : opts.site})
sites = api.GetSites(query, ['login_base'])
query.update({'login_base' : opts.site})
sites = api.GetSites(query, ['login_base'])
- for site in sites:
+ for site in sites
[:10]
:
add_loginbase(site['login_base'])
session.flush()
add_loginbase(site['login_base'])
session.flush()