Revision bcf87133
Correction de plusieurs problèmes dans VigiBoard pour l'affichage des événements bruts masqués d'un événement corrélé.
Correction du plugin history (problèmes de liens).
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@2164 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/root.py | ||
|---|---|---|
| 76 | 76 |
@param output: Idem que host mais sur le text explicatif |
| 77 | 77 |
@param trouble_ticket: Idem que host mais sur les tickets attribués |
| 78 | 78 |
""" |
| 79 |
if not page: |
|
| 80 |
page = 1 |
|
| 81 |
|
|
| 79 | 82 |
username = request.environ['repoze.who.identity']['repoze.who.userid'] |
| 80 | 83 |
user = User.by_user_name(username) |
| 81 | 84 |
|
| ... | ... | |
| 204 | 207 |
|
| 205 | 208 |
@param idevent: identifiant de l'événement souhaité |
| 206 | 209 |
""" |
| 210 |
if not page: |
|
| 211 |
page = 1 |
|
| 212 |
|
|
| 207 | 213 |
username = request.environ['repoze.who.identity']['repoze.who.userid'] |
| 208 | 214 |
events = VigiboardRequest(User.by_user_name(username), False) |
| 209 | 215 |
events.add_table( |
| ... | ... | |
| 217 | 223 |
Event.idsupitem == events.items.c.idsupitem)) |
| 218 | 224 |
events.add_filter(Event.idevent != CorrEvent.idcause) |
| 219 | 225 |
events.add_filter(CorrEvent.idcorrevent == idcorrevent) |
| 220 |
|
|
| 226 |
|
|
| 221 | 227 |
# Vérification que l'événement existe |
| 222 |
if events.num_rows() != 1 : |
|
| 228 |
total_rows = events.num_rows() |
|
| 229 |
if total_rows < 1: |
|
| 223 | 230 |
flash(_('No masked event or access denied'), 'error')
|
| 224 | 231 |
redirect('/')
|
| 225 | 232 |
|
| 226 | 233 |
# Calcul des éléments à afficher et du nombre de pages possibles |
| 227 |
total_rows = events.num_rows() |
|
| 228 | 234 |
items_per_page = int(config['vigiboard_items_per_page']) |
| 229 | 235 |
|
| 230 | 236 |
id_first_row = items_per_page * (page-1) |
| ... | ... | |
| 276 | 282 |
|
| 277 | 283 |
@param idevent: identifiant de l'événement souhaité |
| 278 | 284 |
""" |
| 285 |
if not page: |
|
| 286 |
page = 1 |
|
| 287 |
|
|
| 279 | 288 |
username = request.environ['repoze.who.identity']['repoze.who.userid'] |
| 280 | 289 |
events = VigiboardRequest(User.by_user_name(username)) |
| 281 | 290 |
events.add_table( |
| ... | ... | |
| 349 | 358 |
@param host: Nom de l'hôte souhaité. |
| 350 | 359 |
@param service: Nom du service souhaité |
| 351 | 360 |
""" |
| 361 |
if not page: |
|
| 362 |
page = 1 |
|
| 363 |
|
|
| 352 | 364 |
idsupitem = SupItem.get_supitem(host, service) |
| 353 | 365 |
|
| 354 | 366 |
username = request.environ['repoze.who.identity']['repoze.who.userid'] |
| vigiboard/controllers/vigiboard_plugin/history.py | ||
|---|---|---|
| 66 | 66 |
service = urllib.quote(event.servicename) |
| 67 | 67 |
else: |
| 68 | 68 |
service = None |
| 69 |
|
|
| 69 | 70 |
eventdetails[edname] = edlink[1] % {
|
| 70 | 71 |
'idcorrevent': idcorrevent, |
| 71 | 72 |
'host': urllib.quote(event.hostname), |
| ... | ... | |
| 84 | 85 |
host = event.hostname, |
| 85 | 86 |
service = event.servicename, |
| 86 | 87 |
eventdetails = eventdetails, |
| 88 |
idcause = event[0].idevent, |
|
| 87 | 89 |
) |
| 88 | 90 |
|
| 89 | 91 |
|
| vigiboard/controllers/vigiboardrequest.py | ||
|---|---|---|
| 356 | 356 |
""" |
| 357 | 357 |
|
| 358 | 358 |
from vigiboard.controllers.root import get_last_modification_timestamp |
| 359 |
|
|
| 360 |
# Si les objets manipulés sont des Event, on a facilement les idevent. |
|
| 361 |
if isinstance(data[0], Event): |
|
| 362 |
ids = [data[0].idevent for data in self.events] |
|
| 363 |
# Sinon, il s'agit de CorrEvent(s) dont on récupère l'idcause. |
|
| 364 |
else: |
|
| 365 |
ids = [data[0].idcause for data in self.events] |
|
| 359 | 366 |
|
| 360 | 367 |
# Dialogue d'édition |
| 361 |
ids = [data[0].idcause for data in self.events] |
|
| 362 | 368 |
tmpl_context.edit_event_form = EditEventForm('edit_event_form',
|
| 363 | 369 |
last_modification=mktime(get_last_modification_timestamp( |
| 364 | 370 |
ids).timetuple()), |
Also available in: Unified diff