Repository: ambari Updated Branches: refs/heads/branch-2.6 2cf8cb85b -> 8e35277c2
AMBARI-22458 - SNMP Trap should contain sysuptime field filled (Amarnathreddy Pappu via jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e35277c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e35277c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e35277c Branch: refs/heads/branch-2.6 Commit: 8e35277c24cc0ffd897c1dc727b2cc528cb8148b Parents: 2cf8cb8 Author: Jonathan Hurley <[email protected]> Authored: Tue Nov 28 10:29:59 2017 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Tue Nov 28 10:29:59 2017 -0500 ---------------------------------------------------------------------- .../notifications/dispatchers/AmbariSNMPDispatcher.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8e35277c/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java index 1eb9977..96bbe0b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java @@ -33,11 +33,15 @@ import org.snmp4j.smi.OID; import org.snmp4j.smi.OctetString; import org.snmp4j.smi.VariableBinding; import org.snmp4j.util.DefaultPDUFactory; +import org.snmp4j.smi.TimeTicks; import java.io.IOException; import java.math.BigDecimal; import java.util.*; +import java.lang.management.RuntimeMXBean; +import java.lang.management.ManagementFactory; + /** * The {@link AmbariSNMPDispatcher} class is used to dispatch {@link AlertNotification} via SNMP using predefined Ambari OIDs. * @@ -110,7 +114,12 @@ public class AmbariSNMPDispatcher extends SNMPDispatcher { } pdu.setType(snmpVersion.getTrapType()); - // Set trap oid for PDU + + RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean(); + long uptimeInMillis = runtimeMXBean.getUptime(); + pdu.add(new VariableBinding(SnmpConstants.sysUpTime, new TimeTicks(uptimeInMillis))); + + // Set trap oid for PDU pdu.add(new VariableBinding(SnmpConstants.snmpTrapOID, new OID(AMBARI_ALERT_TRAP_OID))); // Set notification body and subject for PDU objects with identifiers specified in dispatch properties. AlertNoticeDispatchService.AlertInfo alertInfo = alertNotification.getAlertInfo();
