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.

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

[7.x](backport #27107) Change fields.ecs.yml to ECS 1.11.0 #27421

Merged
merged 1 commit into from
Aug 17, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 17, 2021

This is an automatic backport of pull request #27107 done by Mergify.
Cherry-pick of 5869e1f has failed:

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

You are currently cherry-picking commit 5869e1f85e.
  (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.next.asciidoc
	modified:   NOTICE.txt
	modified:   auditbeat/cmd/root.go
	modified:   auditbeat/docs/fields.asciidoc
	modified:   filebeat/docs/fields.asciidoc
	modified:   filebeat/module/apache/access/config/access.yml
	modified:   filebeat/module/apache/error/config/error.yml
	modified:   filebeat/module/auditd/log/config/log.yml
	modified:   filebeat/module/elasticsearch/audit/config/audit.yml
	modified:   filebeat/module/elasticsearch/deprecation/config/log.yml
	modified:   filebeat/module/elasticsearch/gc/config/gc.yml
	modified:   filebeat/module/elasticsearch/server/config/log.yml
	modified:   filebeat/module/elasticsearch/slowlog/config/slowlog.yml
	modified:   filebeat/module/haproxy/log/config/file.yml
	modified:   filebeat/module/haproxy/log/config/syslog.yml
	modified:   filebeat/module/icinga/debug/config/debug.yml
	modified:   filebeat/module/icinga/main/config/main.yml
	modified:   filebeat/module/icinga/startup/config/startup.yml
	modified:   filebeat/module/iis/access/config/iis-access.yml
	modified:   filebeat/module/iis/error/config/iis-error.yml
	modified:   filebeat/module/kafka/log/config/log.yml
	modified:   filebeat/module/kibana/audit/config/audit.yml
	modified:   filebeat/module/kibana/log/config/log.yml
	modified:   filebeat/module/logstash/log/config/log.yml
	modified:   filebeat/module/logstash/slowlog/config/slowlog.yml
	modified:   filebeat/module/mongodb/log/config/log.yml
	modified:   filebeat/module/mysql/error/config/error.yml
	modified:   filebeat/module/mysql/slowlog/config/slowlog.yml
	modified:   filebeat/module/nats/log/config/log.yml
	modified:   filebeat/module/nginx/access/config/nginx-access.yml
	modified:   filebeat/module/nginx/error/config/nginx-error.yml
	modified:   filebeat/module/nginx/ingress_controller/config/ingress_controller.yml
	modified:   filebeat/module/osquery/result/config/result.yml
	modified:   filebeat/module/pensando/dfw/config/dfw.yml
	modified:   filebeat/module/postgresql/log/config/log.yml
	modified:   filebeat/module/redis/log/config/log.yml
	modified:   filebeat/module/redis/slowlog/config/slowlog.yml
	modified:   filebeat/module/santa/log/config/file.yml
	modified:   filebeat/module/system/auth/config/auth.yml
	modified:   filebeat/module/system/syslog/config/syslog.yml
	modified:   filebeat/module/traefik/access/config/traefik-access.yml
	modified:   go.sum
	modified:   heartbeat/cmd/root.go
	modified:   heartbeat/docs/fields.asciidoc
	modified:   journalbeat/cmd/root.go
	modified:   journalbeat/docs/fields.asciidoc
	modified:   libbeat/_meta/fields.ecs.yml
	modified:   metricbeat/cmd/root.go
	modified:   packetbeat/cmd/root.go
	modified:   packetbeat/docs/fields.asciidoc
	modified:   winlogbeat/cmd/root.go
	modified:   winlogbeat/docs/fields.asciidoc
	modified:   x-pack/filebeat/module/activemq/audit/config/audit.yml
	modified:   x-pack/filebeat/module/activemq/log/config/log.yml
	modified:   x-pack/filebeat/module/aws/cloudtrail/config/aws-s3.yml
	modified:   x-pack/filebeat/module/aws/cloudtrail/config/file.yml
	modified:   x-pack/filebeat/module/aws/cloudwatch/config/aws-s3.yml
	modified:   x-pack/filebeat/module/aws/cloudwatch/config/file.yml
	modified:   x-pack/filebeat/module/aws/ec2/config/aws-s3.yml
	modified:   x-pack/filebeat/module/aws/ec2/config/file.yml
	modified:   x-pack/filebeat/module/aws/elb/config/aws-s3.yml
	modified:   x-pack/filebeat/module/aws/elb/config/file.yml
	modified:   x-pack/filebeat/module/aws/s3access/config/aws-s3.yml
	modified:   x-pack/filebeat/module/aws/s3access/config/file.yml
	modified:   x-pack/filebeat/module/aws/vpcflow/config/input.yml
	modified:   x-pack/filebeat/module/awsfargate/log/config/aws-cloudwatch.yml
	modified:   x-pack/filebeat/module/awsfargate/log/config/file.yml
	modified:   x-pack/filebeat/module/azure/activitylogs/config/azure-eventhub.yml
	modified:   x-pack/filebeat/module/azure/activitylogs/config/file.yml
	modified:   x-pack/filebeat/module/azure/activitylogs/test/activitylogs_edgecases.log-expected.json
	modified:   x-pack/filebeat/module/azure/auditlogs/config/azure-eventhub.yml
	modified:   x-pack/filebeat/module/azure/auditlogs/config/file.yml
	modified:   x-pack/filebeat/module/azure/platformlogs/config/azure-eventhub.yml
	modified:   x-pack/filebeat/module/azure/platformlogs/config/file.yml
	modified:   x-pack/filebeat/module/azure/signinlogs/config/azure-eventhub.yml
	modified:   x-pack/filebeat/module/azure/signinlogs/config/file.yml
	modified:   x-pack/filebeat/module/barracuda/spamfirewall/config/input.yml
	modified:   x-pack/filebeat/module/barracuda/waf/config/input.yml
	modified:   x-pack/filebeat/module/bluecoat/director/config/input.yml
	modified:   x-pack/filebeat/module/cef/log/config/input.yml
	modified:   x-pack/filebeat/module/checkpoint/firewall/config/firewall.yml
	modified:   x-pack/filebeat/module/cisco/amp/config/config.yml
	modified:   x-pack/filebeat/module/cisco/asa/config/input.yml
	modified:   x-pack/filebeat/module/cisco/ftd/config/input.yml
	modified:   x-pack/filebeat/module/cisco/ios/config/input.yml
	modified:   x-pack/filebeat/module/cisco/meraki/config/input.yml
	modified:   x-pack/filebeat/module/cisco/nexus/config/input.yml
	modified:   x-pack/filebeat/module/cisco/umbrella/config/input.yml
	modified:   x-pack/filebeat/module/coredns/log/config/coredns.yml
	modified:   x-pack/filebeat/module/crowdstrike/falcon/config/falcon.yml
	modified:   x-pack/filebeat/module/cyberark/corepas/config/input.yml
	modified:   x-pack/filebeat/module/cyberarkpas/audit/config/input.yml
	modified:   x-pack/filebeat/module/cylance/protect/config/input.yml
	modified:   x-pack/filebeat/module/envoyproxy/log/config/envoyproxy.yml
	modified:   x-pack/filebeat/module/f5/bigipafm/config/input.yml
	modified:   x-pack/filebeat/module/f5/bigipapm/config/input.yml
	modified:   x-pack/filebeat/module/fortinet/clientendpoint/config/input.yml
	modified:   x-pack/filebeat/module/fortinet/firewall/config/firewall.yml
	modified:   x-pack/filebeat/module/fortinet/fortimail/config/input.yml
	modified:   x-pack/filebeat/module/fortinet/fortimanager/config/input.yml
	modified:   x-pack/filebeat/module/gcp/audit/config/input.yml
	modified:   x-pack/filebeat/module/gcp/firewall/config/input.yml
	modified:   x-pack/filebeat/module/gcp/vpcflow/config/input.yml
	modified:   x-pack/filebeat/module/google_workspace/admin/config/config.yml
	modified:   x-pack/filebeat/module/google_workspace/drive/config/config.yml
	modified:   x-pack/filebeat/module/google_workspace/groups/config/config.yml
	modified:   x-pack/filebeat/module/google_workspace/login/config/config.yml
	modified:   x-pack/filebeat/module/google_workspace/saml/config/config.yml
	modified:   x-pack/filebeat/module/google_workspace/user_accounts/config/config.yml
	modified:   x-pack/filebeat/module/gsuite/admin/config/config.yml
	modified:   x-pack/filebeat/module/gsuite/drive/config/config.yml
	modified:   x-pack/filebeat/module/gsuite/groups/config/config.yml
	modified:   x-pack/filebeat/module/gsuite/login/config/config.yml
	modified:   x-pack/filebeat/module/gsuite/saml/config/config.yml
	modified:   x-pack/filebeat/module/gsuite/user_accounts/config/config.yml
	modified:   x-pack/filebeat/module/ibmmq/errorlog/config/errorlog.yml
	modified:   x-pack/filebeat/module/imperva/securesphere/config/input.yml
	modified:   x-pack/filebeat/module/infoblox/nios/config/input.yml
	modified:   x-pack/filebeat/module/iptables/log/config/input.yml
	modified:   x-pack/filebeat/module/juniper/junos/config/input.yml
	modified:   x-pack/filebeat/module/juniper/netscreen/config/input.yml
	modified:   x-pack/filebeat/module/juniper/srx/config/srx.yml
	modified:   x-pack/filebeat/module/microsoft/defender_atp/config/atp.yml
	modified:   x-pack/filebeat/module/microsoft/dhcp/config/input.yml
	modified:   x-pack/filebeat/module/microsoft/m365_defender/config/defender.yml
	modified:   x-pack/filebeat/module/misp/threat/config/input.yml
	modified:   x-pack/filebeat/module/mssql/log/config/config.yml
	modified:   x-pack/filebeat/module/mysqlenterprise/audit/config/config.yml
	modified:   x-pack/filebeat/module/netflow/log/config/netflow.yml
	modified:   x-pack/filebeat/module/netscout/sightline/config/input.yml
	modified:   x-pack/filebeat/module/o365/audit/config/input.yml
	modified:   x-pack/filebeat/module/okta/system/config/input.yml
	modified:   x-pack/filebeat/module/oracle/database_audit/config/config.yml
	modified:   x-pack/filebeat/module/panw/panos/config/input.yml
	modified:   x-pack/filebeat/module/proofpoint/emailsecurity/config/input.yml
	modified:   x-pack/filebeat/module/rabbitmq/log/config/log.yml
	modified:   x-pack/filebeat/module/radware/defensepro/config/input.yml
	modified:   x-pack/filebeat/module/snort/log/config/input.yml
	modified:   x-pack/filebeat/module/snyk/audit/config/config.yml
	modified:   x-pack/filebeat/module/snyk/vulnerabilities/config/config.yml
	modified:   x-pack/filebeat/module/sonicwall/firewall/config/input.yml
	modified:   x-pack/filebeat/module/sophos/utm/config/input.yml
	modified:   x-pack/filebeat/module/sophos/xg/config/config.yml
	modified:   x-pack/filebeat/module/squid/log/config/input.yml
	modified:   x-pack/filebeat/module/suricata/eve/config/eve.yml
	modified:   x-pack/filebeat/module/threatintel/abusemalware/config/config.yml
	modified:   x-pack/filebeat/module/threatintel/abusemalware/test/abusechmalware.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/abuseurl/config/config.yml
	modified:   x-pack/filebeat/module/threatintel/anomali/config/config.yml
	modified:   x-pack/filebeat/module/threatintel/anomalithreatstream/config/config.yml
	modified:   x-pack/filebeat/module/threatintel/malwarebazaar/config/config.yml
	modified:   x-pack/filebeat/module/threatintel/otx/config/config.yml
	modified:   x-pack/filebeat/module/threatintel/recordedfuture/config/config.yml
	modified:   x-pack/filebeat/module/tomcat/log/config/input.yml
	modified:   x-pack/filebeat/module/zeek/capture_loss/config/capture_loss.yml
	modified:   x-pack/filebeat/module/zeek/connection/config/connection.yml
	modified:   x-pack/filebeat/module/zeek/dce_rpc/config/dce_rpc.yml
	modified:   x-pack/filebeat/module/zeek/dhcp/config/dhcp.yml
	modified:   x-pack/filebeat/module/zeek/dnp3/config/dnp3.yml
	modified:   x-pack/filebeat/module/zeek/dns/config/dns.yml
	modified:   x-pack/filebeat/module/zeek/dpd/config/dpd.yml
	modified:   x-pack/filebeat/module/zeek/files/config/files.yml
	modified:   x-pack/filebeat/module/zeek/ftp/config/ftp.yml
	modified:   x-pack/filebeat/module/zeek/http/config/http.yml
	modified:   x-pack/filebeat/module/zeek/intel/config/intel.yml
	modified:   x-pack/filebeat/module/zeek/irc/config/irc.yml
	modified:   x-pack/filebeat/module/zeek/kerberos/config/kerberos.yml
	modified:   x-pack/filebeat/module/zeek/modbus/config/modbus.yml
	modified:   x-pack/filebeat/module/zeek/mysql/config/mysql.yml
	modified:   x-pack/filebeat/module/zeek/notice/config/notice.yml
	modified:   x-pack/filebeat/module/zeek/ntlm/config/ntlm.yml
	modified:   x-pack/filebeat/module/zeek/ntp/config/ntp.yml
	modified:   x-pack/filebeat/module/zeek/ocsp/config/ocsp.yml
	modified:   x-pack/filebeat/module/zeek/pe/config/pe.yml
	modified:   x-pack/filebeat/module/zeek/radius/config/radius.yml
	modified:   x-pack/filebeat/module/zeek/rdp/config/rdp.yml
	modified:   x-pack/filebeat/module/zeek/rfb/config/rfb.yml
	modified:   x-pack/filebeat/module/zeek/signature/config/signature.yml
	modified:   x-pack/filebeat/module/zeek/sip/config/sip.yml
	modified:   x-pack/filebeat/module/zeek/smb_cmd/config/smb_cmd.yml
	modified:   x-pack/filebeat/module/zeek/smb_files/config/smb_files.yml
	modified:   x-pack/filebeat/module/zeek/smb_mapping/config/smb_mapping.yml
	modified:   x-pack/filebeat/module/zeek/smtp/config/smtp.yml
	modified:   x-pack/filebeat/module/zeek/snmp/config/snmp.yml
	modified:   x-pack/filebeat/module/zeek/socks/config/socks.yml
	modified:   x-pack/filebeat/module/zeek/ssh/config/ssh.yml
	modified:   x-pack/filebeat/module/zeek/ssl/config/ssl.yml
	modified:   x-pack/filebeat/module/zeek/stats/config/stats.yml
	modified:   x-pack/filebeat/module/zeek/syslog/config/syslog.yml
	modified:   x-pack/filebeat/module/zeek/traceroute/config/traceroute.yml
	modified:   x-pack/filebeat/module/zeek/tunnel/config/tunnel.yml
	modified:   x-pack/filebeat/module/zeek/weird/config/weird.yml
	modified:   x-pack/filebeat/module/zeek/x509/config/x509.yml
	modified:   x-pack/filebeat/module/zookeeper/audit/config/audit.yml
	modified:   x-pack/filebeat/module/zookeeper/log/config/log.yml
	modified:   x-pack/filebeat/module/zoom/webhook/config/webhook.yml
	modified:   x-pack/filebeat/module/zscaler/zia/config/input.yml
	modified:   x-pack/functionbeat/docs/fields.asciidoc
	modified:   x-pack/metricbeat/cmd/root.go
	modified:   x-pack/osquerybeat/cmd/root.go
	modified:   x-pack/osquerybeat/docs/fields.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   auditbeat/include/fields.go
	both modified:   filebeat/include/fields.go
	both modified:   go.mod
	both modified:   heartbeat/include/fields.go
	both modified:   journalbeat/include/fields.go
	both modified:   metricbeat/docs/fields.asciidoc
	both modified:   packetbeat/include/fields.go
	both modified:   winlogbeat/include/fields.go
	both modified:   x-pack/functionbeat/include/fields.go
	both modified:   x-pack/heartbeat/include/fields.go
	both modified:   x-pack/osquerybeat/include/fields.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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/

@mergify mergify bot requested a review from a team as a code owner August 17, 2021 12:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 17, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 17, 2021
@botelastic
Copy link

botelastic bot commented Aug 17, 2021

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 17, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-08-17T16:08:29.838+0000

  • Duration: 229 min 30 sec

  • Commit: dc0782f

Test stats 🧪

Test Results
Failed 0
Passed 52808
Skipped 5267
Total 58075

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 52808
Skipped 5267
Total 58075

@mergify
Copy link
Contributor Author

mergify bot commented Aug 17, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-27107 upstream/mergify/bp/7.x/pr-27107
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-27107

* Change fields.ecs.yml to ECS 1.11.0

- fields.ecs.yml to ECS 1.11.0
- bump ecs.version in configs for modules that don't require changes.

Relates #26967

(cherry picked from commit 5869e1f)
@leehinman leehinman merged commit 178ff4b into 7.x Aug 17, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-27107 branch August 17, 2021 20:51
@mergify
Copy link
Contributor Author

mergify bot commented Nov 16, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-27107 upstream/mergify/bp/7.x/pr-27107
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-27107

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants