From 2b6a15909bffdb7bdd9b38a162b63f4d5a6968e6 Mon Sep 17 00:00:00 2001 From: Anderson Queiroz Date: Tue, 25 Jul 2023 18:19:09 +0200 Subject: [PATCH] move ragel files to root directory the //line directives used to point to the original "ragel" files were creating problems for the coverage tool. They were being reported without the 'parser/' directory. Causing the go tool cover to look for the wrong files and therefore failing. Moving it all to the root directory fixes the problem. --- filebeat/input/syslog/{parser => }/common.rl | 0 filebeat/input/syslog/format_check.go | 8 +- .../input/syslog/{parser => }/format_check.rl | 0 filebeat/input/syslog/input.go | 6 +- filebeat/input/syslog/rfc3164_parser.go | 210 +++++++++--------- .../syslog/{parser => }/rfc3164_parser.rl | 0 filebeat/input/syslog/rfc5424_parser.go | 118 +++++----- .../syslog/{parser => }/rfc5424_parser.rl | 0 .../syslog/{parser => }/syslog_rfc3164.rl | 0 .../syslog/{parser => }/syslog_rfc5424.rl | 0 10 files changed, 171 insertions(+), 171 deletions(-) rename filebeat/input/syslog/{parser => }/common.rl (100%) rename filebeat/input/syslog/{parser => }/format_check.rl (100%) rename filebeat/input/syslog/{parser => }/rfc3164_parser.rl (100%) rename filebeat/input/syslog/{parser => }/rfc5424_parser.rl (100%) rename filebeat/input/syslog/{parser => }/syslog_rfc3164.rl (100%) rename filebeat/input/syslog/{parser => }/syslog_rfc5424.rl (100%) diff --git a/filebeat/input/syslog/parser/common.rl b/filebeat/input/syslog/common.rl similarity index 100% rename from filebeat/input/syslog/parser/common.rl rename to filebeat/input/syslog/common.rl diff --git a/filebeat/input/syslog/format_check.go b/filebeat/input/syslog/format_check.go index 5ba3e551003..c67159d4acd 100644 --- a/filebeat/input/syslog/format_check.go +++ b/filebeat/input/syslog/format_check.go @@ -17,7 +17,7 @@ // Code generated by ragel DO NOT EDIT. // -//line parser/format_check.rl:1 +//line format_check.rl:1 package syslog //line format_check.go:8 @@ -27,7 +27,7 @@ const format_check_error int = 0 const format_check_en_main int = 1 -//line parser/format_check.rl:9 +//line format_check.rl:9 func IsRFC5424Format(data []byte) bool { var p, cs int @@ -143,7 +143,7 @@ func IsRFC5424Format(data []byte) bool { } goto st0 tr9: -//line parser/format_check.rl:17 +//line format_check.rl:17 isRFC5424 = true @@ -294,7 +294,7 @@ func IsRFC5424Format(data []byte) bool { } } -//line parser/format_check.rl:28 +//line format_check.rl:28 return isRFC5424 } diff --git a/filebeat/input/syslog/parser/format_check.rl b/filebeat/input/syslog/format_check.rl similarity index 100% rename from filebeat/input/syslog/parser/format_check.rl rename to filebeat/input/syslog/format_check.rl diff --git a/filebeat/input/syslog/input.go b/filebeat/input/syslog/input.go index 702472794dd..7a13769d195 100644 --- a/filebeat/input/syslog/input.go +++ b/filebeat/input/syslog/input.go @@ -34,9 +34,9 @@ import ( ) // Parser is generated from a ragel state machine using the following command: -//go:generate ragel -Z -G2 parser/rfc3164_parser.rl -o rfc3164_parser.go -//go:generate ragel -Z -G2 parser/rfc5424_parser.rl -o rfc5424_parser.go -//go:generate ragel -Z -G2 parser/format_check.rl -o format_check.go +//go:generate ragel -Z -G2 rfc3164_parser.rl -o rfc3164_parser.go +//go:generate ragel -Z -G2 rfc5424_parser.rl -o rfc5424_parser.go +//go:generate ragel -Z -G2 format_check.rl -o format_check.go //go:generate goimports -l -w rfc3164_parser.go //go:generate goimports -l -w rfc5424_parser.go diff --git a/filebeat/input/syslog/rfc3164_parser.go b/filebeat/input/syslog/rfc3164_parser.go index d717ee7be4c..c8cc7bbbe1c 100644 --- a/filebeat/input/syslog/rfc3164_parser.go +++ b/filebeat/input/syslog/rfc3164_parser.go @@ -17,7 +17,7 @@ // Code generated by ragel DO NOT EDIT. // -//line parser/rfc3164_parser.rl:1 +//line rfc3164_parser.rl:1 package syslog //line rfc3164_parser.go:8 @@ -28,7 +28,7 @@ const syslog_rfc3154_error int = -1 const syslog_rfc3154_en_main int = 0 const syslog_rfc3154_en_catch_all int = 1 -//line parser/rfc3164_parser.rl:9 +//line rfc3164_parser.rl:9 var ( noDuplicates = []byte{'-', '.'} @@ -332,17 +332,17 @@ func ParserRFC3164(data []byte, event *event) { } goto tr0 tr0: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st2 tr134: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -355,17 +355,17 @@ func ParserRFC3164(data []byte, event *event) { //line rfc3164_parser.go:342 goto st2 tr1: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st3 tr135: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -399,17 +399,17 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr14: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st4 tr136: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -452,7 +452,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr18: -//line parser/common.rl:19 +//line common.rl:19 event.SetYear(data[tok:p]) @@ -468,7 +468,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr19: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -493,7 +493,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr21: -//line parser/common.rl:23 +//line common.rl:23 event.SetMonthNumeric(data[tok:p]) @@ -509,7 +509,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr22: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -542,7 +542,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr24: -//line parser/common.rl:27 +//line common.rl:27 event.SetDay(data[tok:p]) @@ -561,7 +561,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr25: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -586,7 +586,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr28: -//line parser/common.rl:31 +//line common.rl:31 event.SetHour(data[tok:p]) @@ -602,7 +602,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr29: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -627,7 +627,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr31: -//line parser/common.rl:35 +//line common.rl:35 event.SetMinute(data[tok:p]) @@ -643,7 +643,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr32: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -684,19 +684,19 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr34: -//line parser/common.rl:39 +//line common.rl:39 event.SetSecond(data[tok:p]) goto st23 tr61: -//line parser/common.rl:103 +//line common.rl:103 event.SetTimeZone(data[tok:p]) goto st23 tr68: -//line parser/common.rl:43 +//line common.rl:43 event.SetNanosecond(data[tok:p]) @@ -732,11 +732,11 @@ func ParserRFC3164(data []byte, event *event) { } goto tr0 tr39: -//line parser/common.rl:3 +//line common.rl:3 tok = p -//line parser/common.rl:80 +//line common.rl:80 if p-1 > 0 { for _, b := range noDuplicates { @@ -751,7 +751,7 @@ func ParserRFC3164(data []byte, event *event) { goto st24 tr42: -//line parser/common.rl:80 +//line common.rl:80 if p-1 > 0 { for _, b := range noDuplicates { @@ -796,11 +796,11 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr40: -//line parser/common.rl:3 +//line common.rl:3 tok = p -//line parser/common.rl:80 +//line common.rl:80 if p-1 > 0 { for _, b := range noDuplicates { @@ -815,7 +815,7 @@ func ParserRFC3164(data []byte, event *event) { goto st25 tr43: -//line parser/common.rl:80 +//line common.rl:80 if p-1 > 0 { for _, b := range noDuplicates { @@ -867,7 +867,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr45: -//line parser/common.rl:91 +//line common.rl:91 event.SetHostname(data[tok:p]) @@ -891,7 +891,7 @@ func ParserRFC3164(data []byte, event *event) { } goto tr47 tr47: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -917,7 +917,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st27 tr49: -//line parser/common.rl:95 +//line common.rl:95 event.SetProgram(data[tok:p]) @@ -949,7 +949,7 @@ func ParserRFC3164(data []byte, event *event) { st_case_29: goto tr0 tr50: -//line parser/common.rl:95 +//line common.rl:95 event.SetProgram(data[tok:p]) @@ -965,7 +965,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr52: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -984,7 +984,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr54: -//line parser/common.rl:99 +//line common.rl:99 event.SetPid(data[tok:p]) @@ -1012,7 +1012,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr46: -//line parser/common.rl:80 +//line common.rl:80 if p-1 > 0 { for _, b := range noDuplicates { @@ -1025,7 +1025,7 @@ func ParserRFC3164(data []byte, event *event) { } } -//line parser/common.rl:91 +//line common.rl:91 event.SetHostname(data[tok:p]) @@ -1068,7 +1068,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr57: -//line parser/common.rl:80 +//line common.rl:80 if p-1 > 0 { for _, b := range noDuplicates { @@ -1083,7 +1083,7 @@ func ParserRFC3164(data []byte, event *event) { goto st35 tr58: -//line parser/common.rl:80 +//line common.rl:80 if p-1 > 0 { for _, b := range noDuplicates { @@ -1096,7 +1096,7 @@ func ParserRFC3164(data []byte, event *event) { } } -//line parser/common.rl:91 +//line common.rl:91 event.SetHostname(data[tok:p]) @@ -1139,11 +1139,11 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr41: -//line parser/common.rl:3 +//line common.rl:3 tok = p -//line parser/common.rl:80 +//line common.rl:80 if p-1 > 0 { for _, b := range noDuplicates { @@ -1158,7 +1158,7 @@ func ParserRFC3164(data []byte, event *event) { goto st36 tr44: -//line parser/common.rl:80 +//line common.rl:80 if p-1 > 0 { for _, b := range noDuplicates { @@ -1203,21 +1203,21 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr35: -//line parser/common.rl:39 +//line common.rl:39 event.SetSecond(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st37 tr69: -//line parser/common.rl:43 +//line common.rl:43 event.SetNanosecond(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1286,19 +1286,19 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr37: -//line parser/common.rl:39 +//line common.rl:39 event.SetSecond(data[tok:p]) goto st42 tr65: -//line parser/common.rl:103 +//line common.rl:103 event.SetTimeZone(data[tok:p]) goto st42 tr71: -//line parser/common.rl:43 +//line common.rl:43 event.SetNanosecond(data[tok:p]) @@ -1317,7 +1317,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr63: -//line parser/common.rl:103 +//line common.rl:103 event.SetTimeZone(data[tok:p]) @@ -1341,7 +1341,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr36: -//line parser/common.rl:39 +//line common.rl:39 event.SetSecond(data[tok:p]) @@ -1357,7 +1357,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr67: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1392,21 +1392,21 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr38: -//line parser/common.rl:39 +//line common.rl:39 event.SetSecond(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st46 tr72: -//line parser/common.rl:43 +//line common.rl:43 event.SetNanosecond(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1432,7 +1432,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr26: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1448,17 +1448,17 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr4: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st48 tr137: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1501,7 +1501,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr77: -//line parser/common.rl:15 +//line common.rl:15 event.SetMonth(data[tok:p]) @@ -1543,7 +1543,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr83: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1562,7 +1562,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr84: -//line parser/common.rl:27 +//line common.rl:27 event.SetDay(data[tok:p]) @@ -1581,7 +1581,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr85: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1606,7 +1606,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr88: -//line parser/common.rl:31 +//line common.rl:31 event.SetHour(data[tok:p]) @@ -1622,7 +1622,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr89: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1647,7 +1647,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr91: -//line parser/common.rl:35 +//line common.rl:35 event.SetMinute(data[tok:p]) @@ -1663,7 +1663,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr92: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1696,7 +1696,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr94: -//line parser/common.rl:39 +//line common.rl:39 event.SetSecond(data[tok:p]) @@ -1712,7 +1712,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr95: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1739,7 +1739,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr86: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1755,7 +1755,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr80: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1771,7 +1771,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr81: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1795,7 +1795,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr82: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1882,17 +1882,17 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr5: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st75 tr138: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1968,17 +1968,17 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr6: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st82 tr139: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2054,17 +2054,17 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr7: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st89 tr140: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2149,17 +2149,17 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr8: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st95 tr141: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2216,17 +2216,17 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr9: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st99 tr142: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2251,17 +2251,17 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr10: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st101 tr143: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2301,17 +2301,17 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr11: -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st104 tr144: -//line parser/common.rl:107 +//line common.rl:107 event.SetSequence(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2360,7 +2360,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr2: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2442,7 +2442,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr133: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2482,7 +2482,7 @@ func ParserRFC3164(data []byte, event *event) { } goto tr134 tr3: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2498,7 +2498,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr145: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2562,7 +2562,7 @@ func ParserRFC3164(data []byte, event *event) { } goto st2 tr147: -//line parser/common.rl:7 +//line common.rl:7 event.SetPriority(data[tok:p]) @@ -2608,7 +2608,7 @@ func ParserRFC3164(data []byte, event *event) { st_case_1: goto tr12 tr12: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2994,7 +2994,7 @@ func ParserRFC3164(data []byte, event *event) { if (p) == eof { switch cs { case 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122: -//line parser/common.rl:11 +//line common.rl:11 event.SetMessage(data[tok:p]) @@ -3004,6 +3004,6 @@ func ParserRFC3164(data []byte, event *event) { } -//line parser/rfc3164_parser.rl:28 +//line rfc3164_parser.rl:28 } diff --git a/filebeat/input/syslog/parser/rfc3164_parser.rl b/filebeat/input/syslog/rfc3164_parser.rl similarity index 100% rename from filebeat/input/syslog/parser/rfc3164_parser.rl rename to filebeat/input/syslog/rfc3164_parser.rl diff --git a/filebeat/input/syslog/rfc5424_parser.go b/filebeat/input/syslog/rfc5424_parser.go index 7d9761b5ad4..224995b5cb6 100644 --- a/filebeat/input/syslog/rfc5424_parser.go +++ b/filebeat/input/syslog/rfc5424_parser.go @@ -17,7 +17,7 @@ // Code generated by ragel DO NOT EDIT. // -//line parser/rfc5424_parser.rl:1 +//line rfc5424_parser.rl:1 package syslog //line rfc5424_parser.go:8 @@ -27,7 +27,7 @@ const syslog_rfc5424_error int = 0 const syslog_rfc5424_en_main int = 1 -//line parser/rfc5424_parser.rl:9 +//line rfc5424_parser.rl:9 type machineState struct { sd_id string @@ -1266,7 +1266,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr2: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1282,7 +1282,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr5: -//line parser/common.rl:7 +//line common.rl:7 event.SetPriority(data[tok:p]) @@ -1298,7 +1298,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr6: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1317,7 +1317,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr7: -//line parser/common.rl:111 +//line common.rl:111 event.SetVersion(data[tok:p]) @@ -1345,7 +1345,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr586: -//line parser/common.rl:103 +//line common.rl:103 event.SetTimeZone(data[tok:p]) @@ -1361,7 +1361,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr12: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1380,7 +1380,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr13: -//line parser/common.rl:91 +//line common.rl:91 event.SetHostname(data[tok:p]) @@ -1396,7 +1396,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr15: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1415,7 +1415,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr16: -//line parser/common.rl:115 +//line common.rl:115 event.SetAppName(data[tok:p]) @@ -1431,7 +1431,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr18: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1450,7 +1450,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr19: -//line parser/common.rl:119 +//line common.rl:119 event.SetProcID(data[tok:p]) @@ -1466,7 +1466,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr21: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1485,7 +1485,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr22: -//line parser/common.rl:123 +//line common.rl:123 event.SetMsgID(data[tok:p]) @@ -1519,7 +1519,7 @@ func ParserRFC5424(data []byte, event *event) { st_case_589: goto tr600 tr600: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1532,7 +1532,7 @@ func ParserRFC5424(data []byte, event *event) { //line rfc5424_parser.go:1519 goto st590 tr25: -//line parser/common.rl:48 +//line common.rl:48 event.data = EventData{} @@ -1560,7 +1560,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr26: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -1589,7 +1589,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr27: -//line parser/common.rl:64 +//line common.rl:64 state.sd_id = string(data[tok:p]) if _, ok := event.data[state.sd_id]; ok { @@ -1623,7 +1623,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr30: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2259,7 +2259,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr32: -//line parser/common.rl:56 +//line common.rl:56 state.sd_param_name = string(data[tok:p]) @@ -2289,7 +2289,7 @@ func ParserRFC5424(data []byte, event *event) { } goto tr64 tr64: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -2310,11 +2310,11 @@ func ParserRFC5424(data []byte, event *event) { } goto st54 tr67: -//line parser/common.rl:60 +//line common.rl:60 event.SetData(state.sd_id, state.sd_param_name, data, tok, p, state.sd_value_bs) -//line parser/common.rl:52 +//line common.rl:52 state.sd_value_bs = []int{} @@ -2343,7 +2343,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr29: -//line parser/common.rl:64 +//line common.rl:64 state.sd_id = string(data[tok:p]) if _, ok := event.data[state.sd_id]; ok { @@ -2368,17 +2368,17 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr65: -//line parser/common.rl:3 +//line common.rl:3 tok = p -//line parser/common.rl:73 +//line common.rl:73 state.sd_value_bs = append(state.sd_value_bs, p) goto st56 tr68: -//line parser/common.rl:73 +//line common.rl:73 state.sd_value_bs = append(state.sd_value_bs, p) @@ -8565,7 +8565,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr10: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -8608,7 +8608,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr559: -//line parser/common.rl:19 +//line common.rl:19 event.SetYear(data[tok:p]) @@ -8627,7 +8627,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr560: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -8652,7 +8652,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr563: -//line parser/common.rl:23 +//line common.rl:23 event.SetMonthNumeric(data[tok:p]) @@ -8674,7 +8674,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr564: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -8699,7 +8699,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr568: -//line parser/common.rl:27 +//line common.rl:27 event.SetDay(data[tok:p]) @@ -8718,7 +8718,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr569: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -8743,7 +8743,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr572: -//line parser/common.rl:31 +//line common.rl:31 event.SetHour(data[tok:p]) @@ -8759,7 +8759,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr573: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -8784,7 +8784,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr575: -//line parser/common.rl:35 +//line common.rl:35 event.SetMinute(data[tok:p]) @@ -8800,7 +8800,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr576: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -8832,21 +8832,21 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr578: -//line parser/common.rl:39 +//line common.rl:39 event.SetSecond(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st566 tr588: -//line parser/common.rl:43 +//line common.rl:43 event.SetNanosecond(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -8898,21 +8898,21 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr580: -//line parser/common.rl:39 +//line common.rl:39 event.SetSecond(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p goto st571 tr590: -//line parser/common.rl:43 +//line common.rl:43 event.SetNanosecond(data[tok:p]) -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -8928,7 +8928,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr579: -//line parser/common.rl:39 +//line common.rl:39 event.SetSecond(data[tok:p]) @@ -8944,7 +8944,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr587: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -9050,7 +9050,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr570: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -9066,7 +9066,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr565: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -9082,7 +9082,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr566: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -9098,7 +9098,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr561: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -9135,7 +9135,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr3: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -9157,7 +9157,7 @@ func ParserRFC5424(data []byte, event *event) { } goto st0 tr4: -//line parser/common.rl:3 +//line common.rl:3 tok = p @@ -10965,16 +10965,16 @@ func ParserRFC5424(data []byte, event *event) { if (p) == eof { switch cs { case 590: -//line parser/common.rl:11 +//line common.rl:11 event.SetMessage(data[tok:p]) case 589: -//line parser/common.rl:3 +//line common.rl:3 tok = p -//line parser/common.rl:11 +//line common.rl:11 event.SetMessage(data[tok:p]) @@ -10987,6 +10987,6 @@ func ParserRFC5424(data []byte, event *event) { } } -//line parser/rfc5424_parser.rl:35 +//line rfc5424_parser.rl:35 } diff --git a/filebeat/input/syslog/parser/rfc5424_parser.rl b/filebeat/input/syslog/rfc5424_parser.rl similarity index 100% rename from filebeat/input/syslog/parser/rfc5424_parser.rl rename to filebeat/input/syslog/rfc5424_parser.rl diff --git a/filebeat/input/syslog/parser/syslog_rfc3164.rl b/filebeat/input/syslog/syslog_rfc3164.rl similarity index 100% rename from filebeat/input/syslog/parser/syslog_rfc3164.rl rename to filebeat/input/syslog/syslog_rfc3164.rl diff --git a/filebeat/input/syslog/parser/syslog_rfc5424.rl b/filebeat/input/syslog/syslog_rfc5424.rl similarity index 100% rename from filebeat/input/syslog/parser/syslog_rfc5424.rl rename to filebeat/input/syslog/syslog_rfc5424.rl