Project

General

Profile

Revision 3d0d254c

ID3d0d254cf9f9d1b45e6a3e56a7fcbaad4cc344e4
Parent be29aa96
Child c49defb8

Added by Francois POIROTTE over 14 years ago

Utilisation de idaggregate de préférence par rapport à idevent (permet d'obtenir plus d'informations).
On suppose que la base de données génère les id des events (le corrélateur et le connector-db sont en train d'être modifiés pour suivre ce changement).
Utilisation de HighLevelService plutôt que ServiceHautNiveau.

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@794 b22e2e97-25c9-44ff-b637-2e5ceca36478

View differences:

vigiboard/templates/vigiboard_event_table.html
10 10

  
11 11
<py:if test="len(events) > 1">
12 12
<table class="vigitable" summary="Event table">
13
	
14 13
	<thead>
15 14
		<tr >
16 15
			<td style="width:26px;border-right: solid 1px #4682b4">
......
47 46
	<tbody>
48 47
		<py:for each="(event,class_tr,class_td_severity,class_td_date,img_fleche,img_statu,plugin) in events[1:]">
49 48
		<tr py:attrs="class_tr">
50
			<td style="padding: 3px;" py:attrs="class_td_severity"><a href="javascript:vigiboard_historydialog('${event.idcause}')" class="HistoryLien"><img src="${tg.url(img_fleche['src'])}" style="width:20px" alt="Details" title="Event details" /></a></td>
51
			<td py:attrs="class_td_date"><span style="font-weight: bold;">${event.get_date('timestamp_active')}</span><br />[${event.get_since_date('timestamp_active')}]</td>
49
			<td style="padding: 3px;" py:attrs="class_td_severity">
50
			    <a href="javascript:vigiboard_historydialog('${event.idaggregate}')" class="HistoryLien"><img src="${tg.url(img_fleche['src'])}" style="width:20px" alt="Details" title="Event details" /></a>
51
		    </td>
52
			<td py:attrs="class_td_date">
53
			    <span style="font-weight: bold;">${event.get_date('timestamp_active')}</span>
54
			    <br />[${event.get_since_date('timestamp_active')}]
55
			 </td>
52 56
			<td py:attrs="class_td_date" style="text-align:center">${event.occurrences}</td>
53 57
			<td>${event.cause.hostname}</td>
54 58
			<td>${event.cause.servicename}</td>
......
56 60
			<td py:for="plug in plugin" py:attrs="plug[1]">${HTML(plug[0])}</td>
57 61
			<td style="text-align: center"><a py:if="event.trouble_ticket is not None" href="${
58 62
					tg.config['vigiboard_links.tt'] % {
59
						'idevent' : event.idcause,
60
						'host' : event.cause.hostname,
61
						'service' : event.cause.servicename,
62
						'tt' : event.trouble_ticket }}">[${event.trouble_ticket}]</a></td>
63
						'idaggregate': event.idaggregate,
64
						'host': event.cause.hostname,
65
						'service': event.cause.servicename,
66
						'tt': event.trouble_ticket }}">[${event.trouble_ticket}]</a></td>
63 67
			<td style="text-align: center"><img py:attrs="img_statu" py:if="img_statu != None" alt="Status" title="Event status"/></td>
64
			<td py:attrs="class_td_date" style="padding: 0px;text-align: center"><a class="Edit_EventsLien" href="javascript:vigiboard_edit_eventdialog('${event.idcause}')"><img src="${tg.url('/images/icon_page_edit.png')}" alt="Edit" title="Edit this event"/></a></td>
65
			<td py:attrs="class_td_date" style="padding:0px;text-align: center"><input type="checkbox" class="Edit_EventsCheckBox" value="${event.idcause}"/></td>
68
			<td py:attrs="class_td_date" style="padding: 0px;text-align: center"><a class="Edit_EventsLien" href="javascript:vigiboard_edit_eventdialog('${event.idaggregate}')"><img src="${tg.url('/images/icon_page_edit.png')}" alt="Edit" title="Edit this event"/></a></td>
69
			<td py:attrs="class_td_date" style="padding:0px;text-align: center"><input type="checkbox" class="Edit_EventsCheckBox" value="${event.idaggregate}"/></td>
66 70
		</tr>
67 71

  
68 72
    		<py:if test="hist_error == True">
......
86 90

  
87 91
<script type="text/javascript">
88 92
	function vigiboard_historydialog(idd) {
89
		$.getJSON("${tg.url('/history_dialog')}",{idevent:idd},function(json){
93
		$.getJSON("${tg.url('/history_dialog')}",{idaggregate:idd},function(json){
90 94
			$('#HistoryDialog_initial_state').html(json.initial_state);
91 95
			$('#HistoryDialog_current_state').html(json.current_state);
92
			$('#HistoryDialog_detailed_event').attr('href' , '${tg.url('/event/')}' + json.idevent);
96
			$('#HistoryDialog_detailed_event').attr('href', '${tg.url('/event/')}' + json.idaggregate);
93 97
			$('#HistoryDialog_detailed_host').attr('href', '${tg.url('/host_service/')}' + json.host + "/" + json.service);
94 98
			<py:for each="edname, edit in tg.config['vigiboard_links.eventdetails'].iteritems()">
95 99
			$('#HistoryDialog_${edname}').attr('href', json.eventdetails['${edname}']);

Also available in: Unified diff