From 50af8bfc395464314668a8807be3e5f7ea26b0de Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Fri, 14 Dec 2018 16:54:54 +0100 Subject: [PATCH] Deps: Depend on go-syslog branch Signed-off-by: Leonardo Di Donato --- Gopkg.lock | 25 ++++++++++++++++++++----- Gopkg.toml | 2 +- plugins/inputs/syslog/README.md | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index d043bccd005ad..40caf5482e74e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -583,15 +583,17 @@ version = "v0.8.1" [[projects]] - digest = "1:a39ef049cdeee03a57b132e7d60e32711b9d949c78458da78e702d9864c54369" + branch = "feature/rfc6587" + digest = "1:7db3a48fdc8b0ff3930cce77315e402535a2247b75cf86661b6a9d6f14d73823" name = "github.com/influxdata/go-syslog" packages = [ + ".", + "nontransparent", + "octetcounting", "rfc5424", - "rfc5425", ] pruneopts = "" - revision = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e" - version = "v1.0.1" + revision = "5d2495909cc75526562d366079488d23cf1b2ae9" [[projects]] branch = "master" @@ -689,6 +691,17 @@ pruneopts = "" revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0" +[[projects]] + branch = "develop" + digest = "1:3e66a61a57bbbe832c338edb3a623be0deb3dec650c2f3515149658898287e37" + name = "github.com/leodido/ragel-machinery" + packages = [ + ".", + "parser", + ] + pruneopts = "" + revision = "299bdde78165d4ca4bc7d064d8d6a4f39ac6de8c" + [[projects]] branch = "master" digest = "1:7e9956922e349af0190afa0b6621befcd201072679d8e51a9047ff149f2afe93" @@ -1478,8 +1491,10 @@ "github.com/google/go-cmp/cmp", "github.com/gorilla/mux", "github.com/hashicorp/consul/api", + "github.com/influxdata/go-syslog", + "github.com/influxdata/go-syslog/nontransparent", + "github.com/influxdata/go-syslog/octetcounting", "github.com/influxdata/go-syslog/rfc5424", - "github.com/influxdata/go-syslog/rfc5425", "github.com/influxdata/tail", "github.com/influxdata/toml", "github.com/influxdata/toml/ast", diff --git a/Gopkg.toml b/Gopkg.toml index 366ec6db9f7c1..cc77a569016a7 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -72,7 +72,7 @@ [[constraint]] name = "github.com/influxdata/go-syslog" - version = "feature/rfc6587" + branch = "feature/rfc6587" [[constraint]] name = "github.com/influxdata/tail" diff --git a/plugins/inputs/syslog/README.md b/plugins/inputs/syslog/README.md index 68018cda529a4..baa7a7a32ad32 100644 --- a/plugins/inputs/syslog/README.md +++ b/plugins/inputs/syslog/README.md @@ -3,7 +3,7 @@ The syslog plugin listens for syslog messages transmitted over [UDP](https://tools.ietf.org/html/rfc5426) or [TCP](https://tools.ietf.org/html/rfc6587) or -[TLS](https://tools.ietf.org/html/rfc5425), with or without the octet couting framing. +[TLS](https://tools.ietf.org/html/rfc5425), with or without the octet counting framing. Syslog messages should be formatted according to [RFC 5424](https://tools.ietf.org/html/rfc5424).