Menu
▾
▴
hyperic-hq-discuss — Hyperic HQ SVN Commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(927) |
Apr
(419) |
May
(352) |
Jun
(431) |
Jul
(463) |
Aug
(345) |
Sep
(304) |
Oct
(596) |
Nov
(466) |
Dec
(414) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(348) |
Feb
(313) |
Mar
(665) |
Apr
(688) |
May
(434) |
Jun
(311) |
Jul
(540) |
Aug
(554) |
Sep
(467) |
Oct
(341) |
Nov
(365) |
Dec
(272) |
| 2009 |
Jan
(386) |
Feb
(293) |
Mar
(279) |
Apr
(239) |
May
(229) |
Jun
(199) |
Jul
(186) |
Aug
(111) |
Sep
(196) |
Oct
(146) |
Nov
(116) |
Dec
(140) |
| 2010 |
Jan
(170) |
Feb
(159) |
Mar
(151) |
Apr
(161) |
May
(90) |
Jun
(56) |
Jul
(28) |
Aug
(22) |
Sep
(5) |
Oct
|
Nov
(23) |
Dec
(12) |
| 2011 |
Jan
(8) |
Feb
(8) |
Mar
(22) |
Apr
(24) |
May
(4) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2012 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pn...@hy...> - 2009-10-16 09:18:49
|
Author: pnguyen Date: 2009-10-16 02:18:36 -0700 (Fri, 16 Oct 2009) New Revision: 13869 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13869 Modified: trunk/src/org/hyperic/hq/events/server/mbean/AlertConditionEvaluatorDiagnosticService.java Log: [HHQ-3475] For recovery alerts, display the last fired alert event as the "Alert Condition Evaluator State" Modified: trunk/src/org/hyperic/hq/events/server/mbean/AlertConditionEvaluatorDiagnosticService.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/mbean/AlertConditionEvaluatorDiagnosticService.java 2009-10-16 08:48:03 UTC (rev 13868) +++ trunk/src/org/hyperic/hq/events/server/mbean/AlertConditionEvaluatorDiagnosticService.java 2009-10-16 09:18:36 UTC (rev 13869) @@ -38,6 +38,7 @@ import org.hyperic.hq.events.server.session.AlertConditionEvaluator; import org.hyperic.hq.events.server.session.AlertConditionEvaluatorRepository; import org.hyperic.hq.events.server.session.AlertConditionEvaluatorRepositoryImpl; +import org.hyperic.hq.events.server.session.RecoveryConditionEvaluator; import org.hyperic.util.StringUtil; /** @@ -94,6 +95,11 @@ val.evaluatorCount++; if (alertConditionEvaluator.getState() != null) { val.evaluatorStateCount++; + } else if (alertConditionEvaluator instanceof RecoveryConditionEvaluator){ + RecoveryConditionEvaluator rce = (RecoveryConditionEvaluator) alertConditionEvaluator; + if (rce.getLastAlertFired() != null) { + val.evaluatorStateCount++; + } } if (alertConditionEvaluator.getExecutionStrategy().getState() != null) { val.strategyStateCount++; @@ -168,8 +174,14 @@ if (alertConditionEvaluator != null) { evaluatorClassName = alertConditionEvaluator.getClass().getName(); - alertConditionEvaluatorState = alertConditionEvaluator.getState(); executionStrategyState = alertConditionEvaluator.getExecutionStrategy().getState(); + + if (alertConditionEvaluator instanceof RecoveryConditionEvaluator) { + RecoveryConditionEvaluator rce = (RecoveryConditionEvaluator) alertConditionEvaluator; + alertConditionEvaluatorState = rce.getLastAlertFired(); + } else { + alertConditionEvaluatorState = alertConditionEvaluator.getState(); + } } res.append("<tr><td>" + id + "</td>"); |
|
From: <bo...@hy...> - 2009-10-16 08:48:20
|
Author: bob Date: 2009-10-16 01:48:03 -0700 (Fri, 16 Oct 2009) New Revision: 13868 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13868 Modified: trunk/etc/version.properties Log: Release 4.2.0 build #1245 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2009-10-16 00:25:28 UTC (rev 13867) +++ trunk/etc/version.properties 2009-10-16 08:48:03 UTC (rev 13868) @@ -1,3 +1,3 @@ -#Thu Oct 15 01:13:12 PDT 2009 +#Fri Oct 16 01:12:41 PDT 2009 version=4.2.0 -build=1244 +build=1245 |
|
From: <dcr...@hy...> - 2009-10-16 00:52:42
|
Author: dcrutchf Date: 2009-10-15 17:21:46 -0700 (Thu, 15 Oct 2009) New Revision: 13866 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13866 Modified: branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/MetricMetadata.jsp branches/HQ_4_1_2_1/web/resource/group/inventory/ListResources.jsp branches/HQ_4_1_2_1/web/resource/platform/autodiscovery/ListSchedule.jsp branches/HQ_4_1_2_1/web/resource/platform/inventory/PlatformServersView.jsp Log: Fix for HQ-1891 Modified: branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/MetricMetadata.jsp =================================================================== --- branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/MetricMetadata.jsp 2009-10-16 00:19:52 UTC (rev 13865) +++ branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/MetricMetadata.jsp 2009-10-16 00:21:46 UTC (rev 13866) @@ -210,7 +210,7 @@ <tr> <td> <display:table items="${MetricSummaries}" var="summary" width="100%" cellspacing="0" cellpadding="0"> -<display:column width="15%" value="${summary.resource.name}" +<display:column width="15%" property="resource.name" title="${resourceTypeTitle}" isLocalizedTitle="false" styleClass="ListCell"/> <display:column width="6%" property="minExpectedValue" title="resource.common.monitor.visibility.metricmetadata.expectedrange.low" styleClass="ListCell"> <display:metricdecorator unit="${summary.measurementTemplate.units}" defaultKey="common.value.notavail"/> Modified: branches/HQ_4_1_2_1/web/resource/group/inventory/ListResources.jsp =================================================================== --- branches/HQ_4_1_2_1/web/resource/group/inventory/ListResources.jsp 2009-10-16 00:19:52 UTC (rev 13865) +++ branches/HQ_4_1_2_1/web/resource/group/inventory/ListResources.jsp 2009-10-16 00:21:46 UTC (rev 13866) @@ -107,7 +107,7 @@ <display:column width="18%" property="name" sort="true" sortAttr="5" defaultSort="true" title="common.header.Name" href="/resource/${resourceItem.entityId.typeName}/Inventory.do?mode=view&rid=${resourceItem.id}&type=${resourceItem.entityId.type}"/> - <display:column width="18%" value="${resourceItem.appdefResourceTypeValue.name}" title="resource.group.inventory.TypeTH" /> + <display:column width="18%" property="appdefResourceTypeValue.name" title="resource.group.inventory.TypeTH" /> <display:column width="44%" property="description" title="common.header.Description" /> <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="10%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle"> <display:availabilitydecorator resource="${resourceItem}"/> Modified: branches/HQ_4_1_2_1/web/resource/platform/autodiscovery/ListSchedule.jsp =================================================================== --- branches/HQ_4_1_2_1/web/resource/platform/autodiscovery/ListSchedule.jsp 2009-10-16 00:19:52 UTC (rev 13865) +++ branches/HQ_4_1_2_1/web/resource/platform/autodiscovery/ListSchedule.jsp 2009-10-16 00:21:46 UTC (rev 13866) @@ -102,7 +102,7 @@ nowrap="true" sort="true" sortAttr="15" defaultSort="true"> <display:datedecorator/> </display:column> - <display:column width="30%" value="${aiSchedule.scheduleValue.scheduleString}" + <display:column width="30%" property="scheduleValue.scheduleString" title="resource.autodiscovery.autoDiscoverySchedule.DateScheduledTH"/> <display:column width="33%" property="scanDesc" title="common.header.Description"/> Modified: branches/HQ_4_1_2_1/web/resource/platform/inventory/PlatformServersView.jsp =================================================================== --- branches/HQ_4_1_2_1/web/resource/platform/inventory/PlatformServersView.jsp 2009-10-16 00:19:52 UTC (rev 13865) +++ branches/HQ_4_1_2_1/web/resource/platform/inventory/PlatformServersView.jsp 2009-10-16 00:21:46 UTC (rev 13866) @@ -103,7 +103,7 @@ <display:checkboxdecorator name="r" onclick="ToggleSelection(this, serversWidgetProperties)" styleClass="listMember"/> </display:column> <display:column property="name" title="resource.platform.inventory.servers.ServerTH" href="/resource/server/Inventory.do?mode=view&rid=${server.id}&type=${server.entityId.type}" sort="true" sortAttr="5" defaultSort="true" width="20%"/> - <display:column value="${server.serverType.name}" title="resource.platform.inventory.servers.TypeTH" width="20%"/> + <display:column property="serverType.name" title="resource.platform.inventory.servers.TypeTH" width="20%"/> <display:column property="installPath" title="resource.platform.inventory.servers.InstallPathTH" width="20%"/> <display:column property="description" title="common.header.Description" width="20%"/> <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="20%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle"> |
|
From: <dcr...@hy...> - 2009-10-16 00:52:39
|
Author: dcrutchf Date: 2009-10-15 17:25:28 -0700 (Thu, 15 Oct 2009) New Revision: 13867 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13867 Modified: branches/HQ_4_1_4_1/web/resource/common/monitor/visibility/MetricMetadata.jsp branches/HQ_4_1_4_1/web/resource/group/inventory/ListResources.jsp branches/HQ_4_1_4_1/web/resource/platform/autodiscovery/ListSchedule.jsp branches/HQ_4_1_4_1/web/resource/platform/inventory/PlatformServersView.jsp Log: Fix for HQ-1891 Modified: branches/HQ_4_1_4_1/web/resource/common/monitor/visibility/MetricMetadata.jsp =================================================================== --- branches/HQ_4_1_4_1/web/resource/common/monitor/visibility/MetricMetadata.jsp 2009-10-16 00:21:46 UTC (rev 13866) +++ branches/HQ_4_1_4_1/web/resource/common/monitor/visibility/MetricMetadata.jsp 2009-10-16 00:25:28 UTC (rev 13867) @@ -210,7 +210,7 @@ <tr> <td> <display:table items="${MetricSummaries}" var="summary" width="100%" cellspacing="0" cellpadding="0"> -<display:column width="15%" value="${summary.resource.name}" +<display:column width="15%" property="resource.name" title="${resourceTypeTitle}" isLocalizedTitle="false" styleClass="ListCell"/> <display:column width="6%" property="minExpectedValue" title="resource.common.monitor.visibility.metricmetadata.expectedrange.low" styleClass="ListCell"> <display:metricdecorator unit="${summary.measurementTemplate.units}" defaultKey="common.value.notavail"/> Modified: branches/HQ_4_1_4_1/web/resource/group/inventory/ListResources.jsp =================================================================== --- branches/HQ_4_1_4_1/web/resource/group/inventory/ListResources.jsp 2009-10-16 00:21:46 UTC (rev 13866) +++ branches/HQ_4_1_4_1/web/resource/group/inventory/ListResources.jsp 2009-10-16 00:25:28 UTC (rev 13867) @@ -107,7 +107,7 @@ <display:column width="18%" property="name" sort="true" sortAttr="5" defaultSort="true" title="common.header.Name" href="/resource/${resourceItem.entityId.typeName}/Inventory.do?mode=view&rid=${resourceItem.id}&type=${resourceItem.entityId.type}"/> - <display:column width="18%" value="${resourceItem.appdefResourceTypeValue.name}" title="resource.group.inventory.TypeTH" /> + <display:column width="18%" property="appdefResourceTypeValue.name" title="resource.group.inventory.TypeTH" /> <display:column width="44%" property="description" title="common.header.Description" /> <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="10%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle"> <display:availabilitydecorator resource="${resourceItem}"/> Modified: branches/HQ_4_1_4_1/web/resource/platform/autodiscovery/ListSchedule.jsp =================================================================== --- branches/HQ_4_1_4_1/web/resource/platform/autodiscovery/ListSchedule.jsp 2009-10-16 00:21:46 UTC (rev 13866) +++ branches/HQ_4_1_4_1/web/resource/platform/autodiscovery/ListSchedule.jsp 2009-10-16 00:25:28 UTC (rev 13867) @@ -102,7 +102,7 @@ nowrap="true" sort="true" sortAttr="15" defaultSort="true"> <display:datedecorator/> </display:column> - <display:column width="30%" value="${aiSchedule.scheduleValue.scheduleString}" + <display:column width="30%" property="scheduleValue.scheduleString" title="resource.autodiscovery.autoDiscoverySchedule.DateScheduledTH"/> <display:column width="33%" property="scanDesc" title="common.header.Description"/> Modified: branches/HQ_4_1_4_1/web/resource/platform/inventory/PlatformServersView.jsp =================================================================== --- branches/HQ_4_1_4_1/web/resource/platform/inventory/PlatformServersView.jsp 2009-10-16 00:21:46 UTC (rev 13866) +++ branches/HQ_4_1_4_1/web/resource/platform/inventory/PlatformServersView.jsp 2009-10-16 00:25:28 UTC (rev 13867) @@ -103,7 +103,7 @@ <display:checkboxdecorator name="r" onclick="ToggleSelection(this, serversWidgetProperties)" styleClass="listMember"/> </display:column> <display:column property="name" title="resource.platform.inventory.servers.ServerTH" href="/resource/server/Inventory.do?mode=view&rid=${server.id}&type=${server.entityId.type}" sort="true" sortAttr="5" defaultSort="true" width="20%"/> - <display:column value="${server.serverType.name}" title="resource.platform.inventory.servers.TypeTH" width="20%"/> + <display:column property="serverType.name" title="resource.platform.inventory.servers.TypeTH" width="20%"/> <display:column property="installPath" title="resource.platform.inventory.servers.InstallPathTH" width="20%"/> <display:column property="description" title="common.header.Description" width="20%"/> <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="20%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle"> |
|
From: <dcr...@hy...> - 2009-10-16 00:52:39
|
Author: dcrutchf Date: 2009-10-15 17:19:52 -0700 (Thu, 15 Oct 2009) New Revision: 13865 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13865 Modified: branches/HQ_4_0_3_1/web/resource/common/monitor/visibility/MetricMetadata.jsp branches/HQ_4_0_3_1/web/resource/platform/autodiscovery/ListSchedule.jsp branches/HQ_4_0_3_1/web/resource/platform/inventory/PlatformServersView.jsp Log: Fix for HQ-1891 Modified: branches/HQ_4_0_3_1/web/resource/common/monitor/visibility/MetricMetadata.jsp =================================================================== --- branches/HQ_4_0_3_1/web/resource/common/monitor/visibility/MetricMetadata.jsp 2009-10-16 00:15:12 UTC (rev 13864) +++ branches/HQ_4_0_3_1/web/resource/common/monitor/visibility/MetricMetadata.jsp 2009-10-16 00:19:52 UTC (rev 13865) @@ -210,7 +210,7 @@ <tr> <td> <display:table items="${MetricSummaries}" var="summary" width="100%" cellspacing="0" cellpadding="0"> -<display:column width="15%" value="${summary.resource.name}" +<display:column width="15%" property="resource.name" title="${resourceTypeTitle}" isLocalizedTitle="false" styleClass="ListCell"/> <display:column width="6%" property="minExpectedValue" title="resource.common.monitor.visibility.metricmetadata.expectedrange.low" styleClass="ListCell"> <display:metricdecorator unit="${summary.measurementTemplate.units}" defaultKey="common.value.notavail"/> Modified: branches/HQ_4_0_3_1/web/resource/platform/autodiscovery/ListSchedule.jsp =================================================================== --- branches/HQ_4_0_3_1/web/resource/platform/autodiscovery/ListSchedule.jsp 2009-10-16 00:15:12 UTC (rev 13864) +++ branches/HQ_4_0_3_1/web/resource/platform/autodiscovery/ListSchedule.jsp 2009-10-16 00:19:52 UTC (rev 13865) @@ -102,7 +102,7 @@ nowrap="true" sort="true" sortAttr="15" defaultSort="true"> <display:datedecorator/> </display:column> - <display:column width="30%" value="${aiSchedule.scheduleValue.scheduleString}" + <display:column width="30%" property="scheduleValue.scheduleString" title="resource.autodiscovery.autoDiscoverySchedule.DateScheduledTH"/> <display:column width="33%" property="scanDesc" title="common.header.Description"/> Modified: branches/HQ_4_0_3_1/web/resource/platform/inventory/PlatformServersView.jsp =================================================================== --- branches/HQ_4_0_3_1/web/resource/platform/inventory/PlatformServersView.jsp 2009-10-16 00:15:12 UTC (rev 13864) +++ branches/HQ_4_0_3_1/web/resource/platform/inventory/PlatformServersView.jsp 2009-10-16 00:19:52 UTC (rev 13865) @@ -103,7 +103,7 @@ <display:checkboxdecorator name="r" onclick="ToggleSelection(this, serversWidgetProperties)" styleClass="listMember"/> </display:column> <display:column property="name" title="resource.platform.inventory.servers.ServerTH" href="/resource/server/Inventory.do?mode=view&rid=${server.id}&type=${server.entityId.type}" sort="true" sortAttr="5" defaultSort="true" width="20%"/> - <display:column value="${server.serverType.name}" title="resource.platform.inventory.servers.TypeTH" width="20%"/> + <display:column property="serverType.name" title="resource.platform.inventory.servers.TypeTH" width="20%"/> <display:column property="installPath" title="resource.platform.inventory.servers.InstallPathTH" width="20%"/> <display:column property="description" title="common.header.Description" width="20%"/> <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="20%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle"> |
|
From: <dcr...@hy...> - 2009-10-16 00:36:03
|
Author: dcrutchf Date: 2009-10-15 17:15:12 -0700 (Thu, 15 Oct 2009) New Revision: 13864 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13864 Modified: trunk/web/resource/common/monitor/visibility/MetricMetadata.jsp trunk/web/resource/group/inventory/ListResources.jsp trunk/web/resource/platform/autodiscovery/ListSchedule.jsp trunk/web/resource/platform/inventory/PlatformServersView.jsp Log: Fix for HQ-1891 Modified: trunk/web/resource/common/monitor/visibility/MetricMetadata.jsp =================================================================== --- trunk/web/resource/common/monitor/visibility/MetricMetadata.jsp 2009-10-16 00:03:01 UTC (rev 13863) +++ trunk/web/resource/common/monitor/visibility/MetricMetadata.jsp 2009-10-16 00:15:12 UTC (rev 13864) @@ -210,7 +210,7 @@ <tr> <td> <display:table items="${MetricSummaries}" var="summary" width="100%" cellspacing="0" cellpadding="0"> -<display:column width="15%" value="${summary.resource.name}" +<display:column width="15%" property="resource.name" title="${resourceTypeTitle}" isLocalizedTitle="false" styleClass="ListCell"/> <display:column width="6%" property="minExpectedValue" title="resource.common.monitor.visibility.metricmetadata.expectedrange.low" styleClass="ListCell"> <display:metricdecorator unit="${summary.measurementTemplate.units}" defaultKey="common.value.notavail"/> Modified: trunk/web/resource/group/inventory/ListResources.jsp =================================================================== --- trunk/web/resource/group/inventory/ListResources.jsp 2009-10-16 00:03:01 UTC (rev 13863) +++ trunk/web/resource/group/inventory/ListResources.jsp 2009-10-16 00:15:12 UTC (rev 13864) @@ -107,7 +107,7 @@ <display:column width="18%" property="name" sort="true" sortAttr="5" defaultSort="true" title="common.header.Name" href="/resource/${resourceItem.entityId.typeName}/Inventory.do?mode=view&rid=${resourceItem.id}&type=${resourceItem.entityId.type}"/> - <display:column width="18%" value="${resourceItem.appdefResourceTypeValue.name}" title="resource.group.inventory.TypeTH" /> + <display:column width="18%" property="appdefResourceTypeValue.name" title="resource.group.inventory.TypeTH" /> <display:column width="44%" property="description" title="common.header.Description" /> <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="10%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle"> <display:availabilitydecorator resource="${resourceItem}"/> Modified: trunk/web/resource/platform/autodiscovery/ListSchedule.jsp =================================================================== --- trunk/web/resource/platform/autodiscovery/ListSchedule.jsp 2009-10-16 00:03:01 UTC (rev 13863) +++ trunk/web/resource/platform/autodiscovery/ListSchedule.jsp 2009-10-16 00:15:12 UTC (rev 13864) @@ -102,7 +102,7 @@ nowrap="true" sort="true" sortAttr="15" defaultSort="true"> <display:datedecorator/> </display:column> - <display:column width="30%" value="${aiSchedule.scheduleValue.scheduleString}" + <display:column width="30%" property="scheduleValue.scheduleString" title="resource.autodiscovery.autoDiscoverySchedule.DateScheduledTH"/> <display:column width="33%" property="scanDesc" title="common.header.Description"/> Modified: trunk/web/resource/platform/inventory/PlatformServersView.jsp =================================================================== --- trunk/web/resource/platform/inventory/PlatformServersView.jsp 2009-10-16 00:03:01 UTC (rev 13863) +++ trunk/web/resource/platform/inventory/PlatformServersView.jsp 2009-10-16 00:15:12 UTC (rev 13864) @@ -103,7 +103,7 @@ <display:checkboxdecorator name="r" onclick="ToggleSelection(this, serversWidgetProperties)" styleClass="listMember"/> </display:column> <display:column property="name" title="resource.platform.inventory.servers.ServerTH" href="/resource/server/Inventory.do?mode=view&rid=${server.id}&type=${server.entityId.type}" sort="true" sortAttr="5" defaultSort="true" width="20%"/> - <display:column value="${server.serverType.name}" title="resource.platform.inventory.servers.TypeTH" width="20%"/> + <display:column property="serverType.name" title="resource.platform.inventory.servers.TypeTH" width="20%"/> <display:column property="installPath" title="resource.platform.inventory.servers.InstallPathTH" width="20%"/> <display:column property="description" title="common.header.Description" width="20%"/> <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="20%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle"> |
|
From: <dcr...@hy...> - 2009-10-16 00:03:13
|
Author: dcrutchf Date: 2009-10-15 17:03:01 -0700 (Thu, 15 Oct 2009) New Revision: 13863 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13863 Modified: trunk/src/org/hyperic/hq/ui/action/portlet/metricviewer/ModifyAction.java Log: Fix for HHQ-3409 Modified: trunk/src/org/hyperic/hq/ui/action/portlet/metricviewer/ModifyAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/portlet/metricviewer/ModifyAction.java 2009-10-15 08:46:45 UTC (rev 13862) +++ trunk/src/org/hyperic/hq/ui/action/portlet/metricviewer/ModifyAction.java 2009-10-16 00:03:01 UTC (rev 13863) @@ -58,29 +58,9 @@ PropertiesForm pForm = (PropertiesForm) form; HttpSession session = request.getSession(); WebUser user = RequestUtils.getWebUser(request); - String forwardStr = Constants.SUCCESS_URL; - DashboardConfig dashConfig = DashboardUtils.findDashboard( - (Integer)session.getAttribute(Constants.SELECTED_DASHBOARD_ID), - user, boss); + DashboardConfig dashConfig = DashboardUtils.findDashboard((Integer)session.getAttribute(Constants.SELECTED_DASHBOARD_ID), user, boss); ConfigResponse dashPrefs = dashConfig.getConfig(); - - if(pForm.isRemoveClicked()){ - DashboardUtils - .removeResources(pForm.getIds(), - PropertiesForm.RESOURCES, - dashPrefs); - ConfigurationProxy.getInstance().setDashboardPreferences(session, user, - boss, dashPrefs); - forwardStr = "review"; - } - - ActionForward forward = checkSubmit(request, mapping, form); - - if (forward != null) { - return forward; - } - String token = pForm.getToken(); // For multi-portlet configuration @@ -99,7 +79,20 @@ descendingKey += token; titleKey += token; } + + if(pForm.isRemoveClicked()){ + DashboardUtils.removeResources(pForm.getIds(), resKey, dashPrefs); + ConfigurationProxy.getInstance().setDashboardPreferences(session, user, boss, dashPrefs); + + forwardStr = "review"; + } + ActionForward forward = checkSubmit(request, mapping, form); + + if (forward != null) { + return forward; + } + Integer numberToShow = pForm.getNumberToShow(); String resourceType = pForm.getResourceType(); String metric = pForm.getMetric(); |
|
From: <bo...@hy...> - 2009-10-15 08:46:54
|
Author: bob Date: 2009-10-15 01:46:45 -0700 (Thu, 15 Oct 2009) New Revision: 13862 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13862 Modified: trunk/etc/version.properties Log: Release 4.2.0 build #1244 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2009-10-14 21:25:53 UTC (rev 13861) +++ trunk/etc/version.properties 2009-10-15 08:46:45 UTC (rev 13862) @@ -1,3 +1,3 @@ -#Wed Oct 14 01:12:43 PDT 2009 +#Thu Oct 15 01:13:12 PDT 2009 version=4.2.0 -build=1243 +build=1244 |
|
From: <no...@gi...> - 2009-10-15 01:29:09
|
Branch: refs/heads/springy Home: http://github.com/hyperic/hqapi Commit: b50f10ae085d4e035e6de10fc46505454415bd6f http://github.com/hyperic/hqapi/commit/b50f10ae085d4e035e6de10fc46505454415bd6f Author: jencompgeek <jen...@sp...> Date: 2009-10-07 (Wed, 07 Oct 2009) Changed paths: M build.xml Log Message: ----------- Changed test halt on failure to no Commit: 45feb099475a7115c83bd8e23e2f42a0f2e73878 http://github.com/hyperic/hqapi/commit/45feb099475a7115c83bd8e23e2f42a0f2e73878 Author: Jennifer Hickey <jen...@sp...> Date: 2009-10-12 (Mon, 12 Oct 2009) Changed paths: M hqu/hqapi1/app/ResourceController.groovy M src/org/hyperic/hq/hqapi1/EventApi.java Log Message: ----------- Merge branch 'master' of github.com:hyperic/hqapi Commit: d96ff92968f26d16ea4b3d00e631d3d4c9b518bf http://github.com/hyperic/hqapi/commit/d96ff92968f26d16ea4b3d00e631d3d4c9b518bf Author: Jennifer Hickey <jen...@sp...> Date: 2009-10-14 (Wed, 14 Oct 2009) Changed paths: A .classpath A .project A .settings/org.springframework.ide.eclipse.beans.core.prefs A .settings/org.springframework.ide.eclipse.core.prefs A .springBeans A lib/org.springframework.aop-3.0.0.M4.jar A lib/org.springframework.asm-3.0.0.M4.jar A lib/org.springframework.beans-3.0.0.M4.jar A lib/org.springframework.context-3.0.0.M4.jar A lib/org.springframework.context.support-3.0.0.M4.jar A lib/org.springframework.core-3.0.0.M4.jar A lib/org.springframework.expression-3.0.0.M4.jar A resources/META-INF/spring/hqapi-context.xml A src/org/hyperic/hq/hqapi1/Connection.java A src/org/hyperic/hq/hqapi1/FileResponseHandler.java M src/org/hyperic/hq/hqapi1/HQApi.java M src/org/hyperic/hq/hqapi1/HQConnection.java A src/org/hyperic/hq/hqapi1/ResponseHandler.java A src/org/hyperic/hq/hqapi1/XmlResponseHandler.java A src/org/hyperic/hq/hqapi1/tools/AbstractCommand.java M src/org/hyperic/hq/hqapi1/tools/AgentCommand.java M src/org/hyperic/hq/hqapi1/tools/AlertCommand.java M src/org/hyperic/hq/hqapi1/tools/AlertDefinitionCommand.java M src/org/hyperic/hq/hqapi1/tools/ApplicationCommand.java M src/org/hyperic/hq/hqapi1/tools/AutoDiscoveryCommand.java M src/org/hyperic/hq/hqapi1/tools/Command.java A src/org/hyperic/hq/hqapi1/tools/CommandsFactory.java M src/org/hyperic/hq/hqapi1/tools/ControlCommand.java M src/org/hyperic/hq/hqapi1/tools/EscalationCommand.java M src/org/hyperic/hq/hqapi1/tools/EventCommand.java M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java M src/org/hyperic/hq/hqapi1/tools/MaintenanceCommand.java M src/org/hyperic/hq/hqapi1/tools/MetricCommand.java M src/org/hyperic/hq/hqapi1/tools/MetricDataCommand.java M src/org/hyperic/hq/hqapi1/tools/MetricTemplateCommand.java A src/org/hyperic/hq/hqapi1/tools/OptionParserFactory.java M src/org/hyperic/hq/hqapi1/tools/ResourceCommand.java M src/org/hyperic/hq/hqapi1/tools/ResourceEdgeCommand.java M src/org/hyperic/hq/hqapi1/tools/RoleCommand.java M src/org/hyperic/hq/hqapi1/tools/ServerConfigCommand.java M src/org/hyperic/hq/hqapi1/tools/Shell.java M src/org/hyperic/hq/hqapi1/tools/UserCommand.java Log Message: ----------- Added Spring app context and classpath extension capabilities Commit: dba77b162eeb04faf737a3a0e8f1f13d50a95e2c http://github.com/hyperic/hqapi/commit/dba77b162eeb04faf737a3a0e8f1f13d50a95e2c Author: Jennifer Hickey <jen...@sp...> Date: 2009-10-14 (Wed, 14 Oct 2009) Changed paths: A .classpath A .project A .settings/org.springframework.ide.eclipse.beans.core.prefs A .settings/org.springframework.ide.eclipse.core.prefs A .springBeans M build.xml A lib/org.springframework.aop-3.0.0.M4.jar A lib/org.springframework.asm-3.0.0.M4.jar A lib/org.springframework.beans-3.0.0.M4.jar A lib/org.springframework.context-3.0.0.M4.jar A lib/org.springframework.context.support-3.0.0.M4.jar A lib/org.springframework.core-3.0.0.M4.jar A lib/org.springframework.expression-3.0.0.M4.jar A resources/META-INF/spring/hqapi-context.xml A src/org/hyperic/hq/hqapi1/Connection.java A src/org/hyperic/hq/hqapi1/FileResponseHandler.java M src/org/hyperic/hq/hqapi1/HQApi.java M src/org/hyperic/hq/hqapi1/HQConnection.java A src/org/hyperic/hq/hqapi1/ResponseHandler.java A src/org/hyperic/hq/hqapi1/XmlResponseHandler.java A src/org/hyperic/hq/hqapi1/tools/AbstractCommand.java M src/org/hyperic/hq/hqapi1/tools/AgentCommand.java M src/org/hyperic/hq/hqapi1/tools/AlertCommand.java M src/org/hyperic/hq/hqapi1/tools/AlertDefinitionCommand.java M src/org/hyperic/hq/hqapi1/tools/ApplicationCommand.java M src/org/hyperic/hq/hqapi1/tools/AutoDiscoveryCommand.java M src/org/hyperic/hq/hqapi1/tools/Command.java A src/org/hyperic/hq/hqapi1/tools/CommandsFactory.java M src/org/hyperic/hq/hqapi1/tools/ControlCommand.java M src/org/hyperic/hq/hqapi1/tools/EscalationCommand.java M src/org/hyperic/hq/hqapi1/tools/EventCommand.java M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java M src/org/hyperic/hq/hqapi1/tools/MaintenanceCommand.java M src/org/hyperic/hq/hqapi1/tools/MetricCommand.java M src/org/hyperic/hq/hqapi1/tools/MetricDataCommand.java M src/org/hyperic/hq/hqapi1/tools/MetricTemplateCommand.java A src/org/hyperic/hq/hqapi1/tools/OptionParserFactory.java M src/org/hyperic/hq/hqapi1/tools/ResourceCommand.java M src/org/hyperic/hq/hqapi1/tools/ResourceEdgeCommand.java M src/org/hyperic/hq/hqapi1/tools/RoleCommand.java M src/org/hyperic/hq/hqapi1/tools/ServerConfigCommand.java M src/org/hyperic/hq/hqapi1/tools/Shell.java M src/org/hyperic/hq/hqapi1/tools/UserCommand.java Log Message: ----------- Merge branch 'extension' into springy |
|
From: <no...@gi...> - 2009-10-15 01:16:22
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: 44ecef1d2e183e6dd36474809161a57a05c4c5aa http://github.com/hyperic/hqapi/commit/44ecef1d2e183e6dd36474809161a57a05c4c5aa Author: Jennifer Hickey <jen...@sp...> Date: 2009-10-14 (Wed, 14 Oct 2009) Changed paths: M src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncControlAction_test.java A src/org/hyperic/hq/hqapi1/test/SpinBarrier.java A src/org/hyperic/hq/hqapi1/test/SpinBarrierCondition.java Log Message: ----------- Added SpinBarrier for asynchronous waiting of test conditions |
|
From: <no...@gi...> - 2009-10-14 23:28:09
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: 2e15e630d2c790baf93982e18aef2ef0fa158f88 http://github.com/hyperic/hqapi/commit/2e15e630d2c790baf93982e18aef2ef0fa158f88 Author: Jennifer Hickey <jen...@sp...> Date: 2009-10-14 (Wed, 14 Oct 2009) Changed paths: M .classpath Log Message: ----------- Modified target directory for build output in Eclipse project |
|
From: <sc...@hy...> - 2009-10-14 21:26:27
|
Author: scottmf Date: 2009-10-14 14:25:53 -0700 (Wed, 14 Oct 2009) New Revision: 13861 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13861 Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java Log: [HHQ-3475] add timings to isTriggerInterested() in DataManager / AvailabilityManager Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java 2009-10-14 08:48:59 UTC (rev 13860) +++ trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java 2009-10-14 21:25:53 UTC (rev 13861) @@ -74,6 +74,7 @@ import org.hyperic.util.pager.PageControl; import org.hyperic.util.pager.PageList; import org.hyperic.util.stats.ConcurrentStatsCollector; +import org.hyperic.util.timer.StopWatch; /** The AvailabityManagerEJBImpl class is a stateless session bean that can be * used to retrieve Availability Data RLE points @@ -1299,9 +1300,11 @@ List zevents = new ArrayList(maxCapacity); MeasurementManagerLocal measMan = MeasurementManagerEJBImpl.getOne(); - boolean allEventsInteresting = + final boolean allEventsInteresting = Boolean.getBoolean(ALL_EVENTS_INTERESTING_PROP); + final StopWatch watch = new StopWatch(); + final boolean debug = _log.isDebugEnabled(); for (Iterator i = data.iterator(); i.hasNext();) { DataPoint dp = (DataPoint) i.next(); Integer metricId = dp.getMetricId(); @@ -1309,8 +1312,11 @@ MeasurementEvent event = new MeasurementEvent(metricId, val); - if (RegisteredTriggers.isTriggerInterested(event) - || allEventsInteresting) { + if (debug) watch.markTimeBegin("isTriggerInterested"); + boolean isEventInteresting = + allEventsInteresting || RegisteredTriggers.isTriggerInterested(event); + if (debug) watch.markTimeEnd("isTriggerInterested"); + if (isEventInteresting) { measMan.buildMeasurementEvent(event); if (event.getValue().getValue() == AVAIL_DOWN) { Resource r = getResource(event.getResource()); Modified: trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java 2009-10-14 08:48:59 UTC (rev 13860) +++ trunk/src/org/hyperic/hq/measurement/server/session/DataManagerEJBImpl.java 2009-10-14 21:25:53 UTC (rev 13861) @@ -503,23 +503,29 @@ List zevents = new ArrayList(); MeasurementManagerLocal measMan = MeasurementManagerEJBImpl.getOne(); - boolean allEventsInteresting = + final boolean allEventsInteresting = Boolean.getBoolean(ALL_EVENTS_INTERESTING_PROP); + final StopWatch watch = new StopWatch(); + final boolean debug = _log.isDebugEnabled(); for (Iterator i = data.iterator(); i.hasNext();) { DataPoint dp = (DataPoint) i.next(); Integer metricId = dp.getMetricId(); MetricValue val = dp.getMetricValue(); MeasurementEvent event = new MeasurementEvent(metricId, val); - if (RegisteredTriggers.isTriggerInterested(event) - || allEventsInteresting) { + if (debug) watch.markTimeBegin("isTriggerInterested"); + boolean isEventInteresting = + allEventsInteresting || RegisteredTriggers.isTriggerInterested(event); + if (debug) watch.markTimeEnd("isTriggerInterested"); + if (isEventInteresting) { measMan.buildMeasurementEvent(event); events.add(event); } zevents.add(new MeasurementZevent(metricId.intValue(), val)); } + if (debug) _log.debug(watch); if (!events.isEmpty()) { Messenger sender = new Messenger(); |
|
From: <bo...@hy...> - 2009-10-14 08:49:11
|
Author: bob Date: 2009-10-14 01:48:59 -0700 (Wed, 14 Oct 2009) New Revision: 13860 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13860 Modified: trunk/etc/version.properties Log: Release 4.2.0 build #1243 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2009-10-14 00:12:06 UTC (rev 13859) +++ trunk/etc/version.properties 2009-10-14 08:48:59 UTC (rev 13860) @@ -1,3 +1,3 @@ -#Tue Oct 13 01:11:14 PDT 2009 +#Wed Oct 14 01:12:43 PDT 2009 version=4.2.0 -build=1242 +build=1243 |
|
From: <no...@gi...> - 2009-10-14 06:19:36
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: ce566aa1ca6a4e5e1958aecdcee7ceaa3ef95d16 http://github.com/hyperic/hqapi/commit/ce566aa1ca6a4e5e1958aecdcee7ceaa3ef95d16 Author: pnguyen <pnguyen@192.168.1.66> Date: 2009-10-13 (Tue, 13 Oct 2009) Changed paths: M src/org/hyperic/hq/hqapi1/test/ResourceGet_test.java Log Message: ----------- Call getLocalPlatformResource() to ensure a network device is not retrieved |
|
From: <no...@gi...> - 2009-10-14 04:31:37
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: 001eb31981c9a5cae9324194a4582870af41178b http://github.com/hyperic/hqapi/commit/001eb31981c9a5cae9324194a4582870af41178b Author: pnguyen <pnguyen@192.168.1.66> Date: 2009-10-13 (Tue, 13 Oct 2009) Changed paths: M src/org/hyperic/hq/hqapi1/test/HQApiTestBase.java M src/org/hyperic/hq/hqapi1/test/MetricDataAddData_test.java M src/org/hyperic/hq/hqapi1/test/ResourceCreateService_test.java M src/org/hyperic/hq/hqapi1/test/ResourceTestBase.java Log Message: ----------- Exclude network devices when getting the local platform for testing |
|
From: <kp...@hy...> - 2009-10-14 00:49:28
|
Author: kparikh Date: 2009-10-13 17:12:06 -0700 (Tue, 13 Oct 2009) New Revision: 13859 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13859 Added: tags/HQ_4_2_0_BETA3/ Log: 4.2.0 Beta 3 Copied: tags/HQ_4_2_0_BETA3 (from rev 13853, trunk) |
|
From: <dcr...@hy...> - 2009-10-13 23:49:11
|
Author: dcrutchf Date: 2009-10-13 16:49:00 -0700 (Tue, 13 Oct 2009) New Revision: 13858 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13858 Modified: branches/HQ_4_0_3_1/ui_plugins/eventcenter/views/event/index.gsp branches/HQ_4_0_3_1/web/resource/common/monitor/visibility/CompareMetrics.jsp Log: Fix for HQ-1889 & HQ-1890 Modified: branches/HQ_4_0_3_1/ui_plugins/eventcenter/views/event/index.gsp =================================================================== --- branches/HQ_4_0_3_1/ui_plugins/eventcenter/views/event/index.gsp 2009-10-13 23:44:44 UTC (rev 13857) +++ branches/HQ_4_0_3_1/ui_plugins/eventcenter/views/event/index.gsp 2009-10-13 23:49:00 UTC (rev 13858) @@ -1,3 +1,6 @@ +<% +import org.apache.commons.lang.StringEscapeUtils +%> <%= dojoInclude(["dojo.event.*", "dojo.collections.Store", "dojo.widget.ContentPane", @@ -32,7 +35,7 @@ style="height:200px; width:185px; border:5px solid #ededed;" onchange="EventLogs_refreshTable();"> <% for (g in allGroups) { %> - <option value="${g.id}">${g.name}</option> + <option value="${g.id}">${StringEscapeUtils.escapeHtml(g.name)}</option> <% } %> </select> <% Modified: branches/HQ_4_0_3_1/web/resource/common/monitor/visibility/CompareMetrics.jsp =================================================================== --- branches/HQ_4_0_3_1/web/resource/common/monitor/visibility/CompareMetrics.jsp 2009-10-13 23:44:44 UTC (rev 13857) +++ branches/HQ_4_0_3_1/web/resource/common/monitor/visibility/CompareMetrics.jsp 2009-10-13 23:49:00 UTC (rev 13858) @@ -101,9 +101,13 @@ </tiles:insert> <html:form action="/resource/common/monitor/visibility/CompareMetrics"> -<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message -key="resource.common.monitor.visibility.CompareMetricsReturnLink"> -<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link> +<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"> + <fmt:message key="resource.common.monitor.visibility.CompareMetricsReturnLink"> + <fmt:param> + <c:out value="${CompareMetricsForm.name}"/> + </fmt:param> + </fmt:message> +</html:link> <div id="listDiv" style="padding-top: 24px; padding-bottom: 24px;"> <tiles:insert definition=".header.tab"> <tiles:put name="tabKey" value="resource.common.monitor.visibility.CompareMetricsTab"/> @@ -226,9 +230,13 @@ </tiles:insert> </div> -<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message -key="resource.common.monitor.visibility.CompareMetricsReturnLink"> -<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link> +<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"> + <fmt:message key="resource.common.monitor.visibility.CompareMetricsReturnLink"> + <fmt:param> + <c:out value="${CompareMetricsForm.name}"/> + </fmt:param> + </fmt:message> +</html:link> <html:hidden property="rid"/> <html:hidden property="type"/> |
|
From: <dcr...@hy...> - 2009-10-13 23:44:57
|
Author: dcrutchf Date: 2009-10-13 16:44:44 -0700 (Tue, 13 Oct 2009) New Revision: 13857 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13857 Modified: branches/HQ_4_1_2_1/ui_plugins/eventcenter/views/event/index.gsp branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/CompareMetrics.jsp Log: Fix for HQ-1889 & HQ-1890 Modified: branches/HQ_4_1_2_1/ui_plugins/eventcenter/views/event/index.gsp =================================================================== --- branches/HQ_4_1_2_1/ui_plugins/eventcenter/views/event/index.gsp 2009-10-13 23:40:29 UTC (rev 13856) +++ branches/HQ_4_1_2_1/ui_plugins/eventcenter/views/event/index.gsp 2009-10-13 23:44:44 UTC (rev 13857) @@ -1,3 +1,6 @@ +<% +import org.apache.commons.lang.StringEscapeUtils +%> <%= dojoInclude(["dojo.event.*", "dojo.collections.Store", "dojo.widget.ContentPane", @@ -32,7 +35,7 @@ style="height:200px; width:180px; border:5px solid #ededed;" onchange="EventLogs_refreshTable();"> <% for (g in allGroups) { %> - <option value="${g.id}">${g.name}</option> + <option value="${g.id}">${StringEscapeUtils.escapeHtml(g.name)}</option> <% } %> </select> <% Modified: branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/CompareMetrics.jsp =================================================================== --- branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/CompareMetrics.jsp 2009-10-13 23:40:29 UTC (rev 13856) +++ branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/CompareMetrics.jsp 2009-10-13 23:44:44 UTC (rev 13857) @@ -101,9 +101,13 @@ </tiles:insert> <html:form action="/resource/common/monitor/visibility/CompareMetrics"> -<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message -key="resource.common.monitor.visibility.CompareMetricsReturnLink"> -<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link> +<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"> + <fmt:message key="resource.common.monitor.visibility.CompareMetricsReturnLink"> + <fmt:param> + <c:out value="${CompareMetricsForm.name}"/> + </fmt:param> + </fmt:message> +</html:link> <div id="listDiv" style="padding-top: 24px; padding-bottom: 24px;"> <tiles:insert definition=".header.tab"> <tiles:put name="tabKey" value="resource.common.monitor.visibility.CompareMetricsTab"/> @@ -226,9 +230,13 @@ </tiles:insert> </div> -<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message -key="resource.common.monitor.visibility.CompareMetricsReturnLink"> -<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link> +<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"> + <fmt:message key="resource.common.monitor.visibility.CompareMetricsReturnLink"> + <fmt:param> + <c:out value="${CompareMetricsForm.name}"/> + </fmt:param> + </fmt:message> +</html:link> <html:hidden property="rid"/> <html:hidden property="type"/> |
|
From: <dcr...@hy...> - 2009-10-13 23:40:49
|
Author: dcrutchf Date: 2009-10-13 16:40:29 -0700 (Tue, 13 Oct 2009) New Revision: 13856 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13856 Modified: branches/HQ_4_1_4_1/ui_plugins/eventcenter/views/event/index.gsp branches/HQ_4_1_4_1/web/resource/common/monitor/visibility/CompareMetrics.jsp Log: Fix for HQ-1889 & HQ-1890 Modified: branches/HQ_4_1_4_1/ui_plugins/eventcenter/views/event/index.gsp =================================================================== --- branches/HQ_4_1_4_1/ui_plugins/eventcenter/views/event/index.gsp 2009-10-13 23:35:33 UTC (rev 13855) +++ branches/HQ_4_1_4_1/ui_plugins/eventcenter/views/event/index.gsp 2009-10-13 23:40:29 UTC (rev 13856) @@ -1,3 +1,6 @@ +<% +import org.apache.commons.lang.StringEscapeUtils +%> <%= dojoInclude(["dojo.event.*", "dojo.collections.Store", "dojo.widget.ContentPane", @@ -32,7 +35,7 @@ style="height:200px; width:180px; border:5px solid #ededed;" onchange="EventLogs_refreshTable();"> <% for (g in allGroups) { %> - <option value="${g.id}">${g.name}</option> + <option value="${g.id}">${StringEscapeUtils.escapeHtml(g.name)}</option> <% } %> </select> <% Modified: branches/HQ_4_1_4_1/web/resource/common/monitor/visibility/CompareMetrics.jsp =================================================================== --- branches/HQ_4_1_4_1/web/resource/common/monitor/visibility/CompareMetrics.jsp 2009-10-13 23:35:33 UTC (rev 13855) +++ branches/HQ_4_1_4_1/web/resource/common/monitor/visibility/CompareMetrics.jsp 2009-10-13 23:40:29 UTC (rev 13856) @@ -101,9 +101,13 @@ </tiles:insert> <html:form action="/resource/common/monitor/visibility/CompareMetrics"> -<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message -key="resource.common.monitor.visibility.CompareMetricsReturnLink"> -<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link> +<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"> + <fmt:message key="resource.common.monitor.visibility.CompareMetricsReturnLink"> + <fmt:param> + <c:out value="${CompareMetricsForm.name}"/> + </fmt:param> + </fmt:message> +</html:link> <div id="listDiv" style="padding-top: 24px; padding-bottom: 24px;"> <tiles:insert definition=".header.tab"> <tiles:put name="tabKey" value="resource.common.monitor.visibility.CompareMetricsTab"/> @@ -226,9 +230,13 @@ </tiles:insert> </div> -<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message -key="resource.common.monitor.visibility.CompareMetricsReturnLink"> -<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link> +<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"> + <fmt:message key="resource.common.monitor.visibility.CompareMetricsReturnLink"> + <fmt:param> + <c:out value="${CompareMetricsForm.name}"/> + </fmt:param> + </fmt:message> +</html:link> <html:hidden property="rid"/> <html:hidden property="type"/> |
|
From: <dcr...@hy...> - 2009-10-13 23:35:47
|
Author: dcrutchf Date: 2009-10-13 16:35:33 -0700 (Tue, 13 Oct 2009) New Revision: 13855 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13855 Modified: trunk/web/resource/common/monitor/visibility/CompareMetrics.jsp Log: Fix for HQ-1890 Modified: trunk/web/resource/common/monitor/visibility/CompareMetrics.jsp =================================================================== --- trunk/web/resource/common/monitor/visibility/CompareMetrics.jsp 2009-10-13 23:21:42 UTC (rev 13854) +++ trunk/web/resource/common/monitor/visibility/CompareMetrics.jsp 2009-10-13 23:35:33 UTC (rev 13855) @@ -101,9 +101,13 @@ </tiles:insert> <html:form action="/resource/common/monitor/visibility/CompareMetrics"> -<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message -key="resource.common.monitor.visibility.CompareMetricsReturnLink"> -<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link> +<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"> + <fmt:message key="resource.common.monitor.visibility.CompareMetricsReturnLink"> + <fmt:param> + <c:out value="${CompareMetricsForm.name}"/> + </fmt:param> + </fmt:message> +</html:link> <div id="listDiv" style="padding-top: 24px; padding-bottom: 24px;"> <tiles:insert definition=".header.tab"> <tiles:put name="tabKey" value="resource.common.monitor.visibility.CompareMetricsTab"/> @@ -226,9 +230,13 @@ </tiles:insert> </div> -<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"><fmt:message -key="resource.common.monitor.visibility.CompareMetricsReturnLink"> -<fmt:param value="${CompareMetricsForm.name}"/></fmt:message></html:link> +<html:link href="javascript:document.CompareMetricsForm.submit()" onclick="clickLink('CompareMetricsForm', 'back')"> + <fmt:message key="resource.common.monitor.visibility.CompareMetricsReturnLink"> + <fmt:param> + <c:out value="${CompareMetricsForm.name}"/> + </fmt:param> + </fmt:message> +</html:link> <html:hidden property="rid"/> <html:hidden property="type"/> |
|
From: <dcr...@hy...> - 2009-10-13 23:21:56
|
Author: dcrutchf Date: 2009-10-13 16:21:42 -0700 (Tue, 13 Oct 2009) New Revision: 13854 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13854 Modified: trunk/ui_plugins/eventcenter/views/event/index.gsp Log: Fix for HQ-1889 Modified: trunk/ui_plugins/eventcenter/views/event/index.gsp =================================================================== --- trunk/ui_plugins/eventcenter/views/event/index.gsp 2009-10-13 08:46:33 UTC (rev 13853) +++ trunk/ui_plugins/eventcenter/views/event/index.gsp 2009-10-13 23:21:42 UTC (rev 13854) @@ -1,3 +1,6 @@ +<% +import org.apache.commons.lang.StringEscapeUtils +%> <%= dojoInclude(["dojo.event.*", "dojo.collections.Store", "dojo.widget.ContentPane", @@ -32,7 +35,7 @@ style="height:200px; width:180px; border:5px solid #ededed;" onchange="EventLogs_refreshTable();"> <% for (g in allGroups) { %> - <option value="${g.id}">${g.name}</option> + <option value="${g.id}">${StringEscapeUtils.escapeHtml(g.name)}</option> <% } %> </select> <% |
|
From: Asma C. <chi...@gm...> - 2009-10-13 14:33:50
|
Hi to all, I discover Sigar today and I want to use it to gather system Information on my device. However, my device's processor is a mips one. Should it be possible to use Sigar API? Thanks in advance. Asma |
|
From: <bo...@hy...> - 2009-10-13 08:46:45
|
Author: bob Date: 2009-10-13 01:46:33 -0700 (Tue, 13 Oct 2009) New Revision: 13853 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13853 Modified: trunk/etc/version.properties Log: Release 4.2.0 build #1242 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2009-10-13 00:56:04 UTC (rev 13852) +++ trunk/etc/version.properties 2009-10-13 08:46:33 UTC (rev 13853) @@ -1,3 +1,3 @@ -#Mon Oct 12 17:19:41 PDT 2009 +#Tue Oct 13 01:11:14 PDT 2009 version=4.2.0 -build=1241 +build=1242 |
|
From: <bo...@hy...> - 2009-10-13 00:56:22
|
Author: bob Date: 2009-10-12 17:56:04 -0700 (Mon, 12 Oct 2009) New Revision: 13852 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13852 Modified: trunk/etc/version.properties Log: Release 4.2.0 build #1241 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2009-10-12 21:41:19 UTC (rev 13851) +++ trunk/etc/version.properties 2009-10-13 00:56:04 UTC (rev 13852) @@ -1,3 +1,3 @@ -#Mon Oct 12 01:12:37 PDT 2009 +#Mon Oct 12 17:19:41 PDT 2009 version=4.2.0 -build=1240 +build=1241 |
|
From: <no...@gi...> - 2009-10-12 23:10:19
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: d0d54f11b12005adfc30b950702fcd9c6c6f484b http://github.com/hyperic/hqapi/commit/d0d54f11b12005adfc30b950702fcd9c6c6f484b Author: pnguyen <pnguyen@10.2.0.125> Date: 2009-10-12 (Mon, 12 Oct 2009) Changed paths: M src/org/hyperic/hq/hqapi1/tools/MaintenanceCommand.java Log Message: ----------- [HQ-1872] HQ will return a null object if a group has no maintenance schedule |
14 messages has been excluded from this view by a project administrator.
