Revision a45763b4
Suite du renommage de EventsAggregate en CorrEvent dans VigiBoard.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1349 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/root.py | ||
|---|---|---|
| 146 | 146 |
refresh_times=self.refresh_times, |
| 147 | 147 |
) |
| 148 | 148 |
|
| 149 |
@validate(validators={'idaggregate':validators.String(not_empty=True)},
|
|
| 149 |
@validate(validators={'idcorrevent':validators.String(not_empty=True)},
|
|
| 150 | 150 |
error_handler=process_form_errors) |
| 151 | 151 |
@expose('json')
|
| 152 | 152 |
@require(Any(not_anonymous(), msg=_("You need to be authenticated")))
|
| 153 |
def history_dialog(self, idaggregate):
|
|
| 153 |
def history_dialog(self, idcorrevent):
|
|
| 154 | 154 |
|
| 155 | 155 |
""" |
| 156 | 156 |
JSon renvoyant les éléments pour l'affichage de la fenêtre de dialogue |
| ... | ... | |
| 172 | 172 |
(Event, CorrEvent.idcause == Event.idevent), |
| 173 | 173 |
(HostGroup, Event.hostname == HostGroup.hostname), |
| 174 | 174 |
).filter(HostGroup.idgroup.in_(user.groups) |
| 175 |
).filter(CorrEvent.idcorrevent == idaggregate
|
|
| 175 |
).filter(CorrEvent.idcorrevent == idcorrevent
|
|
| 176 | 176 |
).one() |
| 177 | 177 |
|
| 178 | 178 |
history = DBSession.query( |
| ... | ... | |
| 186 | 186 |
config['vigiboard_links.eventdetails'].iteritems(): |
| 187 | 187 |
|
| 188 | 188 |
eventdetails[edname] = edlink[1] % {
|
| 189 |
'idaggregate': idaggregate,
|
|
| 189 |
'idcorrevent': idcorrevent,
|
|
| 190 | 190 |
'host': event[1].hostname, |
| 191 | 191 |
'service': event[1].servicename |
| 192 | 192 |
} |
| ... | ... | |
| 198 | 198 |
event[1].initial_state), |
| 199 | 199 |
peak_state = StateName.value_to_statename( |
| 200 | 200 |
event[1].peak_state), |
| 201 |
idaggregate = idaggregate,
|
|
| 201 |
idcorrevent = idcorrevent,
|
|
| 202 | 202 |
host = event[1].hostname, |
| 203 | 203 |
service = event[1].servicename, |
| 204 | 204 |
eventdetails = eventdetails, |
| 205 | 205 |
) |
| 206 | 206 |
|
| 207 |
@validate(validators={'idaggregate':validators.String(not_empty=True)},
|
|
| 207 |
@validate(validators={'idcorrevent':validators.String(not_empty=True)},
|
|
| 208 | 208 |
error_handler=process_form_errors) |
| 209 | 209 |
@expose('vigiboard.html')
|
| 210 | 210 |
@require(Any(not_anonymous(), msg=_("You need to be authenticated")))
|
| 211 |
def event(self, idaggregate):
|
|
| 211 |
def event(self, idcorrevent):
|
|
| 212 | 212 |
""" |
| 213 | 213 |
Affichage de l'historique d'un événement. |
| 214 | 214 |
Pour accéder à cette page, l'utilisateur doit être authentifié. |
| ... | ... | |
| 218 | 218 |
|
| 219 | 219 |
username = request.environ['repoze.who.identity']['repoze.who.userid'] |
| 220 | 220 |
events = VigiboardRequest(User.by_user_name(username)) |
| 221 |
events.add_filter(CorrEvent.idcorrevent == idaggregate)
|
|
| 221 |
events.add_filter(CorrEvent.idcorrevent == idcorrevent)
|
|
| 222 | 222 |
|
| 223 | 223 |
# Vérification que l'événement existe |
| 224 | 224 |
if events.num_rows() != 1 : |
Also available in: Unified diff