Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for tests after device... field has been removed #25141

Merged
merged 3 commits into from
Apr 19, 2021
Merged

Fix for tests after device... field has been removed #25141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99b2ee1
fix tests
narph Apr 19, 2021
b1fba5a
generating fields
narph Apr 19, 2021
b44ec3b
fields
narph Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions auditbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2477,15 +2477,6 @@ type: keyword

--

*`user_agent.device.type`*::
+
--
Type of device where the user agent is running.

type: keyword

--

[[exported-fields-cloud]]
== Cloud provider metadata fields

Expand Down
2 changes: 1 addition & 1 deletion auditbeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions filebeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9190,15 +9190,6 @@ type: keyword

--

*`user_agent.device.type`*::
+
--
Type of device where the user agent is running.

type: keyword

--

[[exported-fields-bluecoat]]
== Blue Coat Director fields

Expand Down
2 changes: 1 addition & 1 deletion filebeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions filebeat/module/apache/access/test/darwin-2.4.23.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@
"source.address": "77.179.66.156",
"source.as.number": 6805,
"source.as.organization.name": "Telefonica Germany",
"source.geo.city_name": "Germersheim",
"source.geo.city_name": "Frankfurt am Main",
"source.geo.continent_name": "Europe",
"source.geo.country_iso_code": "DE",
"source.geo.country_name": "Germany",
"source.geo.location.lat": 49.2231,
"source.geo.location.lon": 8.3639,
"source.geo.region_iso_code": "DE-RP",
"source.geo.region_name": "Rheinland-Pfalz",
"source.geo.location.lat": 50.1234,
"source.geo.location.lon": 8.6119,
"source.geo.region_iso_code": "DE-HE",
"source.geo.region_name": "Hesse",
"source.ip": "77.179.66.156",
"url.original": "/",
"user.name": "-"
Expand All @@ -103,14 +103,14 @@
"source.address": "77.179.66.156",
"source.as.number": 6805,
"source.as.organization.name": "Telefonica Germany",
"source.geo.city_name": "Germersheim",
"source.geo.city_name": "Frankfurt am Main",
"source.geo.continent_name": "Europe",
"source.geo.country_iso_code": "DE",
"source.geo.country_name": "Germany",
"source.geo.location.lat": 49.2231,
"source.geo.location.lon": 8.3639,
"source.geo.region_iso_code": "DE-RP",
"source.geo.region_name": "Rheinland-Pfalz",
"source.geo.location.lat": 50.1234,
"source.geo.location.lon": 8.6119,
"source.geo.region_iso_code": "DE-HE",
"source.geo.region_name": "Hesse",
"source.ip": "77.179.66.156",
"url.original": "/notfound",
"user.name": "-"
Expand All @@ -133,14 +133,14 @@
"source.address": "77.179.66.156",
"source.as.number": 6805,
"source.as.organization.name": "Telefonica Germany",
"source.geo.city_name": "Germersheim",
"source.geo.city_name": "Frankfurt am Main",
"source.geo.continent_name": "Europe",
"source.geo.country_iso_code": "DE",
"source.geo.country_name": "Germany",
"source.geo.location.lat": 49.2231,
"source.geo.location.lon": 8.3639,
"source.geo.region_iso_code": "DE-RP",
"source.geo.region_name": "Rheinland-Pfalz",
"source.geo.location.lat": 50.1234,
"source.geo.location.lon": 8.6119,
"source.geo.region_iso_code": "DE-HE",
"source.geo.region_name": "Hesse",
"source.ip": "77.179.66.156",
"url.original": "/hmm",
"user.name": "-"
Expand Down
2 changes: 2 additions & 0 deletions filebeat/module/apache/access/test/ssl-request.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
"log.offset": 276,
"service.type": "apache",
"source.address": "11.19.0.217",
"source.as.number": 8003,
"source.as.organization.name": "GRS-DOD",
"source.geo.continent_name": "North America",
"source.geo.country_iso_code": "US",
"source.geo.country_name": "United States",
Expand Down
1 change: 0 additions & 1 deletion filebeat/module/apache/access/test/test-vhost.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"url.original": "/hello",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0",
"user_agent.os.full": "Mac OS X 10.12",
Expand Down
4 changes: 0 additions & 4 deletions filebeat/module/apache/access/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"url.original": "/hello",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0",
"user_agent.os.full": "Mac OS X 10.12",
Expand Down Expand Up @@ -85,7 +84,6 @@
"url.original": "/stringpatch",
"user.name": "-",
"user_agent.device.name": "Other",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox Alpha",
"user_agent.original": "Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2",
"user_agent.os.full": "Windows 7",
Expand Down Expand Up @@ -114,7 +112,6 @@
"url.original": "/status",
"user.name": "-",
"user_agent.device.name": "Other",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox Alpha",
"user_agent.original": "Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2",
"user_agent.os.full": "Windows 7",
Expand All @@ -140,7 +137,6 @@
"source.ip": "127.0.0.1",
"user.name": "-",
"user_agent.device.name": "Other",
"user_agent.device.type": "Other",
"user_agent.name": "Other",
"user_agent.original": "-"
}
Expand Down
9 changes: 0 additions & 9 deletions filebeat/module/apache/access/test/ubuntu-2.2.22.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"url.original": "/",
"user.name": "-",
"user_agent.device.name": "Other",
"user_agent.device.type": "Desktop",
"user_agent.name": "Wget",
"user_agent.original": "Wget/1.13.4 (linux-gnu)",
"user_agent.os.name": "Linux",
Expand All @@ -47,7 +46,6 @@
"url.original": "/",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Chrome",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36",
"user_agent.os.full": "Mac OS X 10.12.0",
Expand Down Expand Up @@ -76,7 +74,6 @@
"url.original": "/favicon.ico",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Chrome",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36",
"user_agent.os.full": "Mac OS X 10.12.0",
Expand Down Expand Up @@ -105,7 +102,6 @@
"url.original": "/",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0",
"user_agent.os.full": "Mac OS X 10.12",
Expand Down Expand Up @@ -134,7 +130,6 @@
"url.original": "/favicon.ico",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0",
"user_agent.os.full": "Mac OS X 10.12",
Expand Down Expand Up @@ -163,7 +158,6 @@
"url.original": "/favicon.ico",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0",
"user_agent.os.full": "Mac OS X 10.12",
Expand Down Expand Up @@ -192,7 +186,6 @@
"url.original": "/test",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0",
"user_agent.os.full": "Mac OS X 10.12",
Expand Down Expand Up @@ -221,7 +214,6 @@
"url.original": "/hello",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0",
"user_agent.os.full": "Mac OS X 10.12",
Expand Down Expand Up @@ -250,7 +242,6 @@
"url.original": "/crap",
"user.name": "-",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Firefox",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0",
"user_agent.os.full": "Mac OS X 10.12",
Expand Down
12 changes: 6 additions & 6 deletions filebeat/module/apache/error/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
"service.type": "apache",
"source.address": "72.15.99.187",
"source.as.number": 11693,
"source.as.organization.name": "WideOpenWest Finance LLC",
"source.geo.city_name": "Newnan",
"source.as.organization.name": "NULINK",
"source.geo.city_name": "Tyrone",
"source.geo.continent_name": "North America",
"source.geo.country_iso_code": "US",
"source.geo.country_name": "United States",
"source.geo.location.lat": 33.3708,
"source.geo.location.lon": -84.8154,
"source.geo.location.lat": 33.4715,
"source.geo.location.lon": -84.5929,
"source.geo.region_iso_code": "US-GA",
"source.geo.region_name": "Georgia",
"source.ip": "72.15.99.187"
Expand Down Expand Up @@ -86,8 +86,8 @@
"source.geo.continent_name": "Asia",
"source.geo.country_iso_code": "CN",
"source.geo.country_name": "China",
"source.geo.location.lat": 39.9288,
"source.geo.location.lon": 116.3889,
"source.geo.location.lat": 39.9285,
"source.geo.location.lon": 116.385,
"source.geo.region_iso_code": "CN-BJ",
"source.geo.region_name": "Beijing",
"source.ip": "123.123.123.123",
Expand Down
16 changes: 8 additions & 8 deletions filebeat/module/auditd/log/test/audit-rhel6.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,13 +291,13 @@
"service.type": "auditd",
"source.address": "96.241.146.97",
"source.as.number": 701,
"source.as.organization.name": "MCI Communications Services, Inc. d/b/a Verizon Business",
"source.geo.city_name": "Aldie",
"source.as.organization.name": "UUNET",
"source.geo.city_name": "Ashburn",
"source.geo.continent_name": "North America",
"source.geo.country_iso_code": "US",
"source.geo.country_name": "United States",
"source.geo.location.lat": 38.9637,
"source.geo.location.lon": -77.6099,
"source.geo.location.lat": 39.0127,
"source.geo.location.lon": -77.5342,
"source.geo.region_iso_code": "US-VA",
"source.geo.region_name": "Virginia",
"source.ip": "96.241.146.97",
Expand Down Expand Up @@ -334,13 +334,13 @@
"service.type": "auditd",
"source.address": "96.241.146.97",
"source.as.number": 701,
"source.as.organization.name": "MCI Communications Services, Inc. d/b/a Verizon Business",
"source.geo.city_name": "Aldie",
"source.as.organization.name": "UUNET",
"source.geo.city_name": "Ashburn",
"source.geo.continent_name": "North America",
"source.geo.country_iso_code": "US",
"source.geo.country_name": "United States",
"source.geo.location.lat": 38.9637,
"source.geo.location.lon": -77.6099,
"source.geo.location.lat": 39.0127,
"source.geo.location.lon": -77.5342,
"source.geo.region_iso_code": "US-VA",
"source.geo.region_name": "Virginia",
"source.ip": "96.241.146.97",
Expand Down
8 changes: 4 additions & 4 deletions filebeat/module/auditd/log/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@
"service.type": "auditd",
"source.address": "96.241.146.97",
"source.as.number": 701,
"source.as.organization.name": "MCI Communications Services, Inc. d/b/a Verizon Business",
"source.geo.city_name": "Aldie",
"source.as.organization.name": "UUNET",
"source.geo.city_name": "Ashburn",
"source.geo.continent_name": "North America",
"source.geo.country_iso_code": "US",
"source.geo.country_name": "United States",
"source.geo.location.lat": 38.9637,
"source.geo.location.lon": -77.6099,
"source.geo.location.lat": 39.0127,
"source.geo.location.lon": -77.5342,
"source.geo.region_iso_code": "US-VA",
"source.geo.region_name": "Virginia",
"source.ip": "96.241.146.97",
Expand Down
13 changes: 5 additions & 8 deletions filebeat/module/haproxy/log/test/default.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,11 @@
],
"service.type": "haproxy",
"source.address": "1.2.3.4",
"source.geo.city_name": "Moscow",
"source.geo.continent_name": "Europe",
"source.geo.country_iso_code": "RU",
"source.geo.country_name": "Russia",
"source.geo.location.lat": 55.7527,
"source.geo.location.lon": 37.6172,
"source.geo.region_iso_code": "RU-MOW",
"source.geo.region_name": "Moscow",
"source.geo.continent_name": "Oceania",
"source.geo.country_iso_code": "AU",
"source.geo.country_name": "Australia",
"source.geo.location.lat": -33.494,
"source.geo.location.lon": 143.2104,
"source.ip": "1.2.3.4",
"source.port": 40780
}
Expand Down
13 changes: 5 additions & 8 deletions filebeat/module/haproxy/log/test/haproxy.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,11 @@
],
"service.type": "haproxy",
"source.address": "1.2.3.4",
"source.geo.city_name": "Moscow",
"source.geo.continent_name": "Europe",
"source.geo.country_iso_code": "RU",
"source.geo.country_name": "Russia",
"source.geo.location.lat": 55.7527,
"source.geo.location.lon": 37.6172,
"source.geo.region_iso_code": "RU-MOW",
"source.geo.region_name": "Moscow",
"source.geo.continent_name": "Oceania",
"source.geo.country_iso_code": "AU",
"source.geo.country_name": "Australia",
"source.geo.location.lat": -33.494,
"source.geo.location.lon": 143.2104,
"source.ip": "1.2.3.4",
"source.port": 38862
}
Expand Down
5 changes: 0 additions & 5 deletions filebeat/module/iis/access/test/test-iis-7.2.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"url.path": "/pbserver/..\u00c0\u00af..\u00c0\u00af..\u00c0\u00af..\u00c0\u00af..\u00c0\u00af../winnt/system32/cmd.exe",
"url.query": "/c+dir+c:\\+/OG",
"user_agent.device.name": "Other",
"user_agent.device.type": "Desktop",
"user_agent.name": "IE",
"user_agent.original": "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)",
"user_agent.os.full": "Windows XP",
Expand Down Expand Up @@ -75,7 +74,6 @@
"url.path": "/pbserver/..\u00c1\u00c1..\u00c1\u00c1..\u00c1\u00c1..\u00c1\u00c1..\u00c1\u00c1../winnt/system32/cmd.exe",
"url.query": "/c+dir+c:\\+/OG",
"user_agent.device.name": "Other",
"user_agent.device.type": "Desktop",
"user_agent.name": "IE",
"user_agent.original": "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)",
"user_agent.os.full": "Windows XP",
Expand Down Expand Up @@ -116,7 +114,6 @@
"source.ip": "10.50.6.188",
"url.path": "/Director",
"user_agent.device.name": "Other",
"user_agent.device.type": "Desktop",
"user_agent.name": "IE",
"user_agent.original": "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)",
"user_agent.os.full": "Windows XP",
Expand Down Expand Up @@ -157,7 +154,6 @@
"source.ip": "10.50.6.188",
"url.path": "/",
"user_agent.device.name": "Other",
"user_agent.device.type": "Desktop",
"user_agent.name": "IE",
"user_agent.original": "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)",
"user_agent.os.full": "Windows XP",
Expand Down Expand Up @@ -199,7 +195,6 @@
"url.path": "/pbserver/..\u00c1\u0153..\u00c1\u0153..\u00c1\u0153..\u00c1\u0153..\u00c1\u0153../winnt/system32/cmd.exe",
"url.query": "/c+dir+c:\\+/OG",
"user_agent.device.name": "Other",
"user_agent.device.type": "Desktop",
"user_agent.name": "IE",
"user_agent.original": "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)",
"user_agent.os.full": "Windows XP",
Expand Down
1 change: 0 additions & 1 deletion filebeat/module/iis/access/test/test-iis-7.5.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"source.ip": "10.100.118.31",
"url.path": "/",
"user_agent.device.name": "Other",
"user_agent.device.type": "Desktop",
"user_agent.name": "IE",
"user_agent.original": "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; .NET4.0C; .NET CLR 3.5.30729; .NET CLR[ 2.0.50727](tel: 2050727); .NET CLR 3.0.30729)",
"user_agent.os.full": "Windows 8.1",
Expand Down
1 change: 0 additions & 1 deletion filebeat/module/iis/access/test/test-ipv6zone.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"source.ip": "::1",
"url.path": "/",
"user_agent.device.name": "Mac",
"user_agent.device.type": "Desktop",
"user_agent.name": "Chrome",
"user_agent.original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36",
"user_agent.os.full": "Mac OS X 10.14.0",
Expand Down
Loading