From: Stephen Soltesz Date: Mon, 27 Jul 2009 16:22:43 +0000 (+0000) Subject: make zabbix import conditional X-Git-Tag: Monitor-3.0-19~9 X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=d5ee3a6436fe36badf664affa42b03c566911906 make zabbix import conditional --- diff --git a/monitor/database/dborm.py b/monitor/database/dborm.py index e677536..71749f6 100644 --- a/monitor/database/dborm.py +++ b/monitor/database/dborm.py @@ -6,7 +6,8 @@ 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 +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