Revision 348eec2c
Fix broken references to models renamed in svn rev [674].
git grep wEl 'Events|GraphGroups|Groups|HostGroups|ServiceGroups' - \
{vigiboard,models,correlator,connector,glue,vigicore} \
|xargs sed -i -re 's:\<(Event|GraphGroup|Group|HostGroup|ServiceGroup)s\>:\1:g'
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@695 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/vigiboardrequest.py | ||
|---|---|---|
| 2 | 2 |
# vim:set expandtab tabstop=4 shiftwidth=4: |
| 3 | 3 |
"""Gestion de la requête, des plugins et de l'affichage du Vigiboard""" |
| 4 | 4 |
|
| 5 |
from vigiboard.model import Events, Host, Service, \
|
|
| 6 |
HostGroups, ServiceGroups, EventHistory, User
|
|
| 5 |
from vigiboard.model import Event, Host, Service, \ |
|
| 6 |
HostGroup, ServiceGroup, EventHistory, User
|
|
| 7 | 7 |
from tg import tmpl_context, url, config, request |
| 8 | 8 |
from vigiboard.model import DBSession |
| 9 | 9 |
from sqlalchemy import not_ , and_ , asc , desc |
| ... | ... | |
| 41 | 41 |
self.class_ack = {'Acknowledged': 'Ack', 'None': '', 'AAClosed': 'Ack'}
|
| 42 | 42 |
|
| 43 | 43 |
self.generaterq = False |
| 44 |
self.table = [Events]
|
|
| 45 |
self.join = [( Host, Events.hostname == Host.name ),
|
|
| 46 |
( Service, Events.servicename == Service.name ),
|
|
| 47 |
( HostGroups , Host.name == HostGroups.hostname ),
|
|
| 48 |
( ServiceGroups , Service.name == ServiceGroups.servicename )
|
|
| 44 |
self.table = [Event] |
|
| 45 |
self.join = [( Host, Event.hostname == Host.name ), |
|
| 46 |
( Service, Event.servicename == Service.name ), |
|
| 47 |
( HostGroup , Host.name == HostGroup.hostname ),
|
|
| 48 |
( ServiceGroup , Service.name == ServiceGroup.servicename )
|
|
| 49 | 49 |
] |
| 50 | 50 |
self.outerjoin = [] |
| 51 |
self.filter = [HostGroups.groupname.in_(self.user_groups),
|
|
| 52 |
ServiceGroups.groupname.in_(self.user_groups),
|
|
| 53 |
not_(and_(Events.active == False,
|
|
| 54 |
Events.status == 'AAClosed')),
|
|
| 55 |
Events.timestamp_active != None#,
|
|
| 56 |
#not_(Events.timestamp_active.like('0000-00-00 00:00:00'))
|
|
| 51 |
self.filter = [HostGroup.groupname.in_(self.user_groups), |
|
| 52 |
ServiceGroup.groupname.in_(self.user_groups), |
|
| 53 |
not_(and_(Event.active == False, |
|
| 54 |
Event.status == 'AAClosed')), |
|
| 55 |
Event.timestamp_active != None#, |
|
| 56 |
#not_(Event.timestamp_active.like('0000-00-00 00:00:00'))
|
|
| 57 | 57 |
] |
| 58 |
self.orderby = [desc(Events.status),
|
|
| 59 |
desc(Events.active),
|
|
| 60 |
desc(Events.severity),
|
|
| 61 |
asc(Events.hostname),
|
|
| 62 |
desc(Events.timestamp)]
|
|
| 58 |
self.orderby = [desc(Event.status), |
|
| 59 |
desc(Event.active), |
|
| 60 |
desc(Event.severity), |
|
| 61 |
asc(Event.hostname), |
|
| 62 |
desc(Event.timestamp)] |
|
| 63 | 63 |
self.groupby = [] |
| 64 | 64 |
self.plugin = [] |
| 65 | 65 |
self.events = [] |
| ... | ... | |
| 298 | 298 |
# rq devient une liste plutôt que d'être directement la |
| 299 | 299 |
# table souhaité |
| 300 | 300 |
|
| 301 |
if isinstance(req, Events) :
|
|
| 301 |
if isinstance(req, Event) : |
|
| 302 | 302 |
event = req |
| 303 | 303 |
else : |
| 304 | 304 |
event = req[0] |
Also available in: Unified diff