X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fdatabase%2Fdborm.py;h=687881ab8b49f75fa02a86bc45395e130be70e46;hb=786822939c1d244e30172b997f91dd4aafb2ff24;hp=3e47ea28ddabd69a2c7ce288065c19efb7330037;hpb=19414270cf2c8429daab02fdebbd8081d9ba0db0;p=monitor.git

diff --git a/monitor/database/dborm.py b/monitor/database/dborm.py
index 3e47ea2..687881a 100644
--- a/monitor/database/dborm.py
+++ b/monitor/database/dborm.py
@@ -1,9 +1,12 @@
-#import pkg_resources
-#pkg_resources.require("SQLAlchemy>=0.4.9")
 import sqlalchemy
 import elixir
 import monitor.config as config
-elixir.metadata.bind = sqlalchemy.create_engine(config.databaseuri, echo=False)
-elixir.session = sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(autoflush=True,autocommit=True))
 
-from infovacuum.model import *
+mon_metadata = sqlalchemy.MetaData()
+mon_metadata.bind = sqlalchemy.create_engine(config.monitor_dburi, echo=config.echo)
+mon_session = sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(autoflush=False,autocommit=True))
+
+zab_metadata = sqlalchemy.MetaData()
+zab_metadata.bind = sqlalchemy.create_engine(config.zabbix_dburi, echo=config.echo)
+zab_session = sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(autoflush=False,autocommit=True))
+zab_session.bind = zab_metadata.bind