This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push: new d95ba43 CLOUDSTACK-10208: Fix snmptrap alert bug (#2045) d95ba43 is described below commit d95ba438f66d81fd8320a75f12d8f50d41c96e1c Author: WingKai Ho <sanguosif...@163.com> AuthorDate: Wed Dec 27 01:57:16 2017 -0600 CLOUDSTACK-10208: Fix snmptrap alert bug (#2045) Fix snmptrap alerts info omit to send the field of SnmpConstants.sysUpTime Fix SnmpConstants.sysUpTime expression Remove unused import java.util.Date --- .../src/org/apache/cloudstack/alert/snmp/SnmpHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java b/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java index 576abf3..80f07af 100644 --- a/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java +++ b/plugins/alert-handlers/snmp-alerts/src/org/apache/cloudstack/alert/snmp/SnmpHelper.java @@ -18,6 +18,7 @@ package org.apache.cloudstack.alert.snmp; import java.io.IOException; +import java.lang.management.ManagementFactory; import org.snmp4j.CommunityTarget; import org.snmp4j.PDU; @@ -27,6 +28,7 @@ import org.snmp4j.smi.OID; import org.snmp4j.smi.OctetString; import org.snmp4j.smi.UdpAddress; import org.snmp4j.smi.UnsignedInteger32; +import org.snmp4j.smi.TimeTicks; import org.snmp4j.smi.VariableBinding; import org.snmp4j.transport.DefaultUdpTransportMapping; @@ -65,6 +67,8 @@ public class SnmpHelper { int alertType = snmpTrapInfo.getAlertType() + 1; if (alertType > 0) { + long sysUpTimeTicks = ManagementFactory.getRuntimeMXBean().getUptime() / 10; + trap.add(new VariableBinding(SnmpConstants.sysUpTime, new TimeTicks(sysUpTimeTicks))); trap.add(new VariableBinding(SnmpConstants.snmpTrapOID, getOID(CsSnmpConstants.TRAPS_PREFIX + alertType))); if (snmpTrapInfo.getDataCenterId() != 0) { trap.add(new VariableBinding(getOID(CsSnmpConstants.DATA_CENTER_ID), new UnsignedInteger32(snmpTrapInfo.getDataCenterId()))); @@ -99,4 +103,4 @@ public class SnmpHelper { private OID getOID(String oidString) { return new OID(oidString); } -} \ No newline at end of file +} -- To stop receiving notification emails like this one, please contact ['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].