convert GetNodeNetworks to GetInterfaces and nodenetwork_ids to interface_ids

[monitor.git] / zabbix / zabbixsync.py

diff --git a/zabbix/zabbixsync.py b/zabbix/zabbixsync.py
index ffef361..407d801 100755 (executable)
--- a/zabbix/zabbixsync.py
+++ b/zabbix/zabbixsync.py
@@ -22,8 +22,8 @@ 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:
-               if len(node['nodenetwork_ids']) > 0:
-                       ip = netid2ip[node['nodenetwork_ids'][0]]
+               if len(node['interface_ids']) > 0:
+                       ip = netid2ip[node['interface_ids'][0]]
                        if len(ip_list) > 0: ip_list += ","
                        ip_list += ip
 
@@ -44,7 +44,7 @@ if __name__=="__main__":
 
        from monitor import parser as parsermodule
        parser = parsermodule.getParser(['cacheset'])
-       parser.set_defaults( setupglobal=False, syncsite=True, site=None, setupids=False)
+       parser.set_defaults( setupglobal=False, syncsite=True, site=None, sitelist=None, setupids=False)
        parser.add_option("", "--setupids", action="store_true", dest="setupids",
                                                help="Setup global IDs.")
        parser.add_option("", "--setupglobal", action="store_true", dest="setupglobal",
@@ -53,6 +53,8 @@ if __name__=="__main__":
                                                help="Do not sync sites.")
        parser.add_option("", "--site", dest="site",
                                                help="Sync only given site name.")
+       parser.add_option("", "--sitelist", dest="sitelist",
+                                               help="Sync only given site names in the list.")
        opts = parsermodule.parse_args(parser)
 
        os.system("""echo '' > /usr/share/monitor/nodelist.txt""")
@@ -78,7 +80,7 @@ if __name__=="__main__":
                # ADD SITES
                sites = api.GetSites(query, ['login_base'])
                site_api_list = [ site['login_base'] for site in sites ]
-               for site in sites[:20]:
+               for site in sites: # [:20]:
                        add_loginbase(site['login_base'])
                        session.flush()