Menu
▾
▴
[Hyperic-hq-discuss] hq r14053 - in trunk: . plugins/netservices/etc src/org/hyperic/hq/bizapp/server/session src/org/hyperic/hq/bizapp/shared/action src/org/hyperic/hq/ui src/org/hyperic/hq/ui/json/action/escalation/crud src/org/hyperic/hq/ui/pages src/org/hyperic/hq/ui/servlet src/org/hyperic/hq/ui/taglib/display src/org/hyperic/hq/ui/util thirdparty/lib web/admin/config web/resource/common/monitor/alerts/config
Author: dcrutchf Date: 2009-12-08 12:09:01 -0800 (Tue, 08 Dec 2009) New Revision: 14053 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14053 Added: trunk/thirdparty/lib/snmp4j-1.10.2.jar Removed: trunk/thirdparty/lib/snmp4j.jar Modified: trunk/.classpath trunk/build.xml trunk/plugins/netservices/etc/hq-plugin.xml trunk/src/org/hyperic/hq/bizapp/server/session/EventLogBossEJBImpl.java trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java trunk/src/org/hyperic/hq/ui/RenditFilter.java trunk/src/org/hyperic/hq/ui/json/action/escalation/crud/SaveAction.java trunk/src/org/hyperic/hq/ui/pages/SignIn.java trunk/src/org/hyperic/hq/ui/servlet/RenditServlet.java trunk/src/org/hyperic/hq/ui/taglib/display/ConditionalLinkDecorator.java trunk/src/org/hyperic/hq/ui/util/BizappUtils.java trunk/web/admin/config/ViewEscalation.jsp trunk/web/resource/common/monitor/alerts/config/ViewEscalation.jsp Log: SNMPv3 Changes - functionally incomplete but checked in needed for integration purposes Be sure to update hq/hq-ee dependencies to use update snmp4j library Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/.classpath 2009-12-08 20:09:01 UTC (rev 14053) @@ -39,6 +39,7 @@ <classpathentry kind="src" path="plugins/tomcat/src"/> <classpathentry kind="src" path="plugins/vim/src"/> <classpathentry kind="lib" path="plugins/vim/lib/mo.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tomcat-jk.jar"/> <classpathentry kind="src" path="plugins/vmware/src"/> <classpathentry kind="src" path="plugins/weblogic/doc"/> <classpathentry kind="src" path="plugins/weblogic/src"/> @@ -135,7 +136,6 @@ <classpathentry kind="lib" path="thirdparty/lib/quartz-1.6.5.jar"/> <classpathentry kind="lib" path="thirdparty/lib/quartz-jboss-1.6.5.jar"/> <classpathentry kind="lib" path="thirdparty/lib/quartz-oracle-1.6.5.jar"/> - <classpathentry kind="lib" path="thirdparty/lib/snmp4j.jar"/> <classpathentry kind="lib" path="thirdparty/lib/standard.jar"/> <classpathentry kind="lib" path="thirdparty/lib/struts-el.jar"/> <classpathentry kind="lib" path="thirdparty/lib/struts.jar"/> @@ -160,11 +160,6 @@ <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapestry-portlet-4.1.5.jar"/> <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapestry-prop-1.0.0.jar"/> <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapestry-test-4.1.4-JUnit.jar"/> - <classpathentry kind="lib" path="thirdparty/lib/tomcat-jk.jar"/> - <classpathentry kind="lib" path="thirdparty/lib/tomcat/tomcat-coyote.jar"/> - <classpathentry kind="lib" path="thirdparty/lib/tomcat/tomcat-http11.jar"/> - <classpathentry kind="lib" path="thirdparty/lib/tomcat/tomcat-jk2.jar"/> - <classpathentry kind="lib" path="thirdparty/lib/tomcat/tomcat-util.jar"/> <classpathentry kind="lib" path="thirdparty/lib/urlrewrite-3.1.0.jar"/> <classpathentry kind="lib" path="thirdparty/lib/velocity-1.3.1.jar"/> <classpathentry kind="lib" path="thirdparty/lib/ws-commons-util-1.0.2.jar"/> @@ -214,7 +209,7 @@ <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-jsr77.jar"/> <classpathentry kind="var" path="JBOSS_HOME/lib/jboss-system.jar"/> <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss.jar"/> - <classpathentry kind="var" path="JBOSS_HOME/server/default/deploy/jboss-web.deployer/jbossweb.jar"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/deploy/jboss-web.deployer/jbossweb.jar" sourcepath="/DOWNLOADS/apache-tomcat-6.0.13-src/java"/> <classpathentry kind="lib" path="thirdparty/lib/tomcat/catalina.jar"/> <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/> <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-j2ee.jar"/> @@ -222,5 +217,6 @@ <classpathentry kind="lib" path="thirdparty/lib/com.springsource.com.sun.xml.bind-2.1.7.jar"/> <classpathentry kind="lib" path="thirdparty/lib/com.springsource.javax.xml.bind-2.1.7.jar"/> <classpathentry kind="lib" path="thirdparty/lib/com.springsource.javax.xml.stream-1.0.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/snmp4j-1.10.2.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/build.xml 2009-12-08 20:09:01 UTC (rev 14053) @@ -461,7 +461,7 @@ <include name="quartz-1.6.5.jar" /> <include name="quartz-oracle-1.6.5.jar" /> <include name="quartz-jboss-1.6.5.jar" /> - <include name="snmp4j.jar" /> + <include name="snmp4j-1.10.2.jar" /> <include name="dnsjava-2.0.3.jar" /> <include name="ehcache-1.5.0.jar" /> <include name="jsr107cache-1.0.jar" /> <!-- EHCache 1.5 dep --> @@ -973,7 +973,7 @@ <include name="commons-logging.jar" /> <include name="log4j-1.2.14.jar" /> <include name="jakarta-oro*.jar" /> <!-- RT --> - <include name="snmp4j.jar" /> <!-- All SNMP monitoring --> + <include name="snmp4j-1.10.2.jar" /> <!-- All SNMP monitoring --> <include name="ant.jar" /> <!-- AI scans + util.TokenReplacer --> <include name="junit-3.8.jar" /> <!-- test to help with support issues --> <include name="junit-4.4.jar" /> Modified: trunk/plugins/netservices/etc/hq-plugin.xml =================================================================== --- trunk/plugins/netservices/etc/hq-plugin.xml 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/plugins/netservices/etc/hq-plugin.xml 2009-12-08 20:09:01 UTC (rev 14053) @@ -250,7 +250,8 @@ <option name="snmpCommunity" description="SNMP Community" - default="public"/> + default="public" + optional="true"/> <option name="snmpUser" description="SNMP username (v3 only)" @@ -265,11 +266,32 @@ <option name="snmpAuthType" description="SNMP auth type (v3 only)" - optional="true" - type="enum"> - <include name="md5"/> - <include name="sha"/> + type="enum" + optional="true"> + <include name="none" /> + <include name="MD5"/> + <include name="SHA"/> </option> + <option name="snmpAuthPassPhrase" + description="SNMP auth passphrase (v3 only)" + optional="true"/> + <option name="snmpPrivacyType" + description="SNMP privacy type (v3 only)" + type="enum" + optional="true"> + <include name="none" /> + <include name="DES" /> + <include name="3DES" /> + <include name="AES-128" /> + <include name="AES-192" /> + <include name="AES-256" /> + </option> + <option name="snmpPrivacyPassPhrase" + description="SNMP privacy passphrase (v3 only)" + optional="true"/> + <option name="snmpSecurityContext" + description="SNMP security context (v3 only)" + optional="true"/> </config> <!-- disabled by default, change to true for testing --> Modified: trunk/src/org/hyperic/hq/bizapp/server/session/EventLogBossEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/EventLogBossEJBImpl.java 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/src/org/hyperic/hq/bizapp/server/session/EventLogBossEJBImpl.java 2009-12-08 20:09:01 UTC (rev 14053) @@ -43,8 +43,6 @@ import org.hyperic.hq.application.HQApp; import org.hyperic.hq.common.VetoException; import org.hyperic.hq.common.SystemException; -import org.hyperic.hq.bizapp.shared.EventsBossLocal; -import org.hyperic.hq.bizapp.shared.EventsBossUtil; import org.hyperic.hq.bizapp.shared.EventLogBossLocal; import org.hyperic.hq.bizapp.shared.EventLogBossUtil; import org.apache.commons.logging.Log; Modified: trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java 2009-12-08 20:09:01 UTC (rev 14053) @@ -12,40 +12,45 @@ protected static final String CFG_OID = "oid"; protected static final String CFG_ADDRESS = "address"; - protected String _oid; - protected String _address; + protected static final String CFG_NOTIFICATION_MECHANISM = "snmpNotificationMechanism"; + + protected String oid; + protected String address; + protected String snmpNotificationMechanism; + private String implementor = "com.hyperic.hq.bizapp.server.action.alert.SnmpAction"; public SnmpActionConfig() { } - public SnmpActionConfig(String address, String oid) { - _address = address; - _oid = oid; + public SnmpActionConfig(String address, String oid, String snmpNotificationMechanism) { + this.address = address; + this.oid = oid; + this.snmpNotificationMechanism = snmpNotificationMechanism; } public void setOid(String oid) { - _oid = oid; + this.oid = oid; } public String getOid() { - return _oid; + return oid; } public void setAddress(String address) { - _address = address; + this.address = address; } public String getAddress() { - return _address; + return address; } /* (non-Javadoc) * @see org.hyperic.hq.events.ActionConfigInterface#getConfigSchema() */ public ConfigSchema getConfigSchema() { - StringConfigOption address, oid; + StringConfigOption address, oid, snmpNotificationMechanism; ConfigSchema res = new ConfigSchema(); address = new StringConfigOption(CFG_ADDRESS, @@ -57,14 +62,21 @@ oid.setMinLength(1); res.addOption(oid); + snmpNotificationMechanism = new StringConfigOption(CFG_NOTIFICATION_MECHANISM, "SNMP Notification Mechanism", "v1 Trap"); + snmpNotificationMechanism.setMinLength(1); + res.addOption(snmpNotificationMechanism); + return res; } public ConfigResponse getConfigResponse() - throws InvalidOptionException, InvalidOptionValueException { + throws InvalidOptionException, InvalidOptionValueException { ConfigResponse response = new ConfigResponse(); + response.setValue(CFG_ADDRESS, this.getAddress()); response.setValue(CFG_OID, this.getOid()); + response.setValue(CFG_NOTIFICATION_MECHANISM, this.getSnmpNotificationMechanism()); + return response; } @@ -72,6 +84,7 @@ try { setAddress(config.getValue(CFG_ADDRESS)); setOid(config.getValue(CFG_OID)); + setSnmpNotificationMechanism(config.getValue(CFG_NOTIFICATION_MECHANISM)); } catch (IllegalArgumentException ex) { throw new InvalidActionDataException(ex); } @@ -85,4 +98,11 @@ this.implementor = implementor; } + public String getSnmpNotificationMechanism() { + return snmpNotificationMechanism; + } + + public void setSnmpNotificationMechanism(String snmpNotificationMechanism) { + this.snmpNotificationMechanism = snmpNotificationMechanism; + } } Modified: trunk/src/org/hyperic/hq/ui/RenditFilter.java =================================================================== --- trunk/src/org/hyperic/hq/ui/RenditFilter.java 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/src/org/hyperic/hq/ui/RenditFilter.java 2009-12-08 20:09:01 UTC (rev 14053) @@ -26,14 +26,11 @@ package org.hyperic.hq.ui; import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; 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 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/src/org/hyperic/hq/ui/json/action/escalation/crud/SaveAction.java 2009-12-08 20:09:01 UTC (rev 14053) @@ -106,8 +106,9 @@ { String address = ((String[])p.get("snmpIP"))[0]; String oid = ((String[])p.get("snmpOID"))[0]; + String snmpNotificationMechanism = ((String[])p.get("snmpNotificationMechanism"))[0]; - return new SnmpActionConfig(address, oid); + return new SnmpActionConfig(address, oid, snmpNotificationMechanism); } private ActionConfigInterface Modified: trunk/src/org/hyperic/hq/ui/pages/SignIn.java =================================================================== --- trunk/src/org/hyperic/hq/ui/pages/SignIn.java 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/src/org/hyperic/hq/ui/pages/SignIn.java 2009-12-08 20:09:01 UTC (rev 14053) @@ -44,17 +44,13 @@ import org.apache.tapestry.RedirectException; import org.apache.tapestry.annotations.Component; import org.apache.tapestry.annotations.InitialValue; -import org.apache.tapestry.annotations.InjectObject; import org.apache.tapestry.annotations.Meta; import org.apache.tapestry.annotations.Persist; -import org.apache.tapestry.callback.ICallback; -import org.apache.tapestry.engine.IEngineService; import org.apache.tapestry.engine.ILink; import org.apache.tapestry.link.PageLink; import org.hyperic.hq.auth.shared.SessionNotFoundException; import org.hyperic.hq.auth.shared.SessionTimeoutException; 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.AuthzSubjectValue; import org.hyperic.hq.authz.shared.PermissionException; @@ -65,7 +61,6 @@ import org.hyperic.hq.ui.WebUser; import org.hyperic.hq.ui.server.session.DashboardManagerEJBImpl; import org.hyperic.hq.ui.server.session.UserDashboardConfig; -import org.hyperic.hq.ui.service.SearchService; import org.hyperic.hq.ui.shared.DashboardManagerLocal; import org.hyperic.hq.ui.util.ContextUtils; import org.hyperic.image.widget.ResourceTree; Modified: trunk/src/org/hyperic/hq/ui/servlet/RenditServlet.java =================================================================== --- trunk/src/org/hyperic/hq/ui/servlet/RenditServlet.java 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/src/org/hyperic/hq/ui/servlet/RenditServlet.java 2009-12-08 20:09:01 UTC (rev 14053) @@ -31,7 +31,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletRequest; import org.apache.catalina.Globals; import org.apache.commons.logging.Log; Modified: trunk/src/org/hyperic/hq/ui/taglib/display/ConditionalLinkDecorator.java =================================================================== --- trunk/src/org/hyperic/hq/ui/taglib/display/ConditionalLinkDecorator.java 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/src/org/hyperic/hq/ui/taglib/display/ConditionalLinkDecorator.java 2009-12-08 20:09:01 UTC (rev 14053) @@ -17,7 +17,7 @@ @Override public String decorate(Object columnValue) { // This is the actual text of the column taken from the column tag... - String alertDefinitionName = (String) columnValue; + String columnText = (String) columnValue; // ...now figure out if we have to render a link or not, if we can't // determine it, we just render the plain text as the default behavior... @@ -55,14 +55,14 @@ StringBuffer result = new StringBuffer(); result.append("<a href=\"").append(href).append("\">"); - result.append(alertDefinitionName); + result.append(columnText); result.append("</a>"); return result.toString(); } } - return alertDefinitionName; + return columnText; } public String getTest() { Modified: trunk/src/org/hyperic/hq/ui/util/BizappUtils.java =================================================================== --- trunk/src/org/hyperic/hq/ui/util/BizappUtils.java 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/src/org/hyperic/hq/ui/util/BizappUtils.java 2009-12-08 20:09:01 UTC (rev 14053) @@ -1148,6 +1148,21 @@ } + /* + Collections.sort(uiAgents, new Comparator() { + public int compare(Object o1, Object o2) { + AgentBean a1 = (AgentBean) o1; + AgentBean a2 = (AgentBean) o2; + + if (a1.getIp().equals(a2.getIp())) { + return a1.getPort().compareTo(a2.getPort()); + } + + return a1.getIp().compareToIgnoreCase(a2.getIp()); + } + }); + */ + form.setAgents(uiAgents); request.setAttribute(Constants.AGENTS_COUNT, new Integer(uiAgents.size())); Added: trunk/thirdparty/lib/snmp4j-1.10.2.jar =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/lib/snmp4j-1.10.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/thirdparty/lib/snmp4j.jar =================================================================== (Binary files differ) Modified: trunk/web/admin/config/ViewEscalation.jsp =================================================================== --- trunk/web/admin/config/ViewEscalation.jsp 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/web/admin/config/ViewEscalation.jsp 2009-12-08 20:09:01 UTC (rev 14053) @@ -178,6 +178,7 @@ var configProduct = actionConfig.product; var configSnmpOID = actionConfig.oid; var configSnmpIP = actionConfig.address; + var configSnmpNotificationMechanism = actionConfig.snmpNotificationMechanism; var actionId = actions[i].action.id; var actionsClassName = actions[i].action.className; var actionsVersion = actions[i].action._version_; @@ -274,7 +275,7 @@ 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></table>' + 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>' } } @@ -485,7 +486,7 @@ 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></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=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>'; escTr1.appendChild(td1); @@ -573,7 +574,7 @@ 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>"; + 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>"; td4.appendChild(usersDiv); usersDiv.setAttribute('id', 'usersDiv' + liID); @@ -633,6 +634,12 @@ OIDDisplay.innerHTML = '<fmt:message key="admin.settings.SNMPTrapOID"/> ' + el.value; } +function copySnmpNotificationMechanism(el) { + var display = dojo11.byId('NotificationMechanismText'); + display.style.display = ""; + display.innerHTML = '<fmt:message key="admin.settings.SNMPNotificationMechanism"/> ' + el.value; +} + function copysnmpIP(el) { var IPDisplay = dojo11.byId('IPText'); IPDisplay.style.display = ""; @@ -647,6 +654,7 @@ dojo11.byId('time').innerHTML = ""; dojo11.byId('IPText').innerHTML = ""; dojo11.byId('OIDText').innerHTML = ""; + dojo11.byId('NotificationMechanismText').innerHTML = ""; } function clearOthers() { Modified: trunk/web/resource/common/monitor/alerts/config/ViewEscalation.jsp =================================================================== --- trunk/web/resource/common/monitor/alerts/config/ViewEscalation.jsp 2009-12-08 08:51:05 UTC (rev 14052) +++ trunk/web/resource/common/monitor/alerts/config/ViewEscalation.jsp 2009-12-08 20:09:01 UTC (rev 14053) @@ -79,6 +79,7 @@ var configProduct = actionConfig.product; var configSnmpOID = actionConfig.oid; var configSnmpIP = actionConfig.address; + var configSnmpNotificationMechanism = actionConfig.snmpNotificationMechanism; var actionId = actions[i].action.id; var actionsClassName = actions[i].action.className; var actionsVersion = actions[i].action._version_; @@ -162,7 +163,7 @@ 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></table>' + 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>' } } |
