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: rose j. <rsn...@gm...> - 2010-01-28 05:56:05
|
can anyone please help me? how do u guys get started with sigar? what should i do? build it? |
|
From: <dcr...@hy...> - 2010-01-28 03:08:20
|
Author: dcrutchf Date: 2010-01-27 19:08:11 -0800 (Wed, 27 Jan 2010) New Revision: 14241 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14241 Modified: trunk/src/org/hyperic/hq/ui/action/admin/user/RegisterAction.java trunk/src/org/hyperic/hq/ui/security/BaseSessionInitializationStrategy.java Log: Added logic to handle the custom provider use case Modified: trunk/src/org/hyperic/hq/ui/action/admin/user/RegisterAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/admin/user/RegisterAction.java 2010-01-27 23:30:36 UTC (rev 14240) +++ trunk/src/org/hyperic/hq/ui/action/admin/user/RegisterAction.java 2010-01-28 03:08:11 UTC (rev 14241) @@ -28,7 +28,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; +import javax.security.auth.login.FailedLoginException; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -39,9 +41,11 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.hyperic.hq.auth.shared.SessionManager; import org.hyperic.hq.authz.server.session.AuthzSubject; import org.hyperic.hq.authz.server.session.AuthzSubjectManagerEJBImpl; import org.hyperic.hq.authz.server.session.Operation; +import org.hyperic.hq.authz.shared.AuthzSubjectManagerLocal; import org.hyperic.hq.bizapp.shared.AuthBoss; import org.hyperic.hq.bizapp.shared.AuthzBoss; import org.hyperic.hq.common.shared.HQConstants; @@ -70,8 +74,9 @@ HttpServletRequest request, HttpServletResponse response) throws Exception { - Log log = LogFactory.getLog(RegisterAction.class.getName()); - + final Log log = LogFactory.getLog(RegisterAction.class.getName()); + final boolean debug = log.isDebugEnabled(); + Integer sessionId = RequestUtils.getSessionId(request); EditForm userForm = (EditForm)form; HttpSession session = request.getSession(false); @@ -85,7 +90,6 @@ ServletContext ctx = getServlet().getServletContext(); AuthzBoss authzBoss = ContextUtils.getAuthzBoss(ctx); AuthBoss authBoss = ContextUtils.getAuthBoss(ctx); - WebUser webUser = RequestUtils.getWebUser(session); // password was saved off when the user logged in @@ -95,10 +99,12 @@ // use the overlord to register the subject, and don't add // a principal - log.trace("registering subject [" + webUser.getUsername() + "]"); + if (debug) log.debug("registering subject [" + webUser.getUsername() + "]"); - AuthzSubject target = - AuthzSubjectManagerEJBImpl.getOne().findSubjectById(userForm.getId()); + Integer authzSubjectId = userForm.getId(); + AuthzSubjectManagerLocal authzSubjectManager = AuthzSubjectManagerEJBImpl.getOne(); + AuthzSubject target = authzSubjectManager.findSubjectById(authzSubjectId); + authzBoss.updateSubject(sessionId, target, Boolean.TRUE, HQConstants.ApplicationName, userForm.getDepartment(), @@ -113,20 +119,31 @@ // one for this subject.. must be done before pulling the // new subject in order to do it with his own credentials authBoss.logout(sessionId.intValue()); - sessionId = new Integer(authBoss.login(webUser.getUsername(), + + try { + sessionId = new Integer(authBoss.login(webUser.getUsername(), password)); + } catch(FailedLoginException e) { + // This should only fail in the instance we are using a custom auth provider + // TODO this needs to be reworked in evolution... + if (debug) log.debug("AuthzSubject refreshed failed via legacy method, retrieving directly."); + + sessionId = SessionManager.getInstance().put(authzSubjectManager.findSubjectById(authzSubjectId)); + } + + if (debug) log.debug("finding subject [" + webUser.getUsername() + "]"); - log.trace("finding subject [" + webUser.getUsername() + "]"); - // the new user has no prefs, but we still want to pick up // the defaults ConfigResponse preferences = (ConfigResponse)ctx.getAttribute(Constants.DEF_USER_PREFS); // look up the user's permissions - log.trace("getting all operations"); - HashMap userOpsMap = new HashMap(); + if (debug) log.debug("getting all operations"); + + Map userOpsMap = new HashMap(); List userOps = authzBoss.getAllOperations(sessionId); + for (Iterator it=userOps.iterator(); it.hasNext();) { Operation op = (Operation)it.next(); userOpsMap.put(op.getName(), Boolean.TRUE); @@ -134,10 +151,12 @@ // we also need to create up a new web user webUser = new WebUser(target, sessionId, preferences, false); + session.setAttribute(Constants.WEBUSER_SES_ATTR, webUser); session.setAttribute(Constants.USER_OPERATIONS_ATTR, userOpsMap); - HashMap parms = new HashMap(1); + Map parms = new HashMap(1); + parms.put(Constants.USER_PARAM, target.getId()); return returnSuccess(request, mapping, parms, false); Modified: trunk/src/org/hyperic/hq/ui/security/BaseSessionInitializationStrategy.java =================================================================== --- trunk/src/org/hyperic/hq/ui/security/BaseSessionInitializationStrategy.java 2010-01-27 23:30:36 UTC (rev 14240) +++ trunk/src/org/hyperic/hq/ui/security/BaseSessionInitializationStrategy.java 2010-01-28 03:08:11 UTC (rev 14241) @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; +import javax.ejb.CreateException; import javax.ejb.FinderException; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -26,6 +27,8 @@ import org.hyperic.hq.authz.shared.PermissionException; import org.hyperic.hq.bizapp.shared.AuthBoss; import org.hyperic.hq.bizapp.shared.AuthzBoss; +import org.hyperic.hq.common.ApplicationException; +import org.hyperic.hq.common.shared.HQConstants; import org.hyperic.hq.ui.Constants; import org.hyperic.hq.ui.WebUser; import org.hyperic.hq.ui.util.ContextUtils; @@ -56,22 +59,25 @@ AuthBoss authBoss = ContextUtils.getAuthBoss(ctx); // look up the subject record - AuthzSubject subjPojo = authzBoss.getCurrentSubject(sessionId); - AuthzSubjectValue subject = null; + AuthzSubject currentSubject = authzBoss.getCurrentSubject(sessionId); boolean needsRegistration = false; - if (subjPojo == null) { - subject = new AuthzSubjectValue(); + if (currentSubject == null) { + try { + AuthzSubject overlord = authzSubjectManager.getOverlordPojo(); + currentSubject = authzSubjectManager.createSubject(overlord, username, true, HQConstants.ApplicationName, "", "", "", "", "", "", false); + } catch (CreateException e) { + throw new SessionAuthenticationException("Unable to add user to authorization system"); + } - subject.setName(username); - needsRegistration = true; + sessionId = SessionManager.getInstance().put(currentSubject); } else { - subject = subjPojo.getAuthzSubjectValue(); - - needsRegistration = subjPojo.getEmailAddress() == null || subjPojo.getEmailAddress().length() == 0; + needsRegistration = currentSubject.getEmailAddress() == null || currentSubject.getEmailAddress().length() == 0; } + AuthzSubjectValue subject = currentSubject.getAuthzSubjectValue(); + // figure out if the user has a principal boolean hasPrincipal = authBoss.isUser(sessionId, subject.getName()); ConfigResponse preferences = needsRegistration ? new ConfigResponse() : |
|
From: <gla...@hy...> - 2010-01-27 23:30:45
|
Author: glaullon Date: 2010-01-27 15:30:36 -0800 (Wed, 27 Jan 2010) New Revision: 14240 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14240 Modified: trunk/src/org/hyperic/hq/product/JDBCMeasurementPlugin.java Log: HHQ-3696 Modified: trunk/src/org/hyperic/hq/product/JDBCMeasurementPlugin.java =================================================================== --- trunk/src/org/hyperic/hq/product/JDBCMeasurementPlugin.java 2010-01-27 23:30:35 UTC (rev 14239) +++ trunk/src/org/hyperic/hq/product/JDBCMeasurementPlugin.java 2010-01-27 23:30:36 UTC (rev 14240) @@ -73,7 +73,7 @@ private HashMap _colMap = new HashMap(), _valMap = new HashMap(); - private int _numRows, _updateRows; + private int _numRows; /** * Config schema includes jdbc URL, database username and password. @@ -340,7 +340,6 @@ private String getSqlRow(Statement stmt) throws SQLException { StringBuffer buf = new StringBuffer(); do { - _updateRows = stmt.getUpdateCount(); ResultSet rs = stmt.getResultSet(); if (stmt.getUpdateCount() != -1) { continue; |
|
From: <rm...@hy...> - 2010-01-27 23:30:43
|
Author: rmorgan Date: 2010-01-27 15:30:35 -0800 (Wed, 27 Jan 2010) New Revision: 14239 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14239 Modified: trunk/installer/data/db-upgrade.xml trunk/sql/appdef/Service.hbm.xml Log: [HHQ-3695] Increase service autoinventoryidentifier to 500 characters, matching the limit of EAM_RESOURCE.name Modified: trunk/installer/data/db-upgrade.xml =================================================================== --- trunk/installer/data/db-upgrade.xml 2010-01-27 22:18:45 UTC (rev 14238) +++ trunk/installer/data/db-upgrade.xml 2010-01-27 23:30:35 UTC (rev 14239) @@ -10879,6 +10879,12 @@ precision="2048" columnType="VARCHAR2" nullable="NOT NULL" /> </schemaSpec> + <!-- Increase autoinventoryidentifier to limit of 500 (per name in EAM_RESOURCE) --> + <schemaSpec version="3.194"> + <schema-alterColumn table="EAM_SERVICE" column="autoinventoryidentifier" + precision="500" columnType="VARCHAR2" /> + </schemaSpec> + </dbupgrade> </target> </project> Modified: trunk/sql/appdef/Service.hbm.xml =================================================================== --- trunk/sql/appdef/Service.hbm.xml 2010-01-27 22:18:45 UTC (rev 14238) +++ trunk/sql/appdef/Service.hbm.xml 2010-01-27 23:30:35 UTC (rev 14239) @@ -61,7 +61,7 @@ <column name="SERVER_ID" not-null="false" index="EAM_SERVICE_AIID_IDX"/> </many-to-one> <property name="autoinventoryIdentifier" type="string"> - <column name="AUTOINVENTORYIDENTIFIER" not-null="false" length="250" index="EAM_SERVICE_AIID_IDX"/> + <column name="AUTOINVENTORYIDENTIFIER" not-null="false" length="500" index="EAM_SERVICE_AIID_IDX"/> </property> </properties> |
|
From: <bo...@hy...> - 2010-01-27 09:21:25
|
Author: bob Date: 2010-01-27 01:21:16 -0800 (Wed, 27 Jan 2010) New Revision: 14237 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14237 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1332 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-27 07:09:16 UTC (rev 14236) +++ trunk/etc/version.properties 2010-01-27 09:21:16 UTC (rev 14237) @@ -1,3 +1,3 @@ -#Tue Jan 26 00:26:49 PST 2010 +#Wed Jan 27 00:23:55 PST 2010 version=4.3.0 -build=1331 +build=1332 |
|
From: <pn...@hy...> - 2010-01-27 07:09:25
|
Author: pnguyen Date: 2010-01-26 23:09:16 -0800 (Tue, 26 Jan 2010) New Revision: 14236 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14236 Modified: trunk/src/org/hyperic/hq/ui/AttrConstants.java trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java trunk/web/WEB-INF/classes/ApplicationResources.properties Log: [HPD-207] Display the HQ SNMP local engine ID in the UI; Improve error handling with missing Security Names for SNMPv3 Modified: trunk/src/org/hyperic/hq/ui/AttrConstants.java =================================================================== --- trunk/src/org/hyperic/hq/ui/AttrConstants.java 2010-01-26 17:49:34 UTC (rev 14235) +++ trunk/src/org/hyperic/hq/ui/AttrConstants.java 2010-01-27 07:09:16 UTC (rev 14236) @@ -943,4 +943,9 @@ */ public static final String XLIB_INSTALLED = "xlib"; + /** + * Attribute name for the SNMP local engine ID + */ + public static final String SNMP_LOCAL_ENGINE_ID = "snmpLocalEngineID"; + } Modified: trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java 2010-01-26 17:49:34 UTC (rev 14235) +++ trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java 2010-01-27 07:09:16 UTC (rev 14236) @@ -6,7 +6,7 @@ * normal use of the program, and does *not* fall under the heading of * "derived work". * - * Copyright (C) [2004-2009], Hyperic, Inc. + * Copyright (C) [2004-2010], Hyperic, Inc. * This file is part of HQ. * * HQ is free software; you can redistribute it and/or modify @@ -41,8 +41,11 @@ import org.hyperic.hq.bizapp.server.session.UpdateStatusMode; import org.hyperic.hq.bizapp.shared.ConfigBoss; import org.hyperic.hq.bizapp.shared.UpdateBoss; +import org.hyperic.hq.ui.Constants; import org.hyperic.hq.ui.util.ContextUtils; import org.hyperic.hq.ui.util.RequestUtils; +import org.snmp4j.mp.MPv3; +import org.snmp4j.smi.OctetString; public class EditConfigPrepAction extends TilesAction { @@ -70,6 +73,10 @@ UpdateStatusMode upMode = uboss.getUpdateMode(); cForm.setUpdateMode(upMode.getCode()); + // Set the HQ SNMP local engine id + String localEngineID = "0x" + new OctetString(MPv3.createLocalEngineID()); + request.setAttribute(Constants.SNMP_LOCAL_ENGINE_ID, localEngineID); + return null; } } Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-26 17:49:34 UTC (rev 14235) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-27 07:09:16 UTC (rev 14236) @@ -657,6 +657,7 @@ admin.settings.SNMPCommunity=Community: admin.settings.SNMPContextName=Context Name: admin.settings.SNMPSecurityName=Security Name: +admin.settings.SNMPLocalEngineID=Local Engine ID: admin.settings.SNMPEngineID=Context Engine ID: admin.settings.SNMPTrapOID=SNMP Trap OID: admin.settings.SNMPEnterpriseOID=Enterprise OID: |
|
From: Dave <sig...@hy...> - 2010-01-27 05:11:56
|
Justin, Any chance you could upload your test program? This would be a great resource for those of us getting started with SIGAR. Dave |
|
From: <rm...@hy...> - 2010-01-26 17:49:46
|
Author: rmorgan Date: 2010-01-26 09:49:34 -0800 (Tue, 26 Jan 2010) New Revision: 14235 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14235 Modified: trunk/installer/data/db-upgrade.xml trunk/sql/measurement/MeasurementTemplate.hbm.xml Log: [HHQ-3692] Increase EAM_MEASUREMENT_TEMPL.template to 2048. Modified: trunk/installer/data/db-upgrade.xml =================================================================== --- trunk/installer/data/db-upgrade.xml 2010-01-26 09:22:07 UTC (rev 14234) +++ trunk/installer/data/db-upgrade.xml 2010-01-26 17:49:34 UTC (rev 14235) @@ -10874,6 +10874,11 @@ </schema-directSQL> </schemaSpec> + <schemaSpec version="3.193"> + <schema-alterColumn table="EAM_MEASUREMENT_TEMPL" column="template" + precision="2048" columnType="VARCHAR2" nullable="NOT NULL" /> + </schemaSpec> + </dbupgrade> </target> </project> Modified: trunk/sql/measurement/MeasurementTemplate.hbm.xml =================================================================== --- trunk/sql/measurement/MeasurementTemplate.hbm.xml 2010-01-26 09:22:07 UTC (rev 14234) +++ trunk/sql/measurement/MeasurementTemplate.hbm.xml 2010-01-26 17:49:34 UTC (rev 14235) @@ -45,7 +45,7 @@ </property> <property name="template" type="string"> - <column name="TEMPLATE" not-null="true" length="800"/> + <column name="TEMPLATE" not-null="true" length="2048"/> </property> <property name="plugin" type="string"> |
|
From: Scott M. <smo...@wm...> - 2010-01-26 16:32:39
|
Not sure why it's on your desktop. Verify it also exsist in \server-4.2.0-EE\lib and agent-4.2.0-EE\bundles\agent-4.2.0-EE-1260\pdk\lib. If it's in those locations go ahead and delete the one from you desktop. |
|
From: rose j. <rsn...@gm...> - 2010-01-26 16:32:31
|
hi all, i have just downloaded the sigar files but i really dont know how to use this. do i have to install?please help me..i know this is such a dumb question. thanks for any replies. |
|
From: grc77 <sig...@hy...> - 2010-01-26 16:32:31
|
I noticed this file (sigar-x86-winnt.dll) on my desktop yesterday and I do not know why it's there. Do I need to keep it? |
|
From: <bo...@hy...> - 2010-01-26 09:22:16
|
Author: bob Date: 2010-01-26 01:22:07 -0800 (Tue, 26 Jan 2010) New Revision: 14234 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14234 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1331 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-26 06:53:41 UTC (rev 14233) +++ trunk/etc/version.properties 2010-01-26 09:22:07 UTC (rev 14234) @@ -1,3 +1,3 @@ -#Mon Jan 25 00:32:49 PST 2010 +#Tue Jan 26 00:26:49 PST 2010 version=4.3.0 -build=1330 +build=1331 |
|
From: <pn...@hy...> - 2010-01-26 06:53:48
|
Author: pnguyen Date: 2010-01-25 22:53:41 -0800 (Mon, 25 Jan 2010) New Revision: 14233 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14233 Modified: trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java trunk/web/WEB-INF/classes/ApplicationResources.properties trunk/web/admin/config/ViewEscalation.jsp Log: [HPD-209] Update UI for SNMP variable bindings Modified: trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java 2010-01-25 21:23:01 UTC (rev 14232) +++ trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java 2010-01-26 06:53:41 UTC (rev 14233) @@ -116,8 +116,8 @@ try { setAddress(config.getValue(CFG_ADDRESS)); setOid(config.getValue(CFG_OID)); - setSnmpNotificationMechanism(config.getValue(CFG_NOTIFICATION_MECHANISM)); - setVariableBindings(config.getValue(CFG_VARIABLE_BINDINGS)); + setSnmpNotificationMechanism(config.getValue(CFG_NOTIFICATION_MECHANISM, "v2c Trap")); + setVariableBindings(config.getValue(CFG_VARIABLE_BINDINGS, "[]")); } catch (IllegalArgumentException ex) { throw new InvalidActionDataException(ex); } Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-25 21:23:01 UTC (rev 14232) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-26 06:53:41 UTC (rev 14233) @@ -1954,6 +1954,8 @@ alert.config.escalation.action.snmp.notification=SNMP Notification alert.config.escalation.action.snmp.oid=OID alert.config.escalation.action.snmp.varbinds=Variable Bindings +alert.config.escalation.action.snmp.varbinds.add=Add Another Variable Binding +alert.config.escalation.action.snmp.varbinds.remove=Remove This Variable Binding alert.config.escalation.allow.pause=Allow user to pause escalation for alert.config.escalation.allow.pause.indefinitely=Allow user to pause escalation until fixed alert.config.escalation.allow.continue=Continue escalation without pausing Modified: trunk/web/admin/config/ViewEscalation.jsp =================================================================== --- trunk/web/admin/config/ViewEscalation.jsp 2010-01-25 21:23:01 UTC (rev 14232) +++ trunk/web/admin/config/ViewEscalation.jsp 2010-01-26 06:53:41 UTC (rev 14233) @@ -517,7 +517,9 @@ + '<tr><td><table cellpadding="2" cellspacing="0" border="0">' + '<tr><td id=IPText style="display:none"></td></tr>' + '<tr><td id=NotificationMechanismText style="display:none"></td></tr>' + + '<tr><td id=VBTitle style="display:none"><fmt:message key="alert.config.escalation.action.snmp.varbinds"/>:</td></tr>' + '<tr><td id=OIDText style="display:none"></td></tr>' + + '<tr><td id=OIDValue style="display:none">Value: {snmp_trap.gsp}</td></tr>' + '<tr><td id=VariableBindingsText style="display:none"></td></tr></table></td></tr>' + '<tr><td id="time" colspan="3" valign="top" style="display:none;"></td></tr>' + '</tbody></table>'; @@ -611,11 +613,15 @@ + '<input type=text name=snmpIP id=snmpIPinput size=30 onMouseOut=copysnmpIP(this);checkIP(this);><br>' + '<fmt:message key="admin.settings.SNMPNotificationMechanism"/><br>' + "<select name='snmpNotificationMechanism' id='snmpNotificationMechanismSelect' onchange='copySnmpNotificationMechanism(this);'><option>v1 Trap</option><option>v2c Trap</option><option>Inform</option></select><br>" + + '<input type="hidden" name="variableBindings" id="variableBindingsInput"><br/>' + + '<fmt:message key="alert.config.escalation.action.snmp.varbinds"/>:<br/>' + + '<hr>' + '<fmt:message key="alert.config.escalation.action.snmp.oid"/> <fmt:message key="inform.config.escalation.scheme.OID"/><br>' - + '<input type=text name=snmpOID id=snmpOIDinput size=30 onMouseOut=copysnmpOID(this);checkOID(this);><br>' - + '<fmt:message key="alert.config.escalation.action.snmp.varbinds"/><br>' - + "<textarea rows='4' cols='25' name='variableBindings' id='variableBindingsTextArea' onchange='copyVariableBindings(this);'></textarea>"; - + + '<input type=text name=snmpOID id=snmpOIDinput style="width:250px" onMouseOut=copysnmpOID(this);checkOID(this);><br>' + + 'Value: {snmp_trap.gsp}<br>' + + '<div id="snmpVarbindDiv"></div>' + + '<div style="padding-top:10px;"><a href="javascript:addVariableBinding();"><fmt:message key="alert.config.escalation.action.snmp.varbinds.add"/></a></div>'; + td4.appendChild(usersDiv); usersDiv.setAttribute('id', 'usersDiv' + liID); dojo11.byId('usersDiv' + liID).style.display = 'none'; @@ -644,6 +650,34 @@ } +function addVariableBinding() { + var parentDiv = dojo11.byId('snmpVarbindDiv'); + var vbDiv = document.createElement('div'); + var vbArray = document.getElementsByName("snmpVarbindOID"); + + var vbDivNum = vbArray.length + 1; + vbDiv.id = "snmpVarbindDiv_" + vbDivNum; + + vbDiv.innerHTML = '<br/>' + + '<fmt:message key="alert.config.escalation.action.snmp.oid"/> <fmt:message key="inform.config.escalation.scheme.OID"/><br>' + + '<input type=text name="snmpVarbindOID" style="width:250px" onchange="copyVariableBindings();"><br>' + + 'Value:<br>' + + '<input type=text name="snmpVarbindValue" style="width:250px" onchange="copyVariableBindings();"><br>' + + '<a href="javascript:removeVariableBinding(' + vbDivNum + ');"><fmt:message key="alert.config.escalation.action.snmp.varbinds.remove"/></a><br/>'; + + parentDiv.appendChild(vbDiv); +} + +function removeVariableBinding(snmpVarbindIndex) { + var vbDiv = dojo11.byId('snmpVarbindDiv_' + snmpVarbindIndex); + + // remove element + Element.remove(vbDiv); + + // update UI + copyVariableBindings(); +} + function copyOthersEmail(el) { var othersDisplay = dojo11.byId('userListDisplay'); othersDisplay.style.display = ""; @@ -669,15 +703,38 @@ } function copysnmpOID(el) { - var OIDDisplay = dojo11.byId('OIDText'); - OIDDisplay.style.display = ""; - OIDDisplay.innerHTML = '<fmt:message key="alert.config.escalation.action.snmp.oid"/>: ' + el.value; + var VBTitle = dojo11.byId('VBTitle'); + var OIDText = dojo11.byId('OIDText'); + var OIDValue = dojo11.byId('OIDValue'); + VBTitle.style.display = ""; + OIDText.style.display = ""; + OIDValue.style.display = ""; + OIDText.innerHTML = '<fmt:message key="alert.config.escalation.action.snmp.oid"/>: ' + el.value; } -function copyVariableBindings(el) { - var display = dojo11.byId('VariableBindingsText'); - display.style.display = ""; - display.innerHTML = '<fmt:message key="alert.config.escalation.action.snmp.varbinds"/>: ' + el.value; +function copyVariableBindings() { + var vbTitle = dojo11.byId('VBTitle'); + var vbText = dojo11.byId('VariableBindingsText'); + var vbInput = dojo11.byId('variableBindingsInput'); + var vbOids = document.getElementsByName("snmpVarbindOID"); + var vbValues = document.getElementsByName("snmpVarbindValue"); + + vbTitle.style.display = ""; + vbText.style.display = ""; + + var vbsInnerHTML = ""; + var vbsArray = []; + var vbsCount = 0; + for (var s = 0; s < vbOids.length; s++) { + if (vbOids[s].value.length > 0 && vbValues[s].value.length > 0) { + vbsArray[vbsCount++] = {oid: vbOids[s].value, value: vbValues[s].value}; + vbsInnerHTML += '<fmt:message key="alert.config.escalation.action.snmp.oid"/>: ' + + vbOids[s].value + '<br/>' + + 'Value: ' + vbValues[s].value + '<br/>'; + } + } + vbText.innerHTML = vbsInnerHTML; + vbInput.value = vbsArray.toJSON(); } function copySnmpNotificationMechanism(el) { |
|
From: <no...@gi...> - 2010-01-26 00:59:54
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: 8fdd71cb8a88b01aaad37fe85ea3d70d74ddc99c http://github.com/hyperic/hqapi/commit/8fdd71cb8a88b01aaad37fe85ea3d70d74ddc99c Author: Jennifer Hickey <jen...@sp...> Date: 2010-01-25 (Mon, 25 Jan 2010) Changed paths: M build.xml Log Message: ----------- Deleted clover staging dir after compile |
|
From: <dcr...@hy...> - 2010-01-25 21:23:08
|
Author: dcrutchf Date: 2010-01-25 13:23:01 -0800 (Mon, 25 Jan 2010) New Revision: 14232 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14232 Modified: trunk/web/META-INF/security-context.xml Log: Added request caching filter so login redirects to the previously requested page Modified: trunk/web/META-INF/security-context.xml =================================================================== --- trunk/web/META-INF/security-context.xml 2010-01-25 09:27:13 UTC (rev 14231) +++ trunk/web/META-INF/security-context.xml 2010-01-25 21:23:01 UTC (rev 14232) @@ -25,10 +25,12 @@ sessionManagementFilter, filterSecurityInterceptor" /> <sec:filter-chain pattern="/**" filters="securityContextPersistenceFilter, - logoutFilter, + logoutFilter, basicAuthenticationFilter, formBasedAuthenticationFilter, - sessionManagementFilter, + requestCacheAwareFilter, + securityContextHolderAwareRequestFilter, + sessionManagementFilter, formAuthenticationExceptionTranslationFilter, filterSecurityInterceptor" /> </sec:filter-chain-map> @@ -69,12 +71,15 @@ </bean> <!-- For form-based authentication --> + <bean id="httpSessionRequestCache" class="org.springframework.security.web.savedrequest.HttpSessionRequestCache" /> + <bean id="formBasedAuthenticationFilter" class="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter"> <property name="authenticationManager" ref="authenticationManager" /> <property name="sessionAuthenticationStrategy" ref="sessionInitializationStrategy" /> <property name="authenticationSuccessHandler"> - <bean class="org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler"> + <bean class="org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler"> <property name="defaultTargetUrl" value="/Dashboard.do" /> + <property name="requestCache" ref="httpSessionRequestCache" /> <property name="redirectStrategy"> <bean class="org.hyperic.hq.ui.security.RegistrationRedirectStrategy"> <constructor-arg value="/admin/user/UserAdmin.do?mode=register" /> @@ -95,8 +100,15 @@ <bean id="formAuthenticationExceptionTranslationFilter" class="org.springframework.security.web.access.ExceptionTranslationFilter"> <property name="authenticationEntryPoint" ref="formAuthenticationEntryPoint" /> + <property name="requestCache" ref="httpSessionRequestCache" /> </bean> + <!-- Request cache aware filter, this makes sure the original request is used after authenticating --> + <bean id="requestCacheAwareFilter" class="org.springframework.security.web.savedrequest.RequestCacheAwareFilter" /> + + <!-- Security context holder aware request filter --> + <bean id="securityContextHolderAwareRequestFilter" class="org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter" /> + <!-- Setup session management filter --> <bean id="sessionManagementFilter" class="org.springframework.security.web.session.SessionManagementFilter"> <constructor-arg ref="securityContextRepository" /> |
|
From: <cw...@hy...> - 2010-01-25 18:19:39
|
Author: cwitt Date: 2010-01-21 09:54:25 -0800 (Thu, 21 Jan 2010) New Revision: 14209 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14209 Modified: trunk/installer/rpm/expect/install.exp Log: Update expect script to automatically accept EULA during RPM install. Modified: trunk/installer/rpm/expect/install.exp =================================================================== --- trunk/installer/rpm/expect/install.exp 2010-01-21 09:36:48 UTC (rev 14208) +++ trunk/installer/rpm/expect/install.exp 2010-01-21 17:54:25 UTC (rev 14209) @@ -4,6 +4,8 @@ spawn ./setup.sh +expect "accept" +send "y\r" expect "choices" send "1\r" expect "installation path" |
|
From: <bo...@hy...> - 2010-01-25 09:27:30
|
Author: bob Date: 2010-01-25 01:27:13 -0800 (Mon, 25 Jan 2010) New Revision: 14231 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14231 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1330 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-25 07:25:02 UTC (rev 14230) +++ trunk/etc/version.properties 2010-01-25 09:27:13 UTC (rev 14231) @@ -1,3 +1,3 @@ -#Sun Jan 24 00:27:48 PST 2010 +#Mon Jan 25 00:32:49 PST 2010 version=4.3.0 -build=1329 +build=1330 |
|
From: <pn...@hy...> - 2010-01-25 07:25:12
|
Author: pnguyen Date: 2010-01-24 23:25:02 -0800 (Sun, 24 Jan 2010) New Revision: 14230 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14230 Modified: trunk/plugins/netservices/etc/hq-plugin.xml trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java trunk/src/org/hyperic/hq/ui/json/action/escalation/BaseAction.java trunk/src/org/hyperic/hq/ui/json/action/escalation/crud/SaveAction.java trunk/web/WEB-INF/classes/ApplicationResources.properties trunk/web/admin/config/NewEscalation.jsp trunk/web/admin/config/ViewEscalation.jsp trunk/web/resource/common/monitor/alerts/config/ViewEscalation.jsp Log: [HPD-200] Implement SNMP variable bindings; Update usage of SNMP terminology Modified: trunk/plugins/netservices/etc/hq-plugin.xml =================================================================== --- trunk/plugins/netservices/etc/hq-plugin.xml 2010-01-24 09:24:20 UTC (rev 14229) +++ trunk/plugins/netservices/etc/hq-plugin.xml 2010-01-25 07:25:02 UTC (rev 14230) @@ -259,7 +259,7 @@ optional="true"/> <option name="snmpSecurityContext" - description="SNMP Security Context Name (v3 only)" + description="SNMP Context Name (v3 only)" optional="true"/> <option name="snmpAuthType" Modified: trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java 2010-01-24 09:24:20 UTC (rev 14229) +++ trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java 2010-01-25 07:25:02 UTC (rev 14230) @@ -13,10 +13,12 @@ protected static final String CFG_OID = "oid"; protected static final String CFG_ADDRESS = "address"; protected static final String CFG_NOTIFICATION_MECHANISM = "snmpNotificationMechanism"; + protected static final String CFG_VARIABLE_BINDINGS = "variableBindings"; protected String oid; protected String address; protected String snmpNotificationMechanism; + protected String variableBindings; // in JSON format private String implementor = "com.hyperic.hq.bizapp.server.action.alert.SnmpAction"; @@ -24,10 +26,13 @@ public SnmpActionConfig() { } - public SnmpActionConfig(String address, String oid, String snmpNotificationMechanism) { + public SnmpActionConfig(String snmpNotificationMechanism, + String address, String oid, + String variableBindings) { + this.snmpNotificationMechanism = snmpNotificationMechanism; this.address = address; this.oid = oid; - this.snmpNotificationMechanism = snmpNotificationMechanism; + this.variableBindings = variableBindings; } public void setOid(String oid) { @@ -46,26 +51,52 @@ return address; } + public String getSnmpNotificationMechanism() { + return snmpNotificationMechanism; + } + + public void setSnmpNotificationMechanism(String snmpNotificationMechanism) { + this.snmpNotificationMechanism = snmpNotificationMechanism; + } + + /** + * Gets the variable bindings configuration in JSON format + */ + public String getVariableBindings() { + return variableBindings; + } + + /** + * Sets the variable bindings configuration in JSON format + */ + public void setVariableBindings(String variableBindings) { + this.variableBindings = variableBindings; + } + /* (non-Javadoc) * @see org.hyperic.hq.events.ActionConfigInterface#getConfigSchema() */ public ConfigSchema getConfigSchema() { - StringConfigOption address, oid, snmpNotificationMechanism; ConfigSchema res = new ConfigSchema(); - address = new StringConfigOption(CFG_ADDRESS, + StringConfigOption address = new StringConfigOption(CFG_ADDRESS, "Transport Address ([transport:]address)", ""); address.setMinLength(1); res.addOption(address); - oid = new StringConfigOption(CFG_OID, "OID", "1.3.6"); + StringConfigOption oid = new StringConfigOption(CFG_OID, "OID", "1.3.6"); oid.setMinLength(1); res.addOption(oid); - snmpNotificationMechanism = new StringConfigOption(CFG_NOTIFICATION_MECHANISM, "SNMP Notification Mechanism", "v1 Trap"); + StringConfigOption snmpNotificationMechanism = + new StringConfigOption(CFG_NOTIFICATION_MECHANISM, "SNMP Notification Mechanism", "v2c Trap"); snmpNotificationMechanism.setMinLength(1); res.addOption(snmpNotificationMechanism); + StringConfigOption variableBindings = + new StringConfigOption(CFG_VARIABLE_BINDINGS, "User Variable Bindings", "[]"); + res.addOption(variableBindings); + return res; } @@ -76,6 +107,7 @@ response.setValue(CFG_ADDRESS, this.getAddress()); response.setValue(CFG_OID, this.getOid()); response.setValue(CFG_NOTIFICATION_MECHANISM, this.getSnmpNotificationMechanism()); + response.setValue(CFG_VARIABLE_BINDINGS, this.getVariableBindings()); return response; } @@ -85,6 +117,7 @@ setAddress(config.getValue(CFG_ADDRESS)); setOid(config.getValue(CFG_OID)); setSnmpNotificationMechanism(config.getValue(CFG_NOTIFICATION_MECHANISM)); + setVariableBindings(config.getValue(CFG_VARIABLE_BINDINGS)); } catch (IllegalArgumentException ex) { throw new InvalidActionDataException(ex); } @@ -97,12 +130,4 @@ public void setImplementor(String implementor) { this.implementor = implementor; } - - public String getSnmpNotificationMechanism() { - return snmpNotificationMechanism; - } - - public void setSnmpNotificationMechanism(String snmpNotificationMechanism) { - this.snmpNotificationMechanism = snmpNotificationMechanism; - } } Modified: trunk/src/org/hyperic/hq/ui/json/action/escalation/BaseAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/json/action/escalation/BaseAction.java 2010-01-24 09:24:20 UTC (rev 14229) +++ trunk/src/org/hyperic/hq/ui/json/action/escalation/BaseAction.java 2010-01-25 07:25:02 UTC (rev 14230) @@ -75,8 +75,10 @@ protected void streamResult(JsonActionContext context) throws JSONException, IOException { - context.getJSONResult().write( + if (context.getJSONResult() != null) { + context.getJSONResult().write( context.getWriter(), context.isPrettyPrint()); + } } } Modified: trunk/src/org/hyperic/hq/ui/json/action/escalation/crud/SaveAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/json/action/escalation/crud/SaveAction.java 2010-01-24 09:24:20 UTC (rev 14229) +++ trunk/src/org/hyperic/hq/ui/json/action/escalation/crud/SaveAction.java 2010-01-25 07:25:02 UTC (rev 14230) @@ -107,8 +107,11 @@ String address = ((String[])p.get("snmpIP"))[0]; String oid = ((String[])p.get("snmpOID"))[0]; String snmpNotificationMechanism = ((String[])p.get("snmpNotificationMechanism"))[0]; + String variableBindings = ((String[])p.get("variableBindings"))[0]; - return new SnmpActionConfig(address, oid, snmpNotificationMechanism); + return new SnmpActionConfig(snmpNotificationMechanism, + address, oid, + variableBindings); } private ActionConfigInterface Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-24 09:24:20 UTC (rev 14229) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-25 07:25:02 UTC (rev 14230) @@ -650,15 +650,15 @@ admin.settings.SNMPConfigPropTab=SNMP Server Configuration Properties admin.settings.SNMPVersion=SNMP Protocol Version: admin.settings.SNMPNone=SNMP Not Enabled -admin.settings.SNMPAuthProtocol=Auth Protocol: -admin.settings.SNMPAuthPassphrase=Auth Passphrase: +admin.settings.SNMPAuthProtocol=Authentication Protocol: +admin.settings.SNMPAuthPassphrase=Authentication Passphrase: admin.settings.SNMPPrivProtocol=Privacy Protocol: admin.settings.SNMPPrivPassphrase=Privacy Passphrase: admin.settings.SNMPCommunity=Community: -admin.settings.SNMPContextName=Target Context Name: +admin.settings.SNMPContextName=Context Name: admin.settings.SNMPSecurityName=Security Name: -admin.settings.SNMPEngineID=Engine ID: -admin.settings.SNMPTrapOID=Trap OID: +admin.settings.SNMPEngineID=Context Engine ID: +admin.settings.SNMPTrapOID=SNMP Trap OID: admin.settings.SNMPEnterpriseOID=Enterprise OID: admin.settings.SNMPGenericID=Generic ID: admin.settings.SNMPSpecificID=Specific ID: @@ -1951,6 +1951,9 @@ alert.config.escalation.wait.hours=wait {0} hours alert.config.escalation.scheme=Escalation Scheme: alert.config.escalation.scheme.for=Escalation Scheme for {0}: +alert.config.escalation.action.snmp.notification=SNMP Notification +alert.config.escalation.action.snmp.oid=OID +alert.config.escalation.action.snmp.varbinds=Variable Bindings alert.config.escalation.allow.pause=Allow user to pause escalation for alert.config.escalation.allow.pause.indefinitely=Allow user to pause escalation until fixed alert.config.escalation.allow.continue=Continue escalation without pausing @@ -2029,7 +2032,7 @@ alert.config.edit.notification.PageTitle=Edit {0}: Alert Notification Action -alert.config.edit.snmp.address=Address of the target SNMP engine: +alert.config.edit.snmp.address=IP Address: alert.config.edit.snmp.oid=OID: alert.config.edit.snmp.notificationMechanism=Notification Mechanism: Modified: trunk/web/admin/config/NewEscalation.jsp =================================================================== --- trunk/web/admin/config/NewEscalation.jsp 2010-01-24 09:24:20 UTC (rev 14229) +++ trunk/web/admin/config/NewEscalation.jsp 2010-01-25 07:25:02 UTC (rev 14230) @@ -358,7 +358,7 @@ addOption(select2, 'SMS', 'SMS'); addOption(select2, 'Syslog', 'Sys Log'); <c:if test="${snmpEnabled}"> - addOption(select2, 'SNMP', 'SNMP Trap'); + addOption(select2, 'SNMP', '<fmt:message key="alert.config.escalation.action.snmp.notification"/>'); </c:if> addOption(select2, 'NoOp', 'Suppress Alerts'); Modified: trunk/web/admin/config/ViewEscalation.jsp =================================================================== --- trunk/web/admin/config/ViewEscalation.jsp 2010-01-24 09:24:20 UTC (rev 14229) +++ trunk/web/admin/config/ViewEscalation.jsp 2010-01-25 07:25:02 UTC (rev 14230) @@ -14,7 +14,7 @@ normal use of the program, and does *not* fall under the heading of "derived work". - Copyright (C) [2004-2009], Hyperic, Inc. + Copyright (C) [2004-2010], Hyperic, Inc. This file is part of HQ. HQ is free software; you can redistribute it and/or modify @@ -179,6 +179,7 @@ var configSnmpOID = actionConfig.oid; var configSnmpIP = actionConfig.address; var configSnmpNotificationMechanism = actionConfig.snmpNotificationMechanism; + var configSnmpVarBinds = eval(actionConfig.variableBindings); var actionId = actions[i].action.id; var actionsClassName = actions[i].action.className; var actionsVersion = actions[i].action._version_; @@ -275,7 +276,26 @@ usersTextDiv.innerHTML = 'Suppress duplicate alerts for: ' + actionWaitTime; waitDiv.innerHTML = " "; } else if (actionClass[d] == "SnmpAction") { - usersTextDiv.innerHTML = '<table cellpadding="0" cellspacing="0" border="0"><tr><td rowSpan="3" vAlign="top" style="padding-right:3px;">Snmp Trap:</td><td style="padding:0px 2px 2px 2px;"><fmt:message key="resource.autodiscovery.server.IPAddressTH"/>: ' + configSnmpIP + '</td></tr><tr><td style="padding:2px;"><fmt:message key="admin.settings.SNMPTrapOID"/> ' + configSnmpOID + '</td></tr><tr><td style="padding:2px;"><fmt:message key="admin.settings.SNMPNotificationMechanism"/> ' + configSnmpNotificationMechanism + '</td></tr></table>' + var snmpInnerHTML = + '<table cellpadding="0" cellspacing="0" border="0">' + + '<tr><td rowSpan="4" vAlign="top" style="padding-right:3px;"><fmt:message key="alert.config.escalation.action.snmp.notification"/>:</td>' + + '<td colspan="2" style="padding:2px;"><fmt:message key="resource.autodiscovery.server.IPAddressTH"/>: ' + configSnmpIP + '</td></tr>' + + '<tr><td colspan="2" style="padding:0px 2px 2px 2px;"><fmt:message key="admin.settings.SNMPNotificationMechanism"/> ' + configSnmpNotificationMechanism + '</td></tr>' + + '<tr><td vAlign="top" style="padding:2px;" nowrap="nowrap"><fmt:message key="alert.config.escalation.action.snmp.varbinds"/>: </td>' + + '<td style="padding:2px;"><table>' + + '<tr><td style="padding-right:5px;"><fmt:message key="alert.config.escalation.action.snmp.oid"/>: ' + configSnmpOID + '</td>' + + '<td>Value: {snmp_trap.gsp}</td></tr>'; + + if (typeof configSnmpVarBinds != 'object') { + configSnmpVarBinds = []; + } + for (var s = 0; s < configSnmpVarBinds.length; s++) { + snmpInnerHTML += '<tr><td style="padding-right:5px;"><fmt:message key="alert.config.escalation.action.snmp.oid"/>: ' + + configSnmpVarBinds[s].oid + '</td>' + + '<td>Value: ' + configSnmpVarBinds[s].value + '</td></tr>'; + } + snmpInnerHTML += '</table></td></tr></table>'; + usersTextDiv.innerHTML = snmpInnerHTML; } } @@ -486,9 +506,22 @@ td5.setAttribute('width', '30%'); td5.setAttribute('rowSpan', '3'); td5.setAttribute('id', 'displaySelAction'); - td5.innerHTML = '<table cellpadding="2" cellspacing="0" border="0" width="100%"><tbody><tr><td class=BlockTitle colSpan=3>Action Details</td></tr><tr><td id="actionName" vAlign="top" width="50%">Action: Email</td></tr><tr><td id="userListDisplay" valign="top" style="display:none;"></td></tr><tr><td><table cellpadding="2" cellspacing="0" border="0"><tr><td id=metaText style="display:none"></td></tr><tr><td id=productText style="display:none"></td></tr><tr><td id=versionText style="display:none"></td></tr></table></td></tr><tr><td><table cellpadding="2" cellspacing="0" border="0"><tr><td id=IPText style="display:none"></td></tr><tr><td id=OIDText style="display:none"></td></tr><tr><td id=NotificationMechanismText style="display:none"></td></tr></table></td></tr><tr><td id="time" colspan="3" valign="top" style="display:none;"></td></tr></tbody></table>'; + td5.innerHTML = '<table cellpadding="2" cellspacing="0" border="0" width="100%">' + + '<tbody><tr><td class=BlockTitle colSpan=3>Action Details</td></tr>' + + '<tr><td id="actionName" vAlign="top" width="50%">Action: Email</td></tr>' + + '<tr><td id="userListDisplay" valign="top" style="display:none;"></td></tr>' + + '<tr><td><table cellpadding="2" cellspacing="0" border="0">' + + '<tr><td id=metaText style="display:none"></td></tr>' + + '<tr><td id=productText style="display:none"></td></tr>' + + '<tr><td id=versionText style="display:none"></td></tr></table></td></tr>' + + '<tr><td><table cellpadding="2" cellspacing="0" border="0">' + + '<tr><td id=IPText style="display:none"></td></tr>' + + '<tr><td id=NotificationMechanismText style="display:none"></td></tr>' + + '<tr><td id=OIDText style="display:none"></td></tr>' + + '<tr><td id=VariableBindingsText style="display:none"></td></tr></table></td></tr>' + + '<tr><td id="time" colspan="3" valign="top" style="display:none;"></td></tr>' + + '</tbody></table>'; - escTr1.appendChild(td1); td1.setAttribute('colSpan', '3'); @@ -528,7 +561,7 @@ addOption(select2, 'SMS', 'SMS'); addOption(select2, 'Syslog', 'Sys Log'); <c:if test="${snmpEnabled}"> - addOption(select2, 'SNMP', 'SNMP Trap'); + addOption(select2, 'SNMP', '<fmt:message key="alert.config.escalation.action.snmp.notification"/>'); </c:if> addOption(select2, 'NoOp', 'Suppress Alerts'); @@ -574,7 +607,14 @@ dojo11.byId('snmpinput').style.display = 'none'; dojo11.byId('snmpinput').style.textAlign = 'left'; //sysDiv.setAttribute('width', '40%'); - snmpDiv.innerHTML = '<fmt:message key="resource.autodiscovery.server.IPAddressTH"/>: <fmt:message key="inform.config.escalation.scheme.IPAddress"/><br> <input type=text name=snmpIP id=snmpIPinput' + " size=30 onMouseOut=copysnmpIP(this);checkIP(this);><br>" + '<fmt:message key="admin.settings.SNMPTrapOID"/> <fmt:message key="inform.config.escalation.scheme.OID"/><br> <input type=text name=snmpOID id=snmpOIDinput' + " size=30 onMouseOut=copysnmpOID(this);checkOID(this);><br> <select name='snmpNotificationMechanism' id='snmpNotificationMechanismSelect' onchange='copySnmpNotificationMechanism(this);'><option>v1 Trap</option><option>v2c Trap</option><option>Inform</option></select>"; + snmpDiv.innerHTML = '<fmt:message key="resource.autodiscovery.server.IPAddressTH"/>: <fmt:message key="inform.config.escalation.scheme.IPAddress"/><br>' + + '<input type=text name=snmpIP id=snmpIPinput size=30 onMouseOut=copysnmpIP(this);checkIP(this);><br>' + + '<fmt:message key="admin.settings.SNMPNotificationMechanism"/><br>' + + "<select name='snmpNotificationMechanism' id='snmpNotificationMechanismSelect' onchange='copySnmpNotificationMechanism(this);'><option>v1 Trap</option><option>v2c Trap</option><option>Inform</option></select><br>" + + '<fmt:message key="alert.config.escalation.action.snmp.oid"/> <fmt:message key="inform.config.escalation.scheme.OID"/><br>' + + '<input type=text name=snmpOID id=snmpOIDinput size=30 onMouseOut=copysnmpOID(this);checkOID(this);><br>' + + '<fmt:message key="alert.config.escalation.action.snmp.varbinds"/><br>' + + "<textarea rows='4' cols='25' name='variableBindings' id='variableBindingsTextArea' onchange='copyVariableBindings(this);'></textarea>"; td4.appendChild(usersDiv); usersDiv.setAttribute('id', 'usersDiv' + liID); @@ -631,9 +671,15 @@ function copysnmpOID(el) { var OIDDisplay = dojo11.byId('OIDText'); OIDDisplay.style.display = ""; - OIDDisplay.innerHTML = '<fmt:message key="admin.settings.SNMPTrapOID"/> ' + el.value; + OIDDisplay.innerHTML = '<fmt:message key="alert.config.escalation.action.snmp.oid"/>: ' + el.value; } +function copyVariableBindings(el) { + var display = dojo11.byId('VariableBindingsText'); + display.style.display = ""; + display.innerHTML = '<fmt:message key="alert.config.escalation.action.snmp.varbinds"/>: ' + el.value; +} + function copySnmpNotificationMechanism(el) { var display = dojo11.byId('NotificationMechanismText'); display.style.display = ""; Modified: trunk/web/resource/common/monitor/alerts/config/ViewEscalation.jsp =================================================================== --- trunk/web/resource/common/monitor/alerts/config/ViewEscalation.jsp 2010-01-24 09:24:20 UTC (rev 14229) +++ trunk/web/resource/common/monitor/alerts/config/ViewEscalation.jsp 2010-01-25 07:25:02 UTC (rev 14230) @@ -49,7 +49,7 @@ onloads.push(showViewEscResponse); function showViewEscResponse() { - var tmp = eval('( <c:out value="${escalationJSON}" escapeXml="false" /> )'); + var tmp = <c:out value="${escalationJSON}" escapeXml="false"/> ; var notifyAll = tmp.escalation.notifyAll var actions = tmp.escalation.actions; var allowPause = tmp.escalation.allowPause; @@ -80,6 +80,7 @@ var configSnmpOID = actionConfig.oid; var configSnmpIP = actionConfig.address; var configSnmpNotificationMechanism = actionConfig.snmpNotificationMechanism; + var configSnmpVarBinds = eval(actionConfig.variableBindings); var actionId = actions[i].action.id; var actionsClassName = actions[i].action.className; var actionsVersion = actions[i].action._version_; @@ -163,7 +164,26 @@ usersTextDiv.innerHTML = 'Suppress duplicate alerts for: ' + actionWaitTime; waitDiv.innerHTML = " "; } else if (actionClass[d] == "SnmpAction") { - usersTextDiv.innerHTML = '<table cellpadding="0" cellspacing="0" border="0"><tr><td rowSpan="3" vAlign="top" style="padding-right:3px;">Snmp Trap:</td><td style="padding:0px 2px 2px 2px;"><fmt:message key="resource.autodiscovery.server.IPAddressTH"/>: ' + configSnmpIP + '</td></tr><tr><td style="padding:2px;"><fmt:message key="admin.settings.SNMPTrapOID"/> ' + configSnmpOID + '</td></tr><tr><td style="padding:2px;"><fmt:message key="admin.settings.SNMPNotificationMechanism"/> ' + configSnmpNotificationMechanism + '</td></tr></table>' + var snmpInnerHTML = + '<table cellpadding="0" cellspacing="0" border="0">' + + '<tr><td rowSpan="4" vAlign="top" style="padding-right:3px;"><fmt:message key="alert.config.escalation.action.snmp.notification"/>:</td>' + + '<td colspan="2" style="padding:2px;"><fmt:message key="resource.autodiscovery.server.IPAddressTH"/>: ' + configSnmpIP + '</td></tr>' + + '<tr><td colspan="2" style="padding:0px 2px 2px 2px;"><fmt:message key="admin.settings.SNMPNotificationMechanism"/> ' + configSnmpNotificationMechanism + '</td></tr>' + + '<tr><td vAlign="top" style="padding:2px;" nowrap="nowrap"><fmt:message key="alert.config.escalation.action.snmp.varbinds"/>: </td>' + + '<td style="padding:2px;"><table>' + + '<tr><td style="padding-right:5px;"><fmt:message key="alert.config.escalation.action.snmp.oid"/>: ' + configSnmpOID + '</td>' + + '<td>Value: {snmp_trap.gsp}</td></tr>'; + + if (typeof configSnmpVarBinds != 'object') { + configSnmpVarBinds = []; + } + for (var s = 0; s < configSnmpVarBinds.length; s++) { + snmpInnerHTML += '<tr><td style="padding-right:5px;"><fmt:message key="alert.config.escalation.action.snmp.oid"/>: ' + + configSnmpVarBinds[s].oid + '</td>' + + '<td>Value: ' + configSnmpVarBinds[s].value + '</td></tr>'; + } + snmpInnerHTML += '</table></td></tr></table>'; + usersTextDiv.innerHTML = snmpInnerHTML; } } |
|
From: <bo...@hy...> - 2010-01-24 09:24:29
|
Author: bob Date: 2010-01-24 01:24:20 -0800 (Sun, 24 Jan 2010) New Revision: 14229 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14229 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1329 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-23 09:15:13 UTC (rev 14228) +++ trunk/etc/version.properties 2010-01-24 09:24:20 UTC (rev 14229) @@ -1,3 +1,3 @@ -#Sat Jan 23 00:26:15 PST 2010 +#Sun Jan 24 00:27:48 PST 2010 version=4.3.0 -build=1328 +build=1329 |
|
From: <bo...@hy...> - 2010-01-23 09:15:25
|
Author: bob Date: 2010-01-23 01:15:13 -0800 (Sat, 23 Jan 2010) New Revision: 14228 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14228 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1328 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-23 01:51:53 UTC (rev 14227) +++ trunk/etc/version.properties 2010-01-23 09:15:13 UTC (rev 14228) @@ -1,3 +1,3 @@ -#Fri Jan 22 00:59:32 PST 2010 +#Sat Jan 23 00:26:15 PST 2010 version=4.3.0 -build=1327 +build=1328 |
|
From: Mirko P. <m.p...@gm...> - 2010-01-23 06:53:30
|
Hi, it is in bytes, because it is the actual link speed. |
|
From: <bo...@hy...> - 2010-01-23 02:20:30
|
Author: bob Date: 2010-01-22 17:51:53 -0800 (Fri, 22 Jan 2010) New Revision: 14227 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14227 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Release 4.2.0.4 build #1278 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-01-23 00:34:15 UTC (rev 14226) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-01-23 01:51:53 UTC (rev 14227) @@ -1,3 +1,3 @@ -#Thu Jan 21 17:37:00 PST 2010 +#Fri Jan 22 17:17:20 PST 2010 version=4.2.0.4 -build=1277 +build=1278 |
|
From: <no...@gi...> - 2010-01-23 01:01:53
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: 17a90836d263d71579263a3206dba6fc26dc053e http://github.com/hyperic/hqapi/commit/17a90836d263d71579263a3206dba6fc26dc053e Author: Jennifer Hickey <jen...@sp...> Date: 2010-01-22 (Fri, 22 Jan 2010) Changed paths: M build.xml A lib/com.springsource.com.cenqua.clover-2.4.2.jar Log Message: ----------- HE-414 Added clover targets to run distributed clover test (able to track coverage of HQ server and agent) |
|
From: <dcr...@hy...> - 2010-01-23 00:57:07
|
Author: dcrutchf Date: 2010-01-22 16:33:09 -0800 (Fri, 22 Jan 2010) New Revision: 14225 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14225 Modified: trunk/src/org/hyperic/hq/ui/security/SessionInitializationStrategy.java trunk/web/META-INF/security-context.xml Log: Implemented and wired up a RedirectStrategy to handle user registration for user authenticating via external auth sources Modified: trunk/src/org/hyperic/hq/ui/security/SessionInitializationStrategy.java =================================================================== --- trunk/src/org/hyperic/hq/ui/security/SessionInitializationStrategy.java 2010-01-22 23:22:31 UTC (rev 14224) +++ trunk/src/org/hyperic/hq/ui/security/SessionInitializationStrategy.java 2010-01-23 00:33:09 UTC (rev 14225) @@ -50,10 +50,10 @@ private static Log log = LogFactory.getLog(SessionInitializationStrategy.class.getName()); public void onAuthentication(Authentication authentication, HttpServletRequest request, HttpServletResponse response) throws SessionAuthenticationException { - if (log.isDebugEnabled()) { - log.debug("Initializing User Preferences..."); - } + final boolean debug = log.isDebugEnabled(); + if (debug) log.debug("Initializing User Preferences..."); + // The following is logic taken from the old HQ Authentication Filter try { AuthzSubjectManagerLocal authzSubjectManager = AuthzSubjectManagerEJBImpl.getOne(); @@ -78,10 +78,6 @@ needsRegistration = subjPojo.getEmailAddress() == null || subjPojo.getEmailAddress().length() == 0; } - if (needsRegistration && log.isDebugEnabled()) { - log.debug("Authentic user but no HQ entity...must have authenticated against LDAP/Kerberos/Other authentication handler...needs registration"); - } - // figure out if the user has a principal boolean hasPrincipal = authBoss.isUser(sessionId, subject.getName()); ConfigResponse preferences = needsRegistration ? new ConfigResponse() : getUserPreferences(ctx, sessionId, subject.getId(), authzBoss); @@ -90,9 +86,7 @@ // Add WebUser to Session session.setAttribute(Constants.WEBUSER_SES_ATTR, webUser); - if (log.isDebugEnabled()) { - log.debug("WebUser object created and stashed in the session"); - } + if (debug) log.debug("WebUser object created and stashed in the session"); // TODO - We should use Spring Security for handling user permissions... Map<String, Boolean> userOperationsMap = new HashMap<String, Boolean>(); @@ -102,9 +96,7 @@ session.setAttribute(Constants.PASSWORD_SES_ATTR, authentication.getCredentials().toString()); session.setAttribute(Constants.NEEDS_REGISTRATION, Boolean.TRUE); - if (log.isDebugEnabled()) { - log.debug("Stashing registration parameters in the session for later use"); - } + if (debug) log.debug("Stashing registration parameters in the session for later use"); } else { userOperationsMap = loadUserPermissions(webUser.getSessionId(), authzBoss); } @@ -115,9 +107,9 @@ loadDashboard(ctx, webUser, authzBoss); setXlibFlag(session); - if (log.isDebugEnabled()) { - log.debug("Stashing user operations in the session"); - } + if (debug) log.debug("Stashing user operations in the session"); + + if (debug && needsRegistration) log.debug("Authentic user but no HQ entity, must have authenticated outside of HQ...needs registration"); } catch (SessionException e) { log.error(e); Modified: trunk/web/META-INF/security-context.xml =================================================================== --- trunk/web/META-INF/security-context.xml 2010-01-22 23:22:31 UTC (rev 14224) +++ trunk/web/META-INF/security-context.xml 2010-01-23 00:33:09 UTC (rev 14225) @@ -10,7 +10,7 @@ http://www.springframework.org/schema/security/spring-security-3.0.xsd"> <!-- Auto wire our custom security beans --> <context:component-scan base-package="org.hyperic.hq.ui.security" /> - + <bean id="filterChainProxy" class="org.springframework.security.web.FilterChainProxy"> <sec:filter-chain-map path-type="ant"> <sec:filter-chain pattern="/login.jsp" filters="none" /> @@ -67,7 +67,7 @@ <bean class="org.springframework.security.web.access.AccessDeniedHandlerImpl" /> </property> </bean> - + <!-- For form-based authentication --> <bean id="formBasedAuthenticationFilter" class="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter"> <property name="authenticationManager" ref="authenticationManager" /> @@ -75,6 +75,11 @@ <property name="authenticationSuccessHandler"> <bean class="org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler"> <property name="defaultTargetUrl" value="/Dashboard.do" /> + <property name="redirectStrategy"> + <bean class="org.hyperic.hq.ui.security.RegistrationRedirectStrategy"> + <constructor-arg value="/admin/user/UserAdmin.do?mode=register" /> + </bean> + </property> </bean> </property> <property name="authenticationFailureHandler"> @@ -113,7 +118,7 @@ </property> <property name="securityMetadataSource"> <sec:filter-security-metadata-source> - <sec:intercept-url pattern="/login.jsp" /> + <sec:intercept-url pattern="/login.jsp" access="ROLE_ANONYMOUS" /> <sec:intercept-url pattern="/favicon.ico" /> <sec:intercept-url pattern="/css/**" /> <sec:intercept-url pattern="/js/**" /> |
|
From: <dcr...@hy...> - 2010-01-23 00:36:02
|
Author: dcrutchf Date: 2010-01-22 16:34:15 -0800 (Fri, 22 Jan 2010) New Revision: 14226 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14226 Added: trunk/src/org/hyperic/hq/ui/security/RegistrationRedirectStrategy.java Log: forgot the new class... Added: trunk/src/org/hyperic/hq/ui/security/RegistrationRedirectStrategy.java =================================================================== --- trunk/src/org/hyperic/hq/ui/security/RegistrationRedirectStrategy.java (rev 0) +++ trunk/src/org/hyperic/hq/ui/security/RegistrationRedirectStrategy.java 2010-01-23 00:34:15 UTC (rev 14226) @@ -0,0 +1,33 @@ +package org.hyperic.hq.ui.security; + +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.hyperic.hq.ui.Constants; +import org.springframework.security.web.RedirectStrategy; + +public class RegistrationRedirectStrategy implements RedirectStrategy { + private String registrationUrl; + + public RegistrationRedirectStrategy(String registrationUrl) { + this.registrationUrl = registrationUrl; + } + + public void sendRedirect(HttpServletRequest request, HttpServletResponse response, String url) throws IOException { + // We determine if the user needs to register with HQ + HttpSession session = request.getSession(); + Boolean needRegistration = (Boolean) session.getAttribute(Constants.NEEDS_REGISTRATION); + + if (Boolean.TRUE.equals(needRegistration)) { + // We need to go to the user registration page + session.removeAttribute(Constants.NEEDS_REGISTRATION); + + response.sendRedirect(this.registrationUrl); + } else { + response.sendRedirect(url); + } + } +} |
14 messages has been excluded from this view by a project administrator.
