From: <jt...@hy...> - 2008-03-17 21:36:24
|
Author: jtravis Date: 2008-03-17 14:36:21 -0700 (Mon, 17 Mar 2008) New Revision: 8276 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=8276 Modified: trunk/src/org/hyperic/hq/events/server/session/EventLogDAO.java trunk/src/org/hyperic/hq/events/server/session/EventLogSortField.java trunk/ui_plugins/eventcenter/app/EventController.groovy trunk/ui_plugins/eventcenter/etc/eventcenter_i18n.properties Log: Merge from 3.2: Simplify the query for event logs by no-longer allowing sorting on lots of fields (instead, we opt for filtering). In addition, allow for a 4 hour timewindow Modified: trunk/src/org/hyperic/hq/events/server/session/EventLogDAO.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/EventLogDAO.java 2008-03-17 21:33:38 UTC (rev 8275) +++ trunk/src/org/hyperic/hq/events/server/session/EventLogDAO.java 2008-03-17 21:36:21 UTC (rev 8276) @@ -102,15 +102,15 @@ { EventLogSortField sort = (EventLogSortField)pInfo.getSort(); - String sql = "select distinct(e.id), {e.*}, r.* " + + String sql = "select {e.*}, r.* " + "from EAM_RESOURCE r " + " join EAM_RESOURCE_TYPE rt on r.resource_type_id = rt.id " + " join EAM_EVENT_LOG e on e.resource_id = r.id " + - " join EAM_RES_GRP_RES_MAP rgm on r.id = rgm.resource_id " + - " join EAM_RESOURCE_GROUP g on rgm.resource_group_id = g.id " + "where " + - " e.timestamp >= :begin and " + - " e.timestamp < :end and " + + " e.timestamp between :begin and :end and " + + " exists (select rgm.resource_id from EAM_RES_GRP_RES_MAP rgm "+ + " join EAM_RESOURCE_GROUP g on rgm.resource_group_id = g.id" + + " where rgm.resource_id = r.id) and " + " case " + " when e.status = 'ANY' then -1 " + " when e.status = 'ERR' then 3 " + Modified: trunk/src/org/hyperic/hq/events/server/session/EventLogSortField.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/EventLogSortField.java 2008-03-17 21:33:38 UTC (rev 8275) +++ trunk/src/org/hyperic/hq/events/server/session/EventLogSortField.java 2008-03-17 21:36:21 UTC (rev 8276) @@ -40,7 +40,7 @@ new EventLogSortField(0, "Resource", "eventLog.sortField.resource") { public boolean isSortable() { - return true; + return false; } String getSortString(String resource, String eventLog) { @@ -64,7 +64,7 @@ new EventLogSortField(2, "Status", "eventLog.sortField.status") { public boolean isSortable() { - return true; + return false; } String getSortString(String resource, String eventLog) { @@ -76,7 +76,7 @@ new EventLogSortField(3, "Subject", "eventLog.sortField.subject") { public boolean isSortable() { - return true; + return false; } String getSortString(String resource, String eventLog) { @@ -88,7 +88,7 @@ new EventLogSortField(4, "Type", "eventLog.sortField.type") { public boolean isSortable() { - return true; + return false; } String getSortString(String resource, String eventLog) { @@ -100,7 +100,7 @@ new EventLogSortField(5, "Detail", "eventLog.sortField.detail") { public boolean isSortable() { - return true; + return false; } String getSortString(String resource, String eventLog) { Modified: trunk/ui_plugins/eventcenter/app/EventController.groovy =================================================================== --- trunk/ui_plugins/eventcenter/app/EventController.groovy 2008-03-17 21:33:38 UTC (rev 8275) +++ trunk/ui_plugins/eventcenter/app/EventController.groovy 2008-03-17 21:36:21 UTC (rev 8276) @@ -1,3 +1,4 @@ +import org.hyperic.hq.events.AlertFiredEvent import org.hyperic.hq.measurement.shared.ResourceLogEvent import org.hyperic.hq.measurement.shared.ConfigChangedEvent import org.hyperic.hq.hqu.rendit.BaseController @@ -25,8 +26,8 @@ findTypeByCode(typeCode), getInGroups(params)) }, - defaultSort: EventLogSortField.RESOURCE, - defaultSortOrder: 1, + defaultSort: EventLogSortField.DATE, + defaultSortOrder: 0, rowId: {it.eventLog.id}, columns: [ [field:EventLogSortField.DATE, width:'12%', @@ -101,7 +102,8 @@ private getAllTypes() { [[code: 0, value: localeBundle.All, className: null], [code: 1, value: localeBundle.LogTrack, className: ResourceLogEvent.class.name], - [code: 2, value: localeBundle.ConfigTrack, className: ConfigChangedEvent.class.name]] + [code: 2, value: localeBundle.ConfigTrack, className: ConfigChangedEvent.class.name], + [code: 3, value: localeBundle.Alert, className: AlertFiredEvent.class.name]] } private findTimeDeltaByCode(int code) { @@ -113,11 +115,11 @@ } private getTimePeriods() { - [[code: 0, value: localeBundle.last8Hours, delta: 8 * 60 * 60 * 1000], - [code: 1, value: localeBundle.lastDay, delta: 24 * 60 * 60 * 1000], - [code: 2, value: localeBundle.lastWeek, delta: 7 * 24 * 60 * 60 * 1000], - [code: 3, value: localeBundle.lastMonth, - delta: 30L * 24 * 60 * 60 * 1000]] + [[code: 0, value: localeBundle.last4Hours, delta: 4 * 60 * 60 * 1000], + [code: 1, value: localeBundle.last8Hours, delta: 8 * 60 * 60 * 1000], + [code: 2, value: localeBundle.lastDay, delta: 24 * 60 * 60 * 1000], + [code: 3, value: localeBundle.lastWeek, delta: 7 * 24 * 60 * 60 * 1000], + [code: 4, value: localeBundle.lastMonth, delta: 30L * 24 * 60 * 60 * 1000]] } def index(params) { Modified: trunk/ui_plugins/eventcenter/etc/eventcenter_i18n.properties =================================================================== --- trunk/ui_plugins/eventcenter/etc/eventcenter_i18n.properties 2008-03-17 21:33:38 UTC (rev 8275) +++ trunk/ui_plugins/eventcenter/etc/eventcenter_i18n.properties 2008-03-17 21:36:21 UTC (rev 8276) @@ -7,7 +7,9 @@ All=All LogTrack=Log Track ConfigTrack=Config Track +Alert=Alerts timeRange=Time Range +last4Hours=Last 4 hours last8Hours=Last 8 Hours lastDay=Last Day lastWeek=Last Week |