From dea789c2ed41248b978cbbeac6be35dfca78ea71 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 3 Apr 2020 15:30:48 +0200 Subject: [PATCH] Cherry-pick #17441 to 7.x: Filebeat: Fix fields indentation (#17463) * Fix fields indentation (#17441) (cherry picked from commit b2f4209fe054c5ebaf79f2cd7aee017a7ccea320) * fix: mage check --- .../filebeat/module/coredns/_meta/fields.yml | 90 +++++++++---------- x-pack/filebeat/module/coredns/fields.go | 2 +- .../module/envoyproxy/_meta/fields.yml | 62 ++++++------- x-pack/filebeat/module/envoyproxy/fields.go | 2 +- 4 files changed, 78 insertions(+), 78 deletions(-) diff --git a/x-pack/filebeat/module/coredns/_meta/fields.yml b/x-pack/filebeat/module/coredns/_meta/fields.yml index 7bc11ae1470..98ee91094ab 100644 --- a/x-pack/filebeat/module/coredns/_meta/fields.yml +++ b/x-pack/filebeat/module/coredns/_meta/fields.yml @@ -3,55 +3,55 @@ description: > Module for handling logs produced by coredns fields: - - name: coredns - type: group - description: > - coredns fields after normalization - fields: - - name: id - type: keyword - description: > - id of the DNS transaction + - name: coredns + type: group + description: > + coredns fields after normalization + fields: + - name: id + type: keyword + description: > + id of the DNS transaction - - name: query.size - type: integer - format: bytes - description: > - size of the DNS query + - name: query.size + type: integer + format: bytes + description: > + size of the DNS query - - name: query.class - type: keyword - description: > - DNS query class + - name: query.class + type: keyword + description: > + DNS query class - - name: query.name - type: keyword - description: > - DNS query name + - name: query.name + type: keyword + description: > + DNS query name - - name: query.type - type: keyword - description: > - DNS query type + - name: query.type + type: keyword + description: > + DNS query type - - name: response.code - type: keyword - description: > - DNS response code + - name: response.code + type: keyword + description: > + DNS response code - - name: response.flags - type: keyword - description: > - DNS response flags + - name: response.flags + type: keyword + description: > + DNS response flags + + - name: response.size + type: integer + format: bytes + description: > + size of the DNS response + + - name: dnssec_ok + type: boolean + description: > + dnssec flag - - name: response.size - type: integer - format: bytes - description: > - size of the DNS response - - - name: dnssec_ok - type: boolean - description: > - dnssec flag - \ No newline at end of file diff --git a/x-pack/filebeat/module/coredns/fields.go b/x-pack/filebeat/module/coredns/fields.go index 23400dd7e52..33d12c899eb 100644 --- a/x-pack/filebeat/module/coredns/fields.go +++ b/x-pack/filebeat/module/coredns/fields.go @@ -19,5 +19,5 @@ func init() { // AssetCoredns returns asset data. // This is the base64 encoded gzipped contents of module/coredns. func AssetCoredns() string { - return "eJy00kFugzAQheE9p3gXSA7Aopt22256gMqxB2LF8dAZo4qcvsIEApIVqYm6S0ae78eIHU401LAs5KJWQPIpUI3XZeBIrfgueY41XioAeGfXB0LDgqOJLvjYInCr6IRdb8nhMKzIxlNwWlfADtGcaZ0D0tBRjVa47/L/Qg/zwpWCaRIJIsvZBH8x49l88Fa6tby7GlPoRMMPyzwrxgDvwA3SkfD28YkkJqqxubKhv3uSYa/+QpuEj4lakuusGZ8y1TgMifR+dpTW4eyXkjYY1b9fazExAQV5/P0MnPcL7og94+b9jSukHUelvWX3ID0TyERZb4JpH3zVCz8ZZf//vp45kQ9s4i6qkv3i0yZ8YA5k4v3ItJpvtMyq3wAAAP//8MJAFA==" + return "eJy00kFugzAQheE9p3gXSA7Aopt22256gMqxB2LF8VCPUeWcvrIhBCFQpKKyikb4/8YKB1wo1dAcyHipgGijoxqv08CQ6GC7aNnXeKkA4J1N7wgNB5yVN876Fo5bQRfY9JoMTmmWbCw5I3U5eoBXV5qD+Ympoxpt4L4bJytqfsZjYxKqiRTgOVyVszeV3x5fnZsP1ZqpNJAXSj8cHtMNFrAG3CCeCW8fn4hBeVG6eAviu6eQjmJvtKCsj9RSmKZN3jrWOKVI8nyBXJyvUJx1XDsl8teLTm0MmVUh/94PlMpqPyf390tl0Q8kHXuho2azi7iHUEJbSuNUu+uvmJihtOX8//d2p5YrGC9C+osvC/7E7Ej559AQKPerqt8AAAD//23BSVQ=" } diff --git a/x-pack/filebeat/module/envoyproxy/_meta/fields.yml b/x-pack/filebeat/module/envoyproxy/_meta/fields.yml index 82fa9fefbf7..ad019cd56d9 100644 --- a/x-pack/filebeat/module/envoyproxy/_meta/fields.yml +++ b/x-pack/filebeat/module/envoyproxy/_meta/fields.yml @@ -3,43 +3,43 @@ description: > Module for handling logs produced by envoy fields: - - name: envoyproxy - type: group - description: > - Fields from envoy proxy logs after normalization - fields: - - name: log_type - type: keyword + - name: envoyproxy + type: group description: > - Envoy log type, normally ACCESS + Fields from envoy proxy logs after normalization + fields: + - name: log_type + type: keyword + description: > + Envoy log type, normally ACCESS - - name: response_flags - type: keyword - description: > - Response flags + - name: response_flags + type: keyword + description: > + Response flags - - name: upstream_service_time - type: long - format: duration - input_format: nanoseconds - description: > - Upstream service time in nanoseconds + - name: upstream_service_time + type: long + format: duration + input_format: nanoseconds + description: > + Upstream service time in nanoseconds - - name: request_id - type: keyword - description: > - ID of the request + - name: request_id + type: keyword + description: > + ID of the request - - name: authority - type: keyword - description: > - Envoy proxy authority field + - name: authority + type: keyword + description: > + Envoy proxy authority field + + - name: proxy_type + type: keyword + description: > + Envoy proxy type, tcp or http - - name: proxy_type - type: keyword - description: > - Envoy proxy type, tcp or http - \ No newline at end of file diff --git a/x-pack/filebeat/module/envoyproxy/fields.go b/x-pack/filebeat/module/envoyproxy/fields.go index 7c2ebe2f584..b9c808f59f1 100644 --- a/x-pack/filebeat/module/envoyproxy/fields.go +++ b/x-pack/filebeat/module/envoyproxy/fields.go @@ -19,5 +19,5 @@ func init() { // AssetEnvoyproxy returns asset data. // This is the base64 encoded gzipped contents of module/envoyproxy. func AssetEnvoyproxy() string { - return "eJykk0Fu2zAQRfc8xT9AfQEtChSuC3TRTY2uBVYcyYQpDkMOnTCnDyTKdmQYAZwsNeJ/bzQabnCk0oD8iUuI/FIUIFYcNdi9rxlKXbRBLPsG3xUA/GGTHaHniIP2xlk/wPGQECKb3JHB/1LBCugtOZMaBWzg9Ug3SkBKoAZD5Bzm5ztC4NdMQR95rHnMgKrVvVCE5zhqZ1/1lJxjV/VV7nhoJ+PCrfIjlWeOZqndbQB1KlN+Dn1bfK7gx3a72+/VShMpBfaJ2t7pIT0u+7vkUfMrdg5JIumxTRRPtqNW7Lj+Hsd+WAr91KU0MDleBwNYH7K055dee07UsTfp47b+LWosakxqWL8i3AziKVOS1prHh/D7J7iHHOhMWaN1lgNHK+Wz/7Ku0AVT92XtmI98aWGqpK6MdAHTpREJSqnLQfUWAAD//zjwF5k=" + return "eJysk8Fu2zAMhu9+iv8BlhfwYcCQZcAOuyzY2dAs2hEii5pEZdOevpDluKnbokBaHpnw+37T9A5nyi3IXTj7wP9yA4gRSy0Otz1NsQ/Gi2HX4nMDAD9YJ0sYOOCknLbGjbA8RvjAOvWk8TtXcAMMhqyO7Ty4g1MTbaSlJHtqMQZOfum8oC31baZhCDxVCmZM1atBKMBxmJQ1/1WZXQZvQzzGsDx2xbzSa4wz5b8c9Np9JQrqngplHvy0mG3Gl/3+cDw2G12g6NlF6garxniv9OdCQaVsHMlHCaSmLlK4mJ46MdP2+Sy7cW0NJbO00CncLgwwzifprj875ThSz07HtyP+WkJgCYESAsY9oTxbzp9EUTqj713M96/gAXKiK2urUElOHIzk973venArrN7W1jX/6QOOq8rqeUnvUT45Ed+UeggAAP//R+geWQ==" }