[Uptime] Fix nesting of x509 subject (#18139)

andrewvc · web-flow · commit a81bbda63c59 · 2020-05-04T10:33:26.000-05:00
In #17687 we added additional x509 fields. The mapping accidentally double nested subject fields as subject.subject. This fixes that. There are no tests here because we don't really have testing around mappings, and it's sort of difficult to test without being repetitive, so none are included here.
diff --git a/heartbeat/docs/fields.asciidoc b/heartbeat/docs/fields.asciidoc
@@ -8020,7 +8020,7 @@ example: SHA256-RSA
 --
 
 
-*`tls.server.x509.subject.subject.common_name`*::
+*`tls.server.x509.subject.common_name`*::
 +
 --
 List of common names (CN) of subject.
@@ -8031,14 +8031,14 @@ example: r2.shared.global.fastly.net
 
 --
 
-*`tls.server.x509.subject.subject.common_name.text`*::
+*`tls.server.x509.subject.common_name.text`*::
 +
 --
 type: text
 
 --
 
-*`tls.server.x509.subject.subject.distinguished_name`*::
+*`tls.server.x509.subject.distinguished_name`*::
 +
 --
 Distinguished name (DN) of the certificate subject entity.
diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go
diff --git a/heartbeat/monitors/active/dialchain/_meta/fields.yml b/heartbeat/monitors/active/dialchain/_meta/fields.yml
@@ -140,7 +140,7 @@
               - name: subject
                 type: group
                 fields:
-                - name: subject.common_name
+                - name: common_name
                   type: keyword
                   ignore_above: 1024
                   description: List of common names (CN) of subject.
@@ -150,7 +150,7 @@
                     - name: text
                       type: text
                       analyzer: simple
-                - name: subject.distinguished_name
+                - name: distinguished_name
                   type: keyword
                   ignore_above: 1024
                   description: Distinguished name (DN) of the certificate subject entity.

Original file line number	Diff line number	Diff line change
`@@ -8020,7 +8020,7 @@ example: SHA256-RSA`
`8020`	`8020`	`--`
`8021`	`8021`
`8022`	`8022`
`8023`		-`tls.server.x509.subject.subject.common_name`::
	`8023`	+`tls.server.x509.subject.common_name`::
`8024`	`8024`	`+`
`8025`	`8025`	`--`
`8026`	`8026`	`List of common names (CN) of subject.`
`@@ -8031,14 +8031,14 @@ example: r2.shared.global.fastly.net`
`8031`	`8031`
`8032`	`8032`	`--`
`8033`	`8033`
`8034`		-`tls.server.x509.subject.subject.common_name.text`::
	`8034`	+`tls.server.x509.subject.common_name.text`::
`8035`	`8035`	`+`
`8036`	`8036`	`--`
`8037`	`8037`	`type: text`
`8038`	`8038`
`8039`	`8039`	`--`
`8040`	`8040`
`8041`		-`tls.server.x509.subject.subject.distinguished_name`::
	`8041`	+`tls.server.x509.subject.distinguished_name`::
`8042`	`8042`	`+`
`8043`	`8043`	`--`
`8044`	`8044`	`Distinguished name (DN) of the certificate subject entity.`