Revision ab5f0b58
Mise à jour des scripts de manipulation de la base de données.
Correction d'un bug dans la table User().
Dans VigiMap & VigiGraph : utilisation de postgre://vigilo:vigilo@localhost/vigilo comme URL pour la BDD.
Utilisation du préfixe "vigilo_" devant les noms des tables.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@2010 b22e2e97-25c9-44ff-b637-2e5ceca36478
| development.ini | ||
|---|---|---|
| 22 | 22 |
[app:main] |
| 23 | 23 |
use = egg:vigigraph |
| 24 | 24 |
|
| 25 |
db_basename= |
|
| 25 |
db_basename=vigilo_
|
|
| 26 | 26 |
;password_hashing_function=md5 |
| 27 | 27 |
lang=fr |
| 28 | 28 |
use_kerberos=False |
| maj_bdd.py | ||
|---|---|---|
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 |
import os |
|
| 3 |
import atexit |
|
| 4 |
from datetime import datetime |
|
| 2 | 5 |
from sqlalchemy import and_ |
| 6 |
import paste.deploy |
|
| 7 |
import tg |
|
| 8 |
|
|
| 9 |
tg.config = paste.deploy.appconfig('config:%s/%s' % (os.getcwd(), 'development.ini'))
|
|
| 10 |
from vigilo.models.configure import DBSession, configure_db |
|
| 11 |
configure_db(tg.config, 'sqlalchemy.') |
|
| 12 |
|
|
| 13 |
def commit_on_exit(): |
|
| 14 |
""" |
|
| 15 |
Effectue un COMMIT sur la transaction à la fin de l'exécution |
|
| 16 |
du script d'insertion des données de test. |
|
| 17 |
""" |
|
| 18 |
import transaction |
|
| 19 |
transaction.commit() |
|
| 20 |
|
|
| 21 |
atexit.register(commit_on_exit) |
|
| 3 | 22 |
|
| 4 | 23 |
from vigilo.models import Host, HostGroup |
| 5 | 24 |
from vigilo.models import LowLevelService, ServiceGroup |
| 6 | 25 |
from vigilo.models import PerfDataSource, Graph |
| 7 |
from vigilo.models.session import DBSession |
|
| 8 |
|
|
| 9 |
from datetime import datetime |
|
| 10 |
|
|
| 11 |
import transaction |
|
| 12 | 26 |
|
| 13 |
#DBSession.autocommit = True |
|
| 14 | 27 |
|
| 15 | 28 |
# Groupe d'hôtes (HostGroup) |
| 16 | 29 |
def create_HostGroup(name, parent=None): |
| ... | ... | |
| 207 | 220 |
ds8 = create_ds(u'CPU usage (by type)', u'GAUGE', s5 \ |
| 208 | 221 |
, u'CPU usage (by type)', graphs[7:8]) |
| 209 | 222 |
|
| 210 |
transaction.commit() |
|
Also available in: Unified diff