Skip to content

Commit

Permalink
Packetbeat TLS: Replace array fields with keyword (elastic#15601)
Browse files Browse the repository at this point in the history
Use of `type: array` in some fields (which was inconsistent) causes
those fields to be excluded from the template. This prevents pointing
aliases to those fields, which we need in 7.6+.

Setting those fields to `keyword` explicitly so that they are included
in the template.

Fixes elastic#15588

(cherry picked from commit 04a9058)
  • Loading branch information
adriansr committed Jan 16, 2020
1 parent 4f990dd commit a6d3000
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 35 deletions.
26 changes: 4 additions & 22 deletions packetbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9407,7 +9407,7 @@ type: keyword
The list of compression methods the client supports. See https://www.iana.org/assignments/comp-meth-ids/comp-meth-ids.xhtml
type: array
type: keyword
--
Expand Down Expand Up @@ -9538,7 +9538,7 @@ The hello extensions provided by the server.
--
Negotiated application layer protocol

type: array
type: keyword

--

Expand Down Expand Up @@ -9658,7 +9658,7 @@ type: keyword
--
Subject Alternative Names for this certificate.

type: array
type: keyword

--

Expand Down Expand Up @@ -9858,7 +9858,7 @@ type: keyword
--
Subject Alternative Names for this certificate.

type: array
type: keyword

--

Expand Down Expand Up @@ -10595,24 +10595,6 @@ alias to: tls.detailed.server_certificate.issuer.locality

--

*`tls.server_certificate_chain`*::
+
--
type: alias

alias to: tls.detailed.server_certificate_chain

--

*`tls.client_certificate_chain`*::
+
--
type: alias

alias to: tls.detailed.client_certificate_chain

--

*`tls.alert_types`*::
+
--
Expand Down
16 changes: 4 additions & 12 deletions packetbeat/protos/tls/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
connection with the client.
- name: supported_compression_methods
type: array
type: keyword
description: >
The list of compression methods the client supports.
See https://www.iana.org/assignments/comp-meth-ids/comp-meth-ids.xhtml
Expand Down Expand Up @@ -123,7 +123,7 @@
description: The hello extensions provided by the server.
fields:
- name: application_layer_protocol_negotiation
type: array
type: keyword
description: Negotiated application layer protocol

- name: session_ticket
Expand Down Expand Up @@ -185,7 +185,7 @@
The algorithm used for the certificate's signature.
- name: alternative_names
type: array
type: keyword
description: Subject Alternative Names for this certificate.

- name: subject
Expand Down Expand Up @@ -281,7 +281,7 @@
The algorithm used for the certificate's signature.
- name: alternative_names
type: array
type: keyword
description: Subject Alternative Names for this certificate.

- name: subject
Expand Down Expand Up @@ -621,14 +621,6 @@
type: alias
path: tls.detailed.server_certificate.issuer.locality

- name: tls.server_certificate_chain
type: alias
path: tls.detailed.server_certificate_chain

- name: tls.client_certificate_chain
type: alias
path: tls.detailed.client_certificate_chain

- name: tls.alert_types
type: alias
path: tls.detailed.alert_types
2 changes: 1 addition & 1 deletion packetbeat/protos/tls/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a6d3000

Please sign in to comment.