Adjust for changes in 6.x

elastic · Jul 24, 2018 · e229852 · e229852
1 parent 0b405a7
commit e229852
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 14 deletions.
diff --git a/deploy/kubernetes/auditbeat-kubernetes.yaml b/deploy/kubernetes/auditbeat-kubernetes.yaml
@@ -71,7 +71,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: auditbeat
-        image: docker.elastic.co/beats/auditbeat:7.0.0-alpha1
+        image: docker.elastic.co/beats/auditbeat:6.4.0
         args: [
           "-c", "/etc/auditbeat.yml"
         ]

diff --git a/filebeat/module/icinga/startup/test/test.log-expected.json b/filebeat/module/icinga/startup/test/test.log-expected.json
@@ -1,6 +1,6 @@
 [
     {
-        "@timestamp": "2018-07-23T11:50:38.896Z", 
+        "@timestamp": "2018-07-24T21:15:27.590Z", 
         "fileset.module": "icinga", 
         "fileset.name": "startup", 
         "icinga.startup.facility": "cli", 
@@ -11,7 +11,7 @@
         "prospector.type": "log"
     }, 
     {
-        "@timestamp": "2018-07-23T11:50:38.896Z", 
+        "@timestamp": "2018-07-24T21:15:27.590Z", 
         "fileset.module": "icinga", 
         "fileset.name": "startup", 
         "icinga.startup.facility": "cli", 

diff --git a/filebeat/module/iis/access/test/test.log-expected.json b/filebeat/module/iis/access/test/test.log-expected.json
@@ -8,7 +8,6 @@
         "iis.access.geoip.country_iso_code": "DE", 
         "iis.access.geoip.location.lat": 52.5167, 
         "iis.access.geoip.location.lon": 13.4, 
-        "iis.access.geoip.region_iso_code": "DE-BE", 
         "iis.access.geoip.region_name": "Land Berlin", 
         "iis.access.method": "GET", 
         "iis.access.port": "80", 
@@ -74,7 +73,6 @@
         "iis.access.geoip.country_iso_code": "DE", 
         "iis.access.geoip.location.lat": 52.5167, 
         "iis.access.geoip.location.lon": 13.4, 
-        "iis.access.geoip.region_iso_code": "DE-BE", 
         "iis.access.geoip.region_name": "Land Berlin", 
         "iis.access.hostname": "example.com", 
         "iis.access.http_version": "1.1", 

diff --git a/filebeat/module/iis/error/test/test.log-expected.json b/filebeat/module/iis/error/test/test.log-expected.json
@@ -26,7 +26,6 @@
         "iis.error.geoip.country_iso_code": "DE", 
         "iis.error.geoip.location.lat": 52.5167, 
         "iis.error.geoip.location.lon": 13.4, 
-        "iis.error.geoip.region_iso_code": "DE-BE", 
         "iis.error.geoip.region_name": "Land Berlin", 
         "iis.error.http_version": "1.1", 
         "iis.error.method": "GET", 
@@ -51,7 +50,6 @@
         "iis.error.geoip.country_iso_code": "DE", 
         "iis.error.geoip.location.lat": 52.5167, 
         "iis.error.geoip.location.lon": 13.4, 
-        "iis.error.geoip.region_iso_code": "DE-BE", 
         "iis.error.geoip.region_name": "Land Berlin", 
         "iis.error.http_version": "2.0", 
         "iis.error.method": "GET", 
@@ -76,7 +74,6 @@
         "iis.error.geoip.country_iso_code": "DE", 
         "iis.error.geoip.location.lat": 52.5167, 
         "iis.error.geoip.location.lon": 13.4, 
-        "iis.error.geoip.region_iso_code": "DE-BE", 
         "iis.error.geoip.region_name": "Land Berlin", 
         "iis.error.queue_name": "-", 
         "iis.error.reason_phrase": "Timer_MinBytesPerSecond", 

diff --git a/filebeat/module/nginx/access/test/test.log-expected.json b/filebeat/module/nginx/access/test/test.log-expected.json
@@ -65,7 +65,6 @@
         "nginx.access.geoip.country_iso_code": "DE", 
         "nginx.access.geoip.location.lat": 52.5167, 
         "nginx.access.geoip.location.lon": 13.4, 
-        "nginx.access.geoip.region_iso_code": "DE-BE", 
         "nginx.access.geoip.region_name": "Land Berlin", 
         "nginx.access.http_version": "1.1", 
         "nginx.access.method": "GET", 
@@ -101,7 +100,6 @@
         "nginx.access.geoip.country_iso_code": "DE", 
         "nginx.access.geoip.location.lat": 52.5167, 
         "nginx.access.geoip.location.lon": 13.4, 
-        "nginx.access.geoip.region_iso_code": "DE-BE", 
         "nginx.access.geoip.region_name": "Land Berlin", 
         "nginx.access.http_version": "1.1", 
         "nginx.access.method": "GET", 
@@ -135,7 +133,6 @@
         "nginx.access.geoip.country_iso_code": "US", 
         "nginx.access.geoip.location.lat": 39.772, 
         "nginx.access.geoip.location.lon": -89.6859, 
-        "nginx.access.geoip.region_iso_code": "US-IL", 
         "nginx.access.geoip.region_name": "Illinois", 
         "nginx.access.http_version": "1.1", 
         "nginx.access.method": "GET", 

diff --git a/filebeat/module/system/auth/test/test.log-expected.json b/filebeat/module/system/auth/test/test.log-expected.json
@@ -61,7 +61,6 @@
         "system.auth.ssh.geoip.country_iso_code": "CN", 
         "system.auth.ssh.geoip.location.lat": 22.5333, 
         "system.auth.ssh.geoip.location.lon": 114.1333, 
-        "system.auth.ssh.geoip.region_iso_code": "CN-44", 
         "system.auth.ssh.geoip.region_name": "Guangdong", 
         "system.auth.ssh.ip": "116.31.116.24", 
         "system.auth.ssh.method": "password", 

diff --git a/filebeat/module/traefik/access/test/test.log-expected.json b/filebeat/module/traefik/access/test/test.log-expected.json
@@ -35,7 +35,6 @@
         "traefik.access.geoip.country_iso_code": "DE", 
         "traefik.access.geoip.location.lat": 52.5167, 
         "traefik.access.geoip.location.lon": 13.4, 
-        "traefik.access.geoip.region_iso_code": "DE-BE", 
         "traefik.access.geoip.region_name": "Land Berlin", 
         "traefik.access.http_version": "1.1", 
         "traefik.access.method": "GET", 

diff --git a/metricbeat/modules.d/envoyproxy.yml.disabled b/metricbeat/modules.d/envoyproxy.yml.disabled
@@ -1,5 +1,5 @@
 # Module: envoyproxy
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-envoyproxy.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/6.x/metricbeat-module-envoyproxy.html
 
 - module: envoyproxy
   #metricsets: