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
changes for 3.0
[monitor.git]
/
nagios
/
plc2nagios.py
diff --git
a/nagios/plc2nagios.py
b/nagios/plc2nagios.py
index
b5023f2
..
d7da592
100755
(executable)
--- a/
nagios/plc2nagios.py
+++ b/
nagios/plc2nagios.py
@@
-1,7
+1,6
@@
#!/usr/bin/python
#!/usr/bin/python
-import soltesz
-import plc
+import database
class NagiosObject(object):
trans = {'d2_coords': '2d_coords'}
class NagiosObject(object):
trans = {'d2_coords': '2d_coords'}
@@
-69,9
+68,9
@@
globalhost = [Host( name="planetlab-host",
for obj in globalhost + globalservices:
print obj.toString()
for obj in globalhost + globalservices:
print obj.toString()
-plcdb =
soltesz
.dbLoad("l_plcsites")
-netid2ip =
soltesz
.dbLoad("plcdb_netid2ip")
-lb2hn =
soltesz
.dbLoad("plcdb_lb2hn")
+plcdb =
database
.dbLoad("l_plcsites")
+netid2ip =
database
.dbLoad("plcdb_netid2ip")
+lb2hn =
database
.dbLoad("plcdb_lb2hn")
for site in plcdb:
shortname = site['abbreviated_name']
for site in plcdb:
shortname = site['abbreviated_name']
@@
-87,7
+86,7
@@
for site in plcdb:
lat_y = int(180 - (lat + 90)) * scale
if site['login_base'] in lb2hn:
lat_y = int(180 - (lat + 90)) * scale
if site['login_base'] in lb2hn:
- nodes = lb2hn[site['login_base']]
# plc.getSiteNodes2(site['login_base'])
+ nodes = lb2hn[site['login_base']]
else:
continue
else:
continue