From 83d4c26d64c1c8bb393f7e3eb7281c787c8e558f Mon Sep 17 00:00:00 2001 From: WingkaiHo Date: Fri, 14 Apr 2017 18:01:55 +0800 Subject: [PATCH 1/3] fix snmptrap alerts info omit to send the field of SnmpConstants.sysUpTime --- .../src/org/apache/cloudstack/alert/snmp/SnmpHelper.java | 4 +++- 1 file changed, 3 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 576abf3020f0..db8511712bf2 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.util.Date; import org.snmp4j.CommunityTarget; import org.snmp4j.PDU; @@ -65,6 +66,7 @@ private PDU createPDU(SnmpTrapInfo snmpTrapInfo) { int alertType = snmpTrapInfo.getAlertType() + 1; if (alertType > 0) { + trap.add(new VariableBinding(SnmpConstants.sysUpTime, new OctetString(new Date().toString()))); 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 +101,4 @@ private PDU createPDU(SnmpTrapInfo snmpTrapInfo) { private OID getOID(String oidString) { return new OID(oidString); } -} \ No newline at end of file +} From a6906d434ee67f4c986d7ad1c947e88810a720e1 Mon Sep 17 00:00:00 2001 From: WingkaiHo Date: Mon, 17 Apr 2017 18:23:32 +0800 Subject: [PATCH 2/3] fix SnmpConstants.sysUpTime expression --- .../src/org/apache/cloudstack/alert/snmp/SnmpHelper.java | 5 ++++- 1 file changed, 4 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 db8511712bf2..8e2481d9ee6f 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 java.util.Date; import org.snmp4j.CommunityTarget; @@ -28,6 +29,7 @@ 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; @@ -66,7 +68,8 @@ private PDU createPDU(SnmpTrapInfo snmpTrapInfo) { int alertType = snmpTrapInfo.getAlertType() + 1; if (alertType > 0) { - trap.add(new VariableBinding(SnmpConstants.sysUpTime, new OctetString(new Date().toString()))); + 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()))); From 133b0336cd67b902741abc0d673700616ddcc714 Mon Sep 17 00:00:00 2001 From: WingkaiHo Date: Tue, 18 Apr 2017 14:57:40 +0800 Subject: [PATCH 3/3] Remove unused import java.util.Date --- .../src/org/apache/cloudstack/alert/snmp/SnmpHelper.java | 1 - 1 file changed, 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 8e2481d9ee6f..80f07af8c933 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.lang.management.ManagementFactory; -import java.util.Date; import org.snmp4j.CommunityTarget; import org.snmp4j.PDU;