From 23b15dffb2daf2b759e9aab0c5ec875b4bf97432 Mon Sep 17 00:00:00 2001
From: Marius Iversen <pillus@chasenet.org>
Date: Mon, 7 Sep 2020 16:22:28 +0200
Subject: [PATCH] Updating an error in config yml format of the docs for Sophos
 module (#21004)

(cherry picked from commit 6aa800ca82ca0844db1d3392465921fc833acf34)
---
 filebeat/docs/modules/sophos.asciidoc             | 6 ++++--
 x-pack/filebeat/filebeat.reference.yml            | 6 ++++--
 x-pack/filebeat/module/sophos/_meta/config.yml    | 6 ++++--
 x-pack/filebeat/module/sophos/_meta/docs.asciidoc | 6 ++++--
 x-pack/filebeat/modules.d/sophos.yml.disabled     | 6 ++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/filebeat/docs/modules/sophos.asciidoc b/filebeat/docs/modules/sophos.asciidoc
index 74aacf0df0fa..a8628bfb43c1 100644
--- a/filebeat/docs/modules/sophos.asciidoc
+++ b/filebeat/docs/modules/sophos.asciidoc
@@ -47,8 +47,10 @@ Below you will see an example configuration file, that sets the default hostname
     var.syslog_port: 9005
     var.default_host_name: firewall.localgroup.local
     var.known_devices:
-       "1234567890123457": "a.host.local"
-       "1234234590678557": "b.host.local"
+      - serial_number: "1234567890123457"
+        hostname: "a.host.local"
+      - serial_number: "1234234590678557"
+        hostname: "b.host.local"
 ----
 
 include::../include/var-paths.asciidoc[]
diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml
index 85c9eead5ed7..3fa191258a4a 100644
--- a/x-pack/filebeat/filebeat.reference.yml
+++ b/x-pack/filebeat/filebeat.reference.yml
@@ -1297,8 +1297,10 @@ filebeat.modules:
 
     # known firewalls
     #var.known_devices:
-    #   "device1_serialnumber": "a.host.local"
-    #   "device2_serialnumber": "b.host.local"
+      #- serial_number: "1234567890123457"
+      #  hostname: "a.host.local"
+      #- serial_number: "1234234590678557"
+      #  hostname: "b.host.local"
 
 
 #-------------------------------- Squid Module --------------------------------
diff --git a/x-pack/filebeat/module/sophos/_meta/config.yml b/x-pack/filebeat/module/sophos/_meta/config.yml
index c7c5add74221..f733b9eb08cc 100644
--- a/x-pack/filebeat/module/sophos/_meta/config.yml
+++ b/x-pack/filebeat/module/sophos/_meta/config.yml
@@ -17,6 +17,8 @@
 
     # known firewalls
     #var.known_devices:
-    #   "device1_serialnumber": "a.host.local"
-    #   "device2_serialnumber": "b.host.local"
+      #- serial_number: "1234567890123457"
+      #  hostname: "a.host.local"
+      #- serial_number: "1234234590678557"
+      #  hostname: "b.host.local"
 
diff --git a/x-pack/filebeat/module/sophos/_meta/docs.asciidoc b/x-pack/filebeat/module/sophos/_meta/docs.asciidoc
index 280353280831..13bf99beb1d2 100644
--- a/x-pack/filebeat/module/sophos/_meta/docs.asciidoc
+++ b/x-pack/filebeat/module/sophos/_meta/docs.asciidoc
@@ -42,8 +42,10 @@ Below you will see an example configuration file, that sets the default hostname
     var.syslog_port: 9005
     var.default_host_name: firewall.localgroup.local
     var.known_devices:
-       "1234567890123457": "a.host.local"
-       "1234234590678557": "b.host.local"
+      - serial_number: "1234567890123457"
+        hostname: "a.host.local"
+      - serial_number: "1234234590678557"
+        hostname: "b.host.local"
 ----
 
 include::../include/var-paths.asciidoc[]
diff --git a/x-pack/filebeat/modules.d/sophos.yml.disabled b/x-pack/filebeat/modules.d/sophos.yml.disabled
index 252282d83ce9..f3b3560b2d61 100644
--- a/x-pack/filebeat/modules.d/sophos.yml.disabled
+++ b/x-pack/filebeat/modules.d/sophos.yml.disabled
@@ -20,6 +20,8 @@
 
     # known firewalls
     #var.known_devices:
-    #   "device1_serialnumber": "a.host.local"
-    #   "device2_serialnumber": "b.host.local"
+      #- serial_number: "1234567890123457"
+      #  hostname: "a.host.local"
+      #- serial_number: "1234234590678557"
+      #  hostname: "b.host.local"