hq r5641 - in trunk: installer/data sql/galerts src/org/hyperic/hq/galerts src/org/hyperic/hq/galerts/server/session ui_plugins/alertcenter/app

[jtravis_hyperic]

You'll need to dbsetup-upgrade in order to have things working again
-- we've added a column to eam_galert_defs.

-- Jon


On Aug 16, 2007, at 8:04 PM, jtravis@hyperic.com wrote:

> Author: jtravis
> Date: 2007-08-16 20:04:49 -0700 (Thu, 16 Aug 2007)
> New Revision: 5641
> URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=5641
>
> Modified:
> trunk/installer/data/db-upgrade.xml
> trunk/sql/galerts/GalertDef.hbm.xml
> trunk/src/org/hyperic/hq/galerts/Resources.properties
> trunk/src/org/hyperic/hq/galerts/server/session/GalertDef.java
> trunk/src/org/hyperic/hq/galerts/server/session/
> GalertDefSortField.java
> trunk/src/org/hyperic/hq/galerts/server/session/
> GalertManagerEJBImpl.java
> trunk/ui_plugins/alertcenter/app/AlertController.groovy
> Log:
> Add lastFired to galerts
>
> Modified: trunk/installer/data/db-upgrade.xml
> ===================================================================
> --- trunk/installer/data/db-upgrade.xml 2007-08-17 03:04:08 UTC
> (rev 5640)
> +++ trunk/installer/data/db-upgrade.xml 2007-08-17 03:04:49 UTC
> (rev 5641)
> @@ -6576,6 +6576,11 @@
> <schema-addColumn table="EAM_ALERT_DEFINITION"
> column="LAST_FIRED"
> columnType="LONG"/>
> </schemaSpec>
> +
> + <schemaSpec version="3.47">
> + <schema-addColumn table="EAM_GALERT_DEFS" column="LAST_FIRED"
> + columnType="LONG"/>
> + </schemaSpec>
>
> </dbupgrade>
> </target>
>
> Modified: trunk/sql/galerts/GalertDef.hbm.xml
> ===================================================================
> --- trunk/sql/galerts/GalertDef.hbm.xml 2007-08-17 03:04:08 UTC
> (rev 5640)
> +++ trunk/sql/galerts/GalertDef.hbm.xml 2007-08-17 03:04:49 UTC
> (rev 5641)
> @@ -47,6 +47,10 @@
> <column name="DELETED" not-null="true" />
> </property>
>
> + <property name="lastFired">
> + <column name="LAST_FIRED" not-null="false" />
> + </property>
> +
> <many-to-one name="group">
> <column name="GROUP_ID" not-null="true"/>
> </many-to-one>
>
> Modified: trunk/src/org/hyperic/hq/galerts/Resources.properties
> ===================================================================
> --- trunk/src/org/hyperic/hq/galerts/Resources.properties
> 2007-08-17 03:04:08 UTC (rev 5640)
> +++ trunk/src/org/hyperic/hq/galerts/Resources.properties
> 2007-08-17 03:04:49 UTC (rev 5641)
> @@ -16,3 +16,4 @@
> galertDef.sortField.severity=Priority
> galertDef.sortField.group=Group
> galertDef.sortField.escalation=Escalation
> +galertDef.sortField.lastFired=Last Alert
>
> Modified: trunk/src/org/hyperic/hq/galerts/server/session/
> GalertDef.java
> ===================================================================
> --- trunk/src/org/hyperic/hq/galerts/server/session/GalertDef.java
> 2007-08-17 03:04:08 UTC (rev 5640)
> +++ trunk/src/org/hyperic/hq/galerts/server/session/GalertDef.java
> 2007-08-17 03:04:49 UTC (rev 5641)
> @@ -55,6 +55,7 @@
> private long _ctime;
> private long _mtime;
> private boolean _deleted;
> + private Long _lastFired;
>
> protected GalertDef() {}
>
> @@ -70,6 +71,7 @@
> _ctime = System.currentTimeMillis();
> _mtime = _ctime;
> _deleted = false;
> + _lastFired = null;
> }
>
> ExecutionStrategyInfo
> @@ -219,6 +221,14 @@
> public boolean isDeleted() {
> return _deleted;
> }
> +
> + protected void setLastFired(Long l) {
> + _lastFired = l;
> + }
> +
> + public Long getLastFired() {
> + return _lastFired;
> + }
>
> public EscalationAlertType getAlertType() {
> return GalertEscalationAlertType.GALERT;
>
> Modified: trunk/src/org/hyperic/hq/galerts/server/session/
> GalertDefSortField.java
> ===================================================================
> --- trunk/src/org/hyperic/hq/galerts/server/session/
> GalertDefSortField.java 2007-08-17 03:04:08 UTC (rev 5640)
> +++ trunk/src/org/hyperic/hq/galerts/server/session/
> GalertDefSortField.java 2007-08-17 03:04:49 UTC (rev 5641)
> @@ -120,6 +120,18 @@
> }
> };
>
> + public static final GalertDefSortField LAST_FIRED =
> + new GalertDefSortField(7, "LastFired",
> "galertDef.sortField.lastFired")
> + {
> + String getSortString(String def, String group, String
> escalation) {
> + return def + ".lastFired";
> + }
> +
> + public boolean isSortable() {
> + return true;
> + }
> + };
> +
> private GalertDefSortField(int code, String desc, String
> localeProp) {
> super(GalertDefSortField.class, code, desc, localeProp,
> ResourceBundle.getBundle(BUNDLE));
>
> Modified: trunk/src/org/hyperic/hq/galerts/server/session/
> GalertManagerEJBImpl.java
> ===================================================================
> --- trunk/src/org/hyperic/hq/galerts/server/session/
> GalertManagerEJBImpl.java 2007-08-17 03:04:08 UTC (rev 5640)
> +++ trunk/src/org/hyperic/hq/galerts/server/session/
> GalertManagerEJBImpl.java 2007-08-17 03:04:49 UTC (rev 5641)
> @@ -262,6 +262,7 @@
> if (provider != null)
> provider.save(gAuxLog.getId().intValue(), auxLog);
> }
> + def.setLastFired(new Long(System.currentTimeMillis()));
> return newLog;
> }
>
>
> Modified: trunk/ui_plugins/alertcenter/app/AlertController.groovy
> ===================================================================
> --- trunk/ui_plugins/alertcenter/app/AlertController.groovy
> 2007-08-17 03:04:08 UTC (rev 5640)
> +++ trunk/ui_plugins/alertcenter/app/AlertController.groovy
> 2007-08-17 03:04:49 UTC (rev 5641)
> @@ -110,14 +110,8 @@
> private final DEF_TABLE_SCHEMA = [
> getData: {pageInfo, params ->
> def excludeTypes = params.getOne('excludeTypes',
> 'true').toBoolean()
> - def disabledOnly = params.getOne('onlyShowDisabled',
> 'false').toBoolean()
> -
> - if (disabledOnly == false) {
> - disabledOnly = null
> - } else {
> - disabledOnly = !disabledOnly;
> - }
> - alertHelper.findDefinitions(AlertSeverity.LOW,
> disabledOnly,
> + alertHelper.findDefinitions(AlertSeverity.LOW,
> + getOnlyShowDisabled(params),
> excludeTypes, pageInfo)
> },
> defaultSort: AlertDefSortField.CTIME,
> @@ -149,8 +143,8 @@
>
> private final TYPE_DEF_TABLE_SCHEMA = [
> getData: {pageInfo, params ->
> - def onlyShowDisabled = getOnlyShowDisabled(params)
> - alertHelper.findTypeBasedDefinitions(onlyShowDisabled,
> pageInfo)
> + alertHelper.findTypeBasedDefinitions
> (getOnlyShowDisabled(params),
> + pageInfo)
> },
> defaultSort: AlertDefSortField.NAME,
> defaultSortOrder: 0, // descending
> @@ -180,7 +174,7 @@
> defaultSort: GalertDefSortField.NAME,
> defaultSortOrder: 0, // descending
> columns: [
> - [field:GalertDefSortField.NAME, width:'20%',
> + [field:GalertDefSortField.NAME, width:'18%',
> label:{linkTo(it.name, [resource:it]) }],
> [field:GalertDefSortField.CTIME, width:'10%',
> label:{df.format(it.ctime)}],
> @@ -188,10 +182,18 @@
> label:{df.format(it.mtime)}],
> [field:GalertDefSortField.SEVERITY, width:'10%',
> label:{getSeverityImg(it.severity)}],
> - [field:GalertDefSortField.ENABLED, width:'10%',
> + [field:GalertDefSortField.ENABLED, width:'7%',
> label:{YesOrNo.valueFor(it.enabled).value.capitalize
> ()}],
> [field:GalertDefSortField.ESCALATION, width:'20%',
> label:{linkTo(it.escalation.name,
> [resource:it.escalation])}],
> + [field:GalertDefSortField.LAST_FIRED, width:'10%',
> + label:{
> + if (it.lastFired)
> + return linkTo(df.format(it.lastFired),
> + [resource:it,
> resourceContext:'listAlerts'])
> + else
> + return ''
> + }],
> [field:GalertDefSortField.GROUP, width:'20%',
> label:{linkTo(it.group.name, [resource:it.group])}]
> ]
>