X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fdatabase%2Fdborm.py;h=bab1784451f6d0d52db0c66a2041c7d0ef95d70a;hb=8868d29303a545901cce2edfa9d69b586421c61f;hp=5bcbefc0775217a330819dcb1242e24db0b10df5;hpb=e811d83a1664a222bed13266703d2aa4f1a1900d;p=monitor.git

diff --git a/monitor/database/dborm.py b/monitor/database/dborm.py
index 5bcbefc..bab1784 100644
--- a/monitor/database/dborm.py
+++ b/monitor/database/dborm.py
@@ -1,9 +1,14 @@
-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=True)
-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))
+mon_session.bind = mon_metadata.bind
+
+if config.zabbix_enabled:
+	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