From 0c2dd37e0a7612e99bdd7463497cde1c293b02be Mon Sep 17 00:00:00 2001 From: Nicholas Radonicich Date: Thu, 21 Sep 2017 21:32:08 -0400 Subject: [PATCH] Adding snmp sysUpTime to trap --- CHANGELOG.md | 1 + integrations/streamer_test.go | 10 ++++++++++ server/server_test.go | 5 +++++ services/snmptrap/service.go | 1 + 4 files changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cd0c6915..9534e356d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - [#1500](https://github.com/influxdata/kapacitor/pull/1500): Fix bugs with stopping running UDF agent. - [#1470](https://github.com/influxdata/kapacitor/pull/1470): Fix error messages for missing fields which are arguments to functions are not clear - [#1516](https://github.com/influxdata/kapacitor/pull/1516): Fix bad PagerDuty test the required server info. +- [#1581](https://github.com/influxdata/kapacitor/pull/1581): Add SNMP sysUpTime to SNMP Trap service ## v1.3.3 [2017-08-11] diff --git a/integrations/streamer_test.go b/integrations/streamer_test.go index d22c619fd..53f874c25 100644 --- a/integrations/streamer_test.go +++ b/integrations/streamer_test.go @@ -8686,6 +8686,11 @@ stream Type: snmpgo.SNMPTrapV2, ErrorStatus: snmpgo.NoError, VarBinds: snmptraptest.VarBinds{ + { + Oid: "1.3.6.1.2.1.1.3.0", + Value: "1000", + Type: "TimeTicks", + }, { Oid: "1.3.6.1.6.3.1.1.4.1.0", Value: "1.1.1", @@ -8714,6 +8719,11 @@ stream Type: snmpgo.SNMPTrapV2, ErrorStatus: snmpgo.NoError, VarBinds: snmptraptest.VarBinds{ + { + Oid: "1.3.6.1.2.1.1.3.0", + Value: "1000", + Type: "TimeTicks", + }, { Oid: "1.3.6.1.6.3.1.1.4.1.0", Value: "1.1.2", diff --git a/server/server_test.go b/server/server_test.go index d65987286..34e5e39f9 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -8627,6 +8627,11 @@ func TestServer_AlertHandlers(t *testing.T) { Type: snmpgo.SNMPTrapV2, ErrorStatus: snmpgo.NoError, VarBinds: snmptraptest.VarBinds{ + { + Oid: "1.3.6.1.2.1.1.3.0", + Value: "1000", + Type: "TimeTicks", + }, { Oid: "1.3.6.1.6.3.1.1.4.1.0", Value: "1.1.2", diff --git a/services/snmptrap/service.go b/services/snmptrap/service.go index 29a507e50..24989e5d4 100644 --- a/services/snmptrap/service.go +++ b/services/snmptrap/service.go @@ -138,6 +138,7 @@ func (s *Service) Trap(trapOid string, dataList []Data) error { return errors.Wrapf(err, "invalid trap Oid %q", trapOid) } varBinds := snmpgo.VarBinds{ + snmpgo.NewVarBind(snmpgo.OidSysUpTime, snmpgo.NewTimeTicks(1000)), snmpgo.NewVarBind(snmpgo.OidSnmpTrap, oid), }