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

Jump to bottom

[Filebeat] Sort array fields in generated data #25320

Merged
merged 5 commits into from
May 13, 2021
Merged

[Filebeat] Sort array fields in generated data #25320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09c5347
Initial commit
legoguy1000 Apr 26, 2021
e27d2d6
non xpack modules
legoguy1000 Apr 26, 2021
7616548
update python
legoguy1000 Apr 27, 2021
ffd2a18
sort as strings
legoguy1000 May 4, 2021
a018262
all modules generated data
legoguy1000 May 13, 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
1 change: 1 addition & 0 deletions CHANGELOG-developer.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
- Update Go version to 1.15.9. {pull}24442[24442]
- Update Go version to 1.15.10. {pull}24606[24606]
- Update Go version to 1.15.12. {pull}25629[25629]
- Add sorting to array fields for generated data files (*-generated.json) {pull}25320[25320]
8 changes: 4 additions & 4 deletions filebeat/module/auditd/log/test/audit-cent7-node.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"changed-audit-configuration"
],
"event.category": [
"process",
"configuration"
"configuration",
"process"
],
"event.dataset": "auditd.log",
"event.kind": "event",
Expand Down Expand Up @@ -75,8 +75,8 @@
"changed-audit-configuration"
],
"event.category": [
"process",
"configuration"
"configuration",
"process"
],
"event.dataset": "auditd.log",
"event.kind": "event",
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -86,8 +86,8 @@
"input.type": "log",
"log.offset": 373,
"process.args": [
"/usr/lib64/nagios/plugins/check_asterisk_sip_peers",
"-p",
"/usr/lib64/nagios/plugins/check_asterisk_sip_peers",
"202"
],
"process.args_count": 3,
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -88,8 +88,8 @@
"input.type": "log",
"log.offset": 536,
"process.args": [
"/usr/lib64/nagios/plugins/check_asterisk_sip_peers",
"-p",
"/usr/lib64/nagios/plugins/check_asterisk_sip_peers",
"202"
],
"process.args_count": 3,
Expand Down
20 changes: 10 additions & 10 deletions filebeat/module/auditd/log/test/useradd.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"event.original": "type=ADD_GROUP msg=audit(1610903553.686:584): pid=2940 uid=0 auid=1000 ses=14 msg='op=adding group to /etc/group id=1004 exe=\"/usr/sbin/groupadd\" hostname=ubuntu-bionic addr=127.0.0.1 terminal=pts/2 res=success'",
"event.outcome": "success",
"event.type": [
"group",
"creation"
"creation",
"group"
],
"fileset.name": "log",
"group.id": "1004",
Expand Down Expand Up @@ -58,8 +58,8 @@
"event.original": "type=ADD_GROUP msg=audit(1610903553.710:586): pid=2940 uid=0 auid=1000 ses=14 msg='op=adding group to /etc/gshadow id=1004 exe=\"/usr/sbin/groupadd\" hostname=ubuntu-bionic addr=127.0.0.1 terminal=pts/2 res=success'",
"event.outcome": "success",
"event.type": [
"group",
"creation"
"creation",
"group"
],
"fileset.name": "log",
"group.id": "1004",
Expand Down Expand Up @@ -95,8 +95,8 @@
"event.original": "type=ADD_GROUP msg=audit(1610903553.710:587): pid=2940 uid=0 auid=1000 ses=14 msg='op= id=1004 exe=\"/usr/sbin/groupadd\" hostname=ubuntu-bionic addr=127.0.0.1 terminal=pts/2 res=success'",
"event.outcome": "success",
"event.type": [
"group",
"creation"
"creation",
"group"
],
"fileset.name": "log",
"group.id": "1004",
Expand Down Expand Up @@ -133,8 +133,8 @@
"event.original": "type=ADD_USER msg=audit(1610903553.730:591): pid=2945 uid=0 auid=1000 ses=14 msg='op=adding user id=1004 exe=\"/usr/sbin/useradd\" hostname=ubuntu-bionic addr=127.0.0.1 terminal=pts/2 res=success'",
"event.outcome": "success",
"event.type": [
"user",
"creation"
"creation",
"user"
],
"fileset.name": "log",
"input.type": "log",
Expand Down Expand Up @@ -207,8 +207,8 @@
"event.original": "type=USER_CHAUTHTOK msg=audit(1610903558.174:594): pid=2953 uid=0 auid=1000 ses=14 msg='op=PAM:chauthtok acct=\"charlie\" exe=\"/usr/bin/passwd\" hostname=ubuntu-bionic addr=127.0.0.1 terminal=pts/2 res=success'",
"event.outcome": "success",
"event.type": [
"user",
"change"
"change",
"user"
],
"fileset.name": "log",
"input.type": "log",
Expand Down
8 changes: 4 additions & 4 deletions filebeat/module/elasticsearch/audit/test/test-access.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,10 @@
"elasticsearch.audit.action": "indices:data/read/search[free_context]",
"elasticsearch.audit.event_type": "access_granted",
"elasticsearch.audit.indices": [
"foo-2019.01.04",
"foo-2019.01.03",
"foo-2019.01.06",
"foo-2019.01.04",
"foo-2019.01.05",
"foo-2019.01.06",
"foo-2019.01.08",
"servicelog-2019.01.07"
],
Expand All @@ -182,9 +182,9 @@
"elasticsearch.audit.realm": "active_directory",
"elasticsearch.audit.request.name": "SearchFreeContextRequest",
"elasticsearch.audit.user.roles": [
"foo_reader",
"kibana_user",
"my_custom_role_1",
"foo_reader"
"my_custom_role_1"
],
"elasticsearch.node.name": "NodeName-0",
"event.category": "database",
Expand Down
4 changes: 2 additions & 2 deletions filebeat/module/elasticsearch/audit/test/test-audit-761.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"elasticsearch.audit.request.name": "MultiGetShardRequest",
"elasticsearch.audit.user.realm": "native1",
"elasticsearch.audit.user.roles": [
"logstash_admin",
"cluster_monitor"
"cluster_monitor",
"logstash_admin"
],
"elasticsearch.node.id": "vvj136QVQ2Ci2aXmrhyi3Q",
"event.action": "access_granted",
Expand Down
64 changes: 32 additions & 32 deletions filebeat/module/elasticsearch/gc/test/gc.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
{
"@timestamp": "2018-06-13T07:44:22.647Z",
"elasticsearch.gc.tags": [
"coops",
"gc",
"heap",
"coops"
"heap"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -737,8 +737,8 @@
{
"@timestamp": "2018-06-13T07:44:24.343Z",
"elasticsearch.gc.tags": [
"gc",
"age"
"age",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand All @@ -755,8 +755,8 @@
{
"@timestamp": "2018-06-13T07:44:24.343Z",
"elasticsearch.gc.tags": [
"gc",
"age"
"age",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand All @@ -773,8 +773,8 @@
{
"@timestamp": "2018-06-13T07:44:24.343Z",
"elasticsearch.gc.tags": [
"gc",
"age"
"age",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -864,8 +864,8 @@
{
"@timestamp": "2018-06-13T07:44:24.343Z",
"elasticsearch.gc.tags": [
"gc",
"cpu"
"cpu",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -951,8 +951,8 @@
{
"@timestamp": "2018-06-13T07:44:24.347Z",
"elasticsearch.gc.tags": [
"gc",
"cpu"
"cpu",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -1038,8 +1038,8 @@
{
"@timestamp": "2018-06-13T07:44:24.348Z",
"elasticsearch.gc.tags": [
"gc",
"cpu"
"cpu",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -1090,8 +1090,8 @@
{
"@timestamp": "2018-06-13T07:44:24.350Z",
"elasticsearch.gc.tags": [
"gc",
"cpu"
"cpu",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -1176,8 +1176,8 @@
{
"@timestamp": "2018-06-13T07:44:24.595Z",
"elasticsearch.gc.tags": [
"gc",
"cpu"
"cpu",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -1246,8 +1246,8 @@
{
"@timestamp": "2018-06-13T07:44:24.618Z",
"elasticsearch.gc.tags": [
"gc",
"cpu"
"cpu",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -1315,8 +1315,8 @@
{
"@timestamp": "2018-06-13T07:44:24.618Z",
"elasticsearch.gc.tags": [
"gc",
"cpu"
"cpu",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -1367,8 +1367,8 @@
{
"@timestamp": "2018-06-13T07:44:24.619Z",
"elasticsearch.gc.tags": [
"gc",
"cpu"
"cpu",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down Expand Up @@ -1628,8 +1628,8 @@
{
"@timestamp": "2018-06-13T07:44:25.167Z",
"elasticsearch.gc.tags": [
"gc",
"age"
"age",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand All @@ -1646,8 +1646,8 @@
{
"@timestamp": "2018-06-13T07:44:25.167Z",
"elasticsearch.gc.tags": [
"gc",
"age"
"age",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand All @@ -1664,8 +1664,8 @@
{
"@timestamp": "2018-06-13T07:44:25.167Z",
"elasticsearch.gc.tags": [
"gc",
"age"
"age",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand All @@ -1682,8 +1682,8 @@
{
"@timestamp": "2018-06-13T07:44:25.167Z",
"elasticsearch.gc.tags": [
"gc",
"age"
"age",
"gc"
],
"event.category": "database",
"event.dataset": "elasticsearch.gc",
Expand Down
Loading