Revision 5d20c2c5
VigiBoard & modèle : correction orthographique (Acknowlege[ment] -> Acknowledge[ment]).
Corrections dans la mise à jour des événements (erreur dans la requête SQL du fait de l'interprétation stricte par PostgreSQL).
Ajout de coverage aux dépendances de test de VigiBoard.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1920 b22e2e97-25c9-44ff-b637-2e5ceca36478
| setup.py | ||
|---|---|---|
| 12 | 12 |
'WebTest', |
| 13 | 13 |
'BeautifulSoup', |
| 14 | 14 |
'lxml', |
| 15 |
'coverage', |
|
| 15 | 16 |
] |
| 16 | 17 |
|
| 17 | 18 |
setup( |
| vigiboard/controllers/root.py | ||
|---|---|---|
| 96 | 96 |
aggregates.add_join((Event, CorrEvent.idcause == Event.idevent)) |
| 97 | 97 |
aggregates.add_join((aggregates.items, |
| 98 | 98 |
Event.idsupitem == aggregates.items.c.idsupitem)) |
| 99 |
aggregates.add_order_by(asc(aggregates.items.c.hostname)) |
|
| 99 | 100 |
|
| 100 | 101 |
search = {
|
| 101 | 102 |
'host': '', |
| ... | ... | |
| 402 | 403 |
@validate(validators={
|
| 403 | 404 |
"id": validators.Regex(r'^[0-9]+(,[0-9]+)*,?$'), |
| 404 | 405 |
# "trouble_ticket": validators.Regex(r'^[0-9]*$'), |
| 405 |
"status": validators.OneOf([
|
|
| 406 |
"ack": validators.OneOf([
|
|
| 406 | 407 |
u'NoChange', |
| 407 | 408 |
u'None', |
| 408 | 409 |
u'Acknowledged', |
| ... | ... | |
| 426 | 427 |
if krgv['id'] is None: |
| 427 | 428 |
flash(_('No event has been selected'), 'warning')
|
| 428 | 429 |
raise redirect(request.environ.get('HTTP_REFERER', url('/')))
|
| 429 |
ids = krgv['id'].split(',')
|
|
| 430 |
|
|
| 431 |
# Le filtre permet d'éliminer les chaines vides contenues dans le |
|
| 432 |
# tableau ('a,b,' -> split -> ['a','b',''] -> filter -> ['a','b']).
|
|
| 433 |
ids = filter(len, krgv['id'].split(','))
|
|
| 430 | 434 |
|
| 431 | 435 |
# Si des changements sont survenus depuis que la |
| 432 | 436 |
# page est affichée, on en informe l'utilisateur. |
| ... | ... | |
| 447 | 451 |
events = VigiboardRequest(User.by_user_name(username)) |
| 448 | 452 |
events.add_table(CorrEvent) |
| 449 | 453 |
events.add_join((Event, CorrEvent.idcause == Event.idevent)) |
| 450 |
events.add_join((aggregates.items,
|
|
| 454 |
events.add_join((events.items,
|
|
| 451 | 455 |
Event.idsupitem == events.items.c.idsupitem)) |
| 452 | 456 |
events.add_filter(CorrEvent.idcorrevent.in_(ids)) |
| 453 | 457 |
|
| vigiboard/controllers/vigiboardrequest.py | ||
|---|---|---|
| 126 | 126 |
priority_order, # Priorité ITIL (entier). |
| 127 | 127 |
desc(StateName.order), # Etat courant (entier). |
| 128 | 128 |
desc(Event.timestamp), |
| 129 |
asc(self.items.c.hostname), |
|
| 130 | 129 |
] |
| 131 | 130 |
|
| 132 | 131 |
# Regroupements (GROUP BY) |
| ... | ... | |
| 182 | 181 |
# On loggue l'erreur et on ignore le plugin. |
| 183 | 182 |
LOGGER.error(_('No such plugin "%s"') % plug[0])
|
| 184 | 183 |
|
| 185 |
# temp_join = self.join |
|
| 186 |
# self.join = [(self.items, Event.idsupitem == self.items.c.idsupitem), |
|
| 187 |
# (StateName, StateName.idstatename == Event.current_state),] |
|
| 188 |
# self.join.extend(temp_join) |
|
| 189 |
|
|
| 190 |
# self.join.extend( |
|
| 191 |
# [(self.items, Event.idsupitem == self.items.c.idsupitem), |
|
| 192 |
# (StateName, StateName.idstatename == Event.current_state),]) |
|
| 193 |
self.join.append((StateName, StateName.idstatename == Event.current_state)) |
|
| 184 |
self.join.append((StateName, StateName.idstatename == \ |
|
| 185 |
Event.current_state)) |
|
| 194 | 186 |
self.add_group_by(*self.table) |
| 195 | 187 |
|
| 196 | 188 |
# query et join ont besoin de referrence |
| vigiboard/tests/functional/test_history_tables.py | ||
|---|---|---|
| 87 | 87 |
idevent=event.idevent, |
| 88 | 88 |
timestamp=datetime.now())) |
| 89 | 89 |
DBSession.add(EventHistory( |
| 90 |
type_action=u'Acknowledgement change state',
|
|
| 90 |
type_action=u'Acknowlegement change state', |
|
| 91 | 91 |
idevent=event.idevent, |
| 92 | 92 |
timestamp=datetime.now())) |
| 93 | 93 |
DBSession.flush() |
| vigiboard/tests/functional/test_host_vigiboardrequest.py | ||
|---|---|---|
| 81 | 81 |
# Ajout des historiques |
| 82 | 82 |
DBSession.add(EventHistory(type_action=u'Nagios update state', |
| 83 | 83 |
idevent=event1.idevent, timestamp=datetime.now())) |
| 84 |
DBSession.add(EventHistory(type_action=u'Acknowlegement change state', |
|
| 84 |
DBSession.add(EventHistory(type_action=u'Acknowledgement change state',
|
|
| 85 | 85 |
idevent=event1.idevent, timestamp=datetime.now())) |
| 86 | 86 |
DBSession.add(EventHistory(type_action=u'Nagios update state', |
| 87 | 87 |
idevent=event2.idevent, timestamp=datetime.now())) |
| 88 |
DBSession.add(EventHistory(type_action=u'Acknowlegement change state', |
|
| 88 |
DBSession.add(EventHistory(type_action=u'Acknowledgement change state',
|
|
| 89 | 89 |
idevent=event2.idevent, timestamp=datetime.now())) |
| 90 | 90 |
DBSession.flush() |
| 91 | 91 |
|
| vigiboard/tests/functional/test_vigiboardrequest.py | ||
|---|---|---|
| 137 | 137 |
# Les historiques |
| 138 | 138 |
DBSession.add(EventHistory(type_action=u'Nagios update state', |
| 139 | 139 |
idevent=event1.idevent, timestamp=datetime.now())) |
| 140 |
DBSession.add(EventHistory(type_action=u'Acknowlegement change state', |
|
| 140 |
DBSession.add(EventHistory(type_action=u'Acknowledgement change state',
|
|
| 141 | 141 |
idevent=event1.idevent, timestamp=datetime.now())) |
| 142 | 142 |
DBSession.add(EventHistory(type_action=u'Nagios update state', |
| 143 | 143 |
idevent=event2.idevent, timestamp=datetime.now())) |
| 144 |
DBSession.add(EventHistory(type_action=u'Acknowlegement change state', |
|
| 144 |
DBSession.add(EventHistory(type_action=u'Acknowledgement change state',
|
|
| 145 | 145 |
idevent=event2.idevent, timestamp=datetime.now())) |
| 146 | 146 |
DBSession.add(EventHistory(type_action=u'Nagios update state', |
| 147 | 147 |
idevent=event3.idevent, timestamp=datetime.now())) |
| 148 |
DBSession.add(EventHistory(type_action=u'Acknowlegement change state', |
|
| 148 |
DBSession.add(EventHistory(type_action=u'Acknowledgement change state',
|
|
| 149 | 149 |
idevent=event3.idevent, timestamp=datetime.now())) |
| 150 | 150 |
DBSession.add(EventHistory(type_action=u'Nagios update state', |
| 151 | 151 |
idevent=event4.idevent, timestamp=datetime.now())) |
| 152 |
DBSession.add(EventHistory(type_action=u'Acknowlegement change state', |
|
| 152 |
DBSession.add(EventHistory(type_action=u'Acknowledgement change state',
|
|
| 153 | 153 |
idevent=event4.idevent, timestamp=datetime.now())) |
| 154 | 154 |
DBSession.flush() |
| 155 | 155 |
|
Also available in: Unified diff