[7.x](backport #25320) [Filebeat] Sort array fields in generated data #25706

mergify · 2021-05-13T15:39:46Z

This is an automatic backport of pull request #25320 done by Mergify.
Cherry-pick of 52f2265 has failed:

On branch mergify/bp/7.x/pr-25320
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 52f226530d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG-developer.next.asciidoc
	modified:   filebeat/module/auditd/log/test/audit-cent7-node.log-expected.json
	modified:   filebeat/module/auditd/log/test/audit-rhel6.log-expected.json
	modified:   filebeat/module/auditd/log/test/test.log-expected.json
	modified:   filebeat/module/auditd/log/test/useradd.log-expected.json
	modified:   filebeat/module/elasticsearch/audit/test/test-access.log-expected.json
	modified:   filebeat/module/elasticsearch/audit/test/test-audit-761.log-expected.json
	modified:   filebeat/module/elasticsearch/gc/test/gc.log-expected.json
	modified:   filebeat/module/elasticsearch/server/test/test-json.log-expected.json
	modified:   filebeat/module/haproxy/log/test/default.log-expected.json
	modified:   filebeat/module/iis/access/test/test-iis-7.2.log-expected.json
	modified:   filebeat/module/iis/access/test/test-iis-7.5.log-expected.json
	modified:   filebeat/module/iis/access/test/test-ipv6zone.log-expected.json
	modified:   filebeat/module/iis/access/test/test-x-forward-for-extended.log-expected.json
	modified:   filebeat/module/iis/access/test/test-x-forward-for.log-expected.json
	modified:   filebeat/module/iis/access/test/test.log-expected.json
	modified:   filebeat/module/iis/error/test/iis_error_url.log-expected.json
	modified:   filebeat/module/iis/error/test/ipv6_zone_id.log-expected.json
	modified:   filebeat/module/iis/error/test/test.log-expected.json
	modified:   filebeat/module/kibana/log/test/log.624.log-expected.json
	modified:   filebeat/module/kibana/log/test/log.verbose.624.log-expected.json
	modified:   filebeat/module/kibana/log/test/test.log-expected.json
	modified:   filebeat/module/mongodb/log/test/mongodb-debian-3.2.11.log-expected.json
	modified:   filebeat/module/mysql/error/test/mariadb-10.4.8.log-expected.json
	modified:   filebeat/module/mysql/error/test/mysql-ubuntu-5.5.53.log-expected.json
	modified:   filebeat/module/nginx/access/test/test-with-host.log-expected.json
	modified:   filebeat/module/nginx/access/test/test.log-expected.json
	modified:   filebeat/module/nginx/ingress_controller/test/test.log-expected.json
	modified:   filebeat/module/pensando/dfw/test/test.log-expected.json
	modified:   filebeat/module/santa/log/test/santa.log-expected.json
	modified:   filebeat/module/system/auth/test/auth-ubuntu1204.log-expected.json
	modified:   filebeat/module/system/auth/test/test.log-expected.json
	modified:   filebeat/module/system/auth/test/timestamp.log-expected.json
	modified:   filebeat/tests/system/test_modules.py
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/add-user-to-group-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/assume-role-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/change-password-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/cloudtrail-digest-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/create-access-key-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/create-group-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/create-user-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/create-virtual-mfa-device-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/deactivate-mfa-device-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/delete-access-key-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/delete-group-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/delete-ssh-public-key-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/delete-user-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/delete-virtual-mfa-device-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/enable-mfa-device-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/remove-user-from-group-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/update-access-key-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/update-group-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/update-login-profile-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/update-ssh-public-key-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/cloudtrail/test/update-user-json.log-expected.json
	modified:   x-pack/filebeat/module/aws/vpcflow/test/accept-reject-traffic.log-expected.json
	modified:   x-pack/filebeat/module/aws/vpcflow/test/custom-nat-gateway.log-expected.json
	modified:   x-pack/filebeat/module/aws/vpcflow/test/tcp-flag-sequence.log-expected.json
	modified:   x-pack/filebeat/module/barracuda/spamfirewall/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/cef/log/test/cef.log-expected.json
	modified:   x-pack/filebeat/module/cef/log/test/checkpoint.log-expected.json
	modified:   x-pack/filebeat/module/cef/log/test/fp-ngfw-smc.log-expected.json
	modified:   x-pack/filebeat/module/checkpoint/firewall/test/checkpoint.log-expected.json
	modified:   x-pack/filebeat/module/cisco/amp/test/cisco_amp1.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/cisco/amp/test/cisco_amp2.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/cisco/amp/test/cisco_amp3.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/cisco/amp/test/cisco_amp4.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/cisco/amp/test/cisco_amp5.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/cisco/amp/test/cisco_amp6.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/cisco/amp/test/cisco_amp7.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/cisco/asa/test/additional_messages.log-expected.json
	modified:   x-pack/filebeat/module/cisco/asa/test/asa-fix.log-expected.json
	modified:   x-pack/filebeat/module/cisco/asa/test/asa.log-expected.json
	modified:   x-pack/filebeat/module/cisco/asa/test/filtered.log-expected.json
	modified:   x-pack/filebeat/module/cisco/asa/test/hostnames.log-expected.json
	modified:   x-pack/filebeat/module/cisco/asa/test/not-ip.log-expected.json
	modified:   x-pack/filebeat/module/cisco/asa/test/sample.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ftd/test/asa-fix.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ftd/test/asa.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ftd/test/dns.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ftd/test/intrusion.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ftd/test/no-type-id.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ftd/test/not-ip.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ftd/test/sample.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ftd/test/security-connection.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ftd/test/security-malware-site.log-expected.json
	modified:   x-pack/filebeat/module/cisco/ios/test/cisco-ios-syslog.log-expected.json
	modified:   x-pack/filebeat/module/cisco/meraki/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/cisco/umbrella/test/umbrella-cloudfirewalllogs.log-expected.json
	modified:   x-pack/filebeat/module/cisco/umbrella/test/umbrella-dnslogs.log-expected.json
	modified:   x-pack/filebeat/module/cisco/umbrella/test/umbrella-proxylogs.log-expected.json
	modified:   x-pack/filebeat/module/coredns/log/test/coredns-json.log-expected.json
	modified:   x-pack/filebeat/module/coredns/log/test/coredns.log-expected.json
	modified:   x-pack/filebeat/module/crowdstrike/falcon/test/falcon-audit-events.log-expected.json
	modified:   x-pack/filebeat/module/crowdstrike/falcon/test/falcon-sample.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/105_add_file_category.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/106_update_file_category.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/107_delete_file_category.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/124_rename_file.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/125_rename_file_cont.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/130_cpm_disable_password.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/180_add_user.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/19_full_gateway_connection.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/24_cpm_change_password.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/294_store_password.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/295_retrieve_password.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/300_psm_connect.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/302_psm_disconnect.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/308_use_password.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/309_undefined_user_logon.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/31_cpm_reconcile_password.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/33_update_owner.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/359_sql_command.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/361_keystroke_logging.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/385_blservice_audit_record.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/38_cpm_verify_password_failed.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/411_window_title.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/412_keystroke_logging.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/427_store_ssh_key.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/428_retrieve_ssh_key.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/4_user_authentication.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/50_store_file.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/52_delete_file.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/57_cpm_change_password_failed.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/60_cpm_reconcile_password_failed.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/7_logon.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/8_logoff.log-expected.json
	modified:   x-pack/filebeat/module/cyberarkpas/audit/test/98_open_file_write_only.log-expected.json
	modified:   x-pack/filebeat/module/envoyproxy/log/test/envoy.log-expected.json
	modified:   x-pack/filebeat/module/fortinet/clientendpoint/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/fortinet/firewall/test/fortinet.log-expected.json
	modified:   x-pack/filebeat/module/fortinet/fortimail/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/gcp/firewall/test/rare.log-expected.json
	modified:   x-pack/filebeat/module/gcp/firewall/test/test.log-expected.json
	modified:   x-pack/filebeat/module/gcp/vpcflow/test/vpc-flow-log-entries.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-application-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-calendar-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-chat-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-chromeos-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-contacts-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-docs-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-domain-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-gmail-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-groups-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-mobile-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-security-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-sites-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/admin/test/admin-user-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/drive/test/drive-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/groups/test/groups-test.json.log-expected.json
	modified:   x-pack/filebeat/module/google_workspace/login/test/login-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-application-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-calendar-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-chat-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-chromeos-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-contacts-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-docs-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-domain-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-gmail-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-groups-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-mobile-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-security-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-sites-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/admin/test/gsuite-admin-user-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/drive/test/gsuite-drive-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/groups/test/gsuite-groups-test.json.log-expected.json
	modified:   x-pack/filebeat/module/gsuite/login/test/gsuite-login-test.json.log-expected.json
	modified:   x-pack/filebeat/module/ibmmq/errorlog/test/AMQERR01.log-expected.json
	modified:   x-pack/filebeat/module/ibmmq/errorlog/test/AMQERR01_QM2.log-expected.json
	modified:   x-pack/filebeat/module/infoblox/nios/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/juniper/junos/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/juniper/netscreen/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/juniper/srx/test/atp.log-expected.json
	modified:   x-pack/filebeat/module/juniper/srx/test/flow.log-expected.json
	modified:   x-pack/filebeat/module/juniper/srx/test/idp.log-expected.json
	modified:   x-pack/filebeat/module/juniper/srx/test/ids.log-expected.json
	modified:   x-pack/filebeat/module/juniper/srx/test/secintel.log-expected.json
	modified:   x-pack/filebeat/module/juniper/srx/test/utm.log-expected.json
	modified:   x-pack/filebeat/module/microsoft/defender_atp/test/defender_atp-test.json.log-expected.json
	modified:   x-pack/filebeat/module/microsoft/dhcp/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/microsoft/m365_defender/test/m365_defender-test-empty.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/microsoft/m365_defender/test/m365_defender-test.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/mysqlenterprise/audit/test/mysql_audit_test.log-expected.json
	modified:   x-pack/filebeat/module/netscout/sightline/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/o365/audit/test/08-azuread-users.log-expected.json
	modified:   x-pack/filebeat/module/o365/audit/test/08-azuread.log-expected.json
	modified:   x-pack/filebeat/module/o365/audit/test/13-dlp-exchange.log-expected.json
	modified:   x-pack/filebeat/module/o365/audit/test/15-azuread-sts-logon.log-expected.json
	modified:   x-pack/filebeat/module/o365/audit/test/22-yammer.log-expected.json
	modified:   x-pack/filebeat/module/o365/audit/test/25-ms-teams-groups.log-expected.json
	modified:   x-pack/filebeat/module/o365/audit/test/25-ms-teams.log-expected.json
	modified:   x-pack/filebeat/module/panw/panos/test/pan_inc_traffic_ietf.log-expected.json
	modified:   x-pack/filebeat/module/panw/panos/test/threat.log-expected.json
	modified:   x-pack/filebeat/module/panw/panos/test/traffic.log-expected.json
	modified:   x-pack/filebeat/module/proofpoint/emailsecurity/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/snyk/audit/test/snyk_audit.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/snyk/vulnerabilities/test/snyk_vulns.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/sonicwall/firewall/test/general.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/anti-spam.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/anti-virus.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/atp.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/cfilter.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/event.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/firewall.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/idp.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/sandbox.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/waf.log-expected.json
	modified:   x-pack/filebeat/module/sophos/xg/test/wifi.log-expected.json
	modified:   x-pack/filebeat/module/squid/log/test/access1.log-expected.json
	modified:   x-pack/filebeat/module/squid/log/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/suricata/eve/test/eve-6.0.log-expected.json
	modified:   x-pack/filebeat/module/suricata/eve/test/eve-alerts.log-expected.json
	modified:   x-pack/filebeat/module/suricata/eve/test/eve-dns-4.1.4.log-expected.json
	modified:   x-pack/filebeat/module/suricata/eve/test/eve-small.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/abusemalware/test/abusechmalware.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/abuseurl/test/abusechurl.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/anomali/test/anomali_limo.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/malwarebazaar/test/malwarebazaar.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/misp/test/misp_sample.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/otx/test/otx_sample.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zeek/connection/test/connection-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/dce_rpc/test/dce_rpc-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/dhcp/test/dhcp-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/dnp3/test/dnp3-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/dns/test/dns-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/dpd/test/dpd-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/files/test/files-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/irc/test/irc-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/kerberos/test/kerberos-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/mysql/test/mysql-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/notice/test/notice-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/ntlm/test/ntlm-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/ntp/test/ntp-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/pe/test/pe-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/radius/test/radius-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/rdp/test/rdp-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/rfb/test/rfb-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/sip/test/sip-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/smb_cmd/test/smb_cmd-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/smb_files/test/smb_files-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/smb_mapping/test/smb_mapping-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/snmp/test/snmp-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/ssh/test/ssh-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/ssl/test/ssl-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/tunnel/test/tunnel-json.log-expected.json
	modified:   x-pack/filebeat/module/zeek/x509/test/x509-json.log-expected.json
	modified:   x-pack/filebeat/module/zoom/webhook/test/account.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zoom/webhook/test/chat_channel.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zoom/webhook/test/chat_message.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zoom/webhook/test/meeting.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zoom/webhook/test/phone.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zoom/webhook/test/recording.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zoom/webhook/test/user.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zoom/webhook/test/webinar.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zoom/webhook/test/zoomroom.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/zscaler/zia/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/zscaler/zia/test/test.log-expected.json

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   x-pack/filebeat/module/azure/signinlogs/test/signinlogs.log-expected.json
	both modified:   x-pack/filebeat/module/cyberark/corepas/test/generated.log-expected.json
	both modified:   x-pack/filebeat/module/f5/bigipafm/test/generated.log-expected.json
	both modified:   x-pack/filebeat/module/fortinet/fortimanager/test/generated.log-expected.json
	both modified:   x-pack/filebeat/module/imperva/securesphere/test/generated.log-expected.json
	both modified:   x-pack/filebeat/module/iptables/log/test/geo.log-expected.json
	both modified:   x-pack/filebeat/module/iptables/log/test/icmp.log-expected.json
	both modified:   x-pack/filebeat/module/iptables/log/test/iptables.log-expected.json
	both modified:   x-pack/filebeat/module/iptables/log/test/ipv6.log-expected.json
	both modified:   x-pack/filebeat/module/iptables/log/test/ubiquiti.log-expected.json
	deleted by us:   x-pack/filebeat/module/panw/panos/test/global_protect.log-expected.json
	both modified:   x-pack/filebeat/module/panw/panos/test/pan_inc_other.log-expected.json
	both modified:   x-pack/filebeat/module/panw/panos/test/pan_inc_threat.log-expected.json
	both modified:   x-pack/filebeat/module/panw/panos/test/pan_inc_traffic.log-expected.json
	deleted by us:   x-pack/filebeat/module/panw/panos/test/userid.log-expected.json
	both modified:   x-pack/filebeat/module/snort/log/test/generated.log-expected.json
	both modified:   x-pack/filebeat/module/sonicwall/firewall/test/generated.log-expected.json
	both modified:   x-pack/filebeat/module/sophos/utm/test/generated.log-expected.json
	both modified:   x-pack/filebeat/module/tomcat/log/test/generated.log-expected.json

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

@Mergifyio refresh will re-evaluate the rules
@Mergifyio rebase will rebase this PR on its base branch
@Mergifyio update will merge the base branch into this PR
@Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

look at your merge queues
generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

botelastic · 2021-05-13T15:39:52Z

This pull request doesn't have a Team:<team> label.

elasticmachine · 2021-05-13T16:54:26Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Build Cause: Pull request #25706 updated
Start Time: 2021-05-14T00:48:10.060+0000
Duration: 130 min 26 sec
Commit: 3ed2dce

Test stats 🧪

Test	Results
Failed	0
Passed	13677
Skipped	2299
Total	15976

Trends 🧪

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test	Results
Failed	0
Passed	13677
Skipped	2299
Total	15976

- sort arrays by using string representation of values - update generated data (cherry picked from commit 52f2265)

mergify bot added backport conflicts There is a conflict in the backported pull request labels May 13, 2021

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 13, 2021

[Filebeat] Sort array fields in generated data (#25320)

3ed2dce

- sort arrays by using string representation of values - update generated data (cherry picked from commit 52f2265)

leehinman force-pushed the mergify/bp/7.x/pr-25320 branch from 4f13279 to 3ed2dce Compare May 14, 2021 00:47

leehinman merged commit 981d679 into 7.x May 14, 2021

leehinman deleted the mergify/bp/7.x/pr-25320 branch May 14, 2021 13:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[7.x](backport #25320) [Filebeat] Sort array fields in generated data #25706

[7.x](backport #25320) [Filebeat] Sort array fields in generated data #25706

mergify bot commented May 13, 2021 •

edited by zube bot

Loading

botelastic bot commented May 13, 2021

elasticmachine commented May 13, 2021 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

Trends 🧪

Test stats 🧪

[7.x](backport #25320) [Filebeat] Sort array fields in generated data #25706

[7.x](backport #25320) [Filebeat] Sort array fields in generated data #25706

Conversation

mergify bot commented May 13, 2021 • edited by zube bot Loading

botelastic bot commented May 13, 2021

elasticmachine commented May 13, 2021 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

Trends 🧪

💚 Flaky test report

Test stats 🧪

mergify bot commented May 13, 2021 •

edited by zube bot

Loading

elasticmachine commented May 13, 2021 •

edited by jenkins-beats-ci bot

Loading