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 #27220) Use Saved Objects API for exporting and importing dashboards #27398

Merged
merged 1 commit into from
Aug 16, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2021

This is an automatic backport of pull request #27220 done by Mergify.
Cherry-pick of 099dfa3 has failed:

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

You are currently cherry-picking commit 099dfa379.
  (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
	new file:   auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-executions.ndjson
	new file:   auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-overview.ndjson
	new file:   auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-sockets.ndjson
	modified:   auditbeat/module/auditd/module.yml
	deleted:    auditbeat/module/file_integrity/_meta/kibana/7/dashboard/auditbeat-file-integrity.json
	new file:   auditbeat/module/file_integrity/_meta/kibana/7/dashboard/auditbeat-file-integrity.ndjson
	modified:   auditbeat/module/file_integrity/module.yml
	modified:   dev-tools/cmd/dashboards/export_dashboards.go
	modified:   dev-tools/mage/dashboard.go
	modified:   docs/devguide/newdashboards.asciidoc
	deleted:    filebeat/module/apache/_meta/kibana/7/dashboard/Filebeat-apache.json
	new file:   filebeat/module/apache/_meta/kibana/7/dashboard/Filebeat-apache.ndjson
	modified:   filebeat/module/apache/module.yml
	deleted:    filebeat/module/auditd/_meta/kibana/7/dashboard/Filebeat-auditd.json
	new file:   filebeat/module/auditd/_meta/kibana/7/dashboard/Filebeat-auditd.ndjson
	modified:   filebeat/module/auditd/module.yml
	deleted:    filebeat/module/haproxy/_meta/kibana/7/dashboard/Filebeat-haproxy-overview.json
	new file:   filebeat/module/haproxy/_meta/kibana/7/dashboard/Filebeat-haproxy-overview.ndjson
	modified:   filebeat/module/haproxy/module.yml
	deleted:    filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-debug-log.json
	new file:   filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-debug-log.ndjson
	deleted:    filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-main-log.json
	new file:   filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-main-log.ndjson
	deleted:    filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-startup-errors.json
	new file:   filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-startup-errors.ndjson
	modified:   filebeat/module/icinga/module.yml
	deleted:    filebeat/module/iis/_meta/kibana/7/dashboard/Filebeat-iis.json
	new file:   filebeat/module/iis/_meta/kibana/7/dashboard/Filebeat-iis.ndjson
	deleted:    filebeat/module/kafka/_meta/kibana/7/dashboard/Filebeat-Kafka-overview.json
	new file:   filebeat/module/kafka/_meta/kibana/7/dashboard/Filebeat-Kafka-overview.ndjson
	modified:   filebeat/module/kafka/module.yml
	deleted:    filebeat/module/logstash/_meta/kibana/7/dashboard/Filebeat-logstash-log.json
	new file:   filebeat/module/logstash/_meta/kibana/7/dashboard/Filebeat-logstash-log.ndjson
	deleted:    filebeat/module/logstash/_meta/kibana/7/dashboard/Filebeat-logstash-slowlog.json
	new file:   filebeat/module/logstash/_meta/kibana/7/dashboard/Filebeat-logstash-slowlog.ndjson
	modified:   filebeat/module/logstash/module.yml
	deleted:    filebeat/module/mongodb/_meta/kibana/7/dashboard/Filebeat-Mongodb-overview.json
	new file:   filebeat/module/mongodb/_meta/kibana/7/dashboard/Filebeat-Mongodb-overview.ndjson
	modified:   filebeat/module/mongodb/module.yml
	deleted:    filebeat/module/mysql/_meta/kibana/7/dashboard/Filebeat-mysql.json
	new file:   filebeat/module/mysql/_meta/kibana/7/dashboard/Filebeat-mysql.ndjson
	modified:   filebeat/module/mysql/module.yml
	deleted:    filebeat/module/nats/_meta/kibana/7/dashboard/Filebeat-nats-overview.json
	new file:   filebeat/module/nats/_meta/kibana/7/dashboard/Filebeat-nats-overview.ndjson
	modified:   filebeat/module/nats/module.yml
	deleted:    filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-ingress-logs.json
	new file:   filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-ingress-logs.ndjson
	deleted:    filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-ingress-overview.json
	new file:   filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-ingress-overview.ndjson
	deleted:    filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-logs.json
	new file:   filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-logs.ndjson
	deleted:    filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-overview.json
	new file:   filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-overview.ndjson
	modified:   filebeat/module/nginx/module.yml
	deleted:    filebeat/module/osquery/_meta/kibana/7/dashboard/osquery-compliance.json
	new file:   filebeat/module/osquery/_meta/kibana/7/dashboard/osquery-compliance.ndjson
	new file:   filebeat/module/osquery/_meta/kibana/7/dashboard/osquery-rootkit.ndjson
	modified:   filebeat/module/osquery/module.yml
	deleted:    filebeat/module/pensando/_meta/kibana/7/dashboard/pensando-dfw-overview.json
	new file:   filebeat/module/pensando/_meta/kibana/7/dashboard/pensando-dfw-overview.ndjson
	deleted:    filebeat/module/postgresql/_meta/kibana/7/dashboard/Filebeat-Postgresql-overview.json
	new file:   filebeat/module/postgresql/_meta/kibana/7/dashboard/Filebeat-Postgresql-overview.ndjson
	deleted:    filebeat/module/postgresql/_meta/kibana/7/dashboard/Filebeat-Postgresql-slowlogs.json
	new file:   filebeat/module/postgresql/_meta/kibana/7/dashboard/Filebeat-Postgresql-slowlogs.ndjson
	modified:   filebeat/module/postgresql/module.yml
	deleted:    filebeat/module/redis/_meta/kibana/7/dashboard/Filebeat-redis.json
	new file:   filebeat/module/redis/_meta/kibana/7/dashboard/Filebeat-redis.ndjson
	modified:   filebeat/module/redis/module.yml
	new file:   filebeat/module/santa/_meta/kibana/7/dashboard/filebeat-santa-log-overview.ndjson
	modified:   filebeat/module/santa/module.yml
	deleted:    filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-auth-sudo-commands.json
	new file:   filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-auth-sudo-commands.ndjson
	deleted:    filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-new-users-and-groups.json
	new file:   filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-new-users-and-groups.ndjson
	deleted:    filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-ssh-login-attempts.json
	new file:   filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-ssh-login-attempts.ndjson
	deleted:    filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-syslog.json
	new file:   filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-syslog.ndjson
	modified:   filebeat/module/system/module.yml
	deleted:    filebeat/module/traefik/_meta/kibana/7/dashboard/Filebeat-traefik-overview.json
	new file:   filebeat/module/traefik/_meta/kibana/7/dashboard/Filebeat-traefik-overview.ndjson
	modified:   filebeat/module/traefik/module.yml
	modified:   filebeat/tests/system/input/template-test-module/module.yml
	modified:   filebeat/tests/system/test_index_pattern.py
	modified:   libbeat/cmd/export/dashboard.go
	modified:   libbeat/dashboards/export.go
	modified:   libbeat/dashboards/importer.go
	modified:   libbeat/dashboards/kibana_loader.go
	modified:   libbeat/dashboards/modify_json_test.go
	modified:   libbeat/kibana/client_test.go
	modified:   libbeat/kibana/dashboard.go
	modified:   libbeat/kibana/index_pattern_generator.go
	modified:   libbeat/kibana/index_pattern_generator_test.go
	deleted:    libbeat/kibana/testdata/beat-6.json
	new file:   libbeat/kibana/testdata/beat-6.ndjson
	renamed:    libbeat/kibana/testdata/extensive/metricbeat-6.json -> libbeat/kibana/testdata/extensive/metricbeat-6.ndjson
	modified:   libbeat/tests/files/dashboards.yml
	modified:   libbeat/tests/system/beat/common_tests.py
	modified:   libbeat/tests/system/test_dashboard.py
	modified:   libbeat/tests/system/test_index_pattern.py
	deleted:    metricbeat/module/aerospike/_meta/kibana/7/dashboard/Metricbeat-aerospike-overview.json
	new file:   metricbeat/module/aerospike/_meta/kibana/7/dashboard/Metricbeat-aerospike-overview.ndjson
	deleted:    metricbeat/module/apache/_meta/kibana/7/dashboard/Metricbeat-apache-overview.json
	new file:   metricbeat/module/apache/_meta/kibana/7/dashboard/Metricbeat-apache-overview.ndjson
	modified:   metricbeat/module/apache/module.yml
	deleted:    metricbeat/module/ceph/_meta/kibana/7/dashboard/Metricbeat-ceph-overview.json
	new file:   metricbeat/module/ceph/_meta/kibana/7/dashboard/Metricbeat-ceph-overview.ndjson
	deleted:    metricbeat/module/consul/_meta/kibana/7/dashboard/Metricbeat-consul-overview.json
	new file:   metricbeat/module/consul/_meta/kibana/7/dashboard/Metricbeat-consul-overview.ndjson
	deleted:    metricbeat/module/couchbase/_meta/kibana/7/dashboard/Metricbeat-couchbase-overview.json
	new file:   metricbeat/module/couchbase/_meta/kibana/7/dashboard/Metricbeat-couchbase-overview.ndjson
	deleted:    metricbeat/module/couchdb/_meta/kibana/7/dashboard/Metricbeat-couchdb-overview.json
	new file:   metricbeat/module/couchdb/_meta/kibana/7/dashboard/Metricbeat-couchdb-overview.ndjson
	new file:   metricbeat/module/docker/_meta/kibana/7/dashboard/Metricbeat-docker-overview.ndjson
	modified:   metricbeat/module/docker/module.yml
	deleted:    metricbeat/module/golang/_meta/kibana/7/dashboard/Metricbeat-golang-overview.json
	new file:   metricbeat/module/golang/_meta/kibana/7/dashboard/Metricbeat-golang-overview.ndjson
	modified:   metricbeat/module/golang/module.yml
	deleted:    metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-backend.json
	new file:   metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-backend.ndjson
	deleted:    metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-frontend.json
	new file:   metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-frontend.ndjson
	deleted:    metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-http-backend.json
	new file:   metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-http-backend.ndjson
	deleted:    metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-http-frontend.json
	new file:   metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-http-frontend.ndjson
	deleted:    metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-http-server.json
	new file:   metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-http-server.ndjson
	deleted:    metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-overview.json
	new file:   metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-overview.ndjson
	deleted:    metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-visualizations.json
	modified:   metricbeat/module/haproxy/module.yml
	deleted:    metricbeat/module/kafka/_meta/kibana/7/dashboard/Metricbeat-kafka-overview.json
	new file:   metricbeat/module/kafka/_meta/kibana/7/dashboard/Metricbeat-kafka-overview.ndjson
	deleted:    metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-apiserver.json
	new file:   metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-apiserver.ndjson
	deleted:    metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-controller-manager.json
	new file:   metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-controller-manager.ndjson
	deleted:    metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-overview.json
	new file:   metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-overview.ndjson
	deleted:    metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-proxy.json
	new file:   metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-proxy.ndjson
	deleted:    metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-scheduler.json
	new file:   metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-scheduler.ndjson
	modified:   metricbeat/module/kubernetes/module.yml
	deleted:    metricbeat/module/mongodb/_meta/kibana/7/dashboard/Metricbeat-mongodb-overview.json
	new file:   metricbeat/module/mongodb/_meta/kibana/7/dashboard/Metricbeat-mongodb-overview.ndjson
	modified:   metricbeat/module/mongodb/module.yml
	deleted:    metricbeat/module/mysql/_meta/kibana/7/dashboard/Metricbeat-mysql-overview.json
	new file:   metricbeat/module/mysql/_meta/kibana/7/dashboard/Metricbeat-mysql-overview.ndjson
	modified:   metricbeat/module/mysql/module.yml
	deleted:    metricbeat/module/nats/_meta/kibana/7/dashboard/Metricbeat-nats-overview.json
	new file:   metricbeat/module/nats/_meta/kibana/7/dashboard/Metricbeat-nats-overview.ndjson
	modified:   metricbeat/module/nats/module.yml
	deleted:    metricbeat/module/nginx/_meta/kibana/7/dashboard/metricbeat-nginx-overview.json
	new file:   metricbeat/module/nginx/_meta/kibana/7/dashboard/metricbeat-nginx-overview.ndjson
	modified:   metricbeat/module/nginx/module.yml
	deleted:    metricbeat/module/postgresql/_meta/kibana/7/dashboard/Metricbeat-postgresql-overview.json
	new file:   metricbeat/module/postgresql/_meta/kibana/7/dashboard/Metricbeat-postgresql-overview.ndjson
	deleted:    metricbeat/module/prometheus/_meta/kibana/7/dashboard/Metricbeat-prometheus-overview.json
	new file:   metricbeat/module/prometheus/_meta/kibana/7/dashboard/Metricbeat-prometheus-overview.ndjson
	deleted:    metricbeat/module/rabbitmq/_meta/kibana/7/dashboard/Metricbeat-rabbitmq-overview.json
	new file:   metricbeat/module/rabbitmq/_meta/kibana/7/dashboard/Metricbeat-rabbitmq-overview.ndjson
	modified:   metricbeat/module/rabbitmq/module.yml
	deleted:    metricbeat/module/redis/_meta/kibana/7/dashboard/Metricbeat-redis-keys.json
	new file:   metricbeat/module/redis/_meta/kibana/7/dashboard/Metricbeat-redis-keys.ndjson
	deleted:    metricbeat/module/redis/_meta/kibana/7/dashboard/Metricbeat-redis-overview.json
	new file:   metricbeat/module/redis/_meta/kibana/7/dashboard/Metricbeat-redis-overview.ndjson
	modified:   metricbeat/module/redis/module.yml
	deleted:    metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-Host-Services-overview.json
	new file:   metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-Host-Services-overview.ndjson
	deleted:    metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-containers-overview.json
	new file:   metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-containers-overview.ndjson
	deleted:    metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-host-overview.json
	new file:   metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-host-overview.ndjson
	deleted:    metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-system-overview.json
	new file:   metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-system-overview.ndjson
	modified:   metricbeat/module/system/hostnamechange_test.go
	modified:   metricbeat/module/system/module.yml
	deleted:    metricbeat/module/uwsgi/_meta/kibana/7/dashboard/Metricbeat-uwsgi-overview.json
	new file:   metricbeat/module/uwsgi/_meta/kibana/7/dashboard/Metricbeat-uwsgi-overview.ndjson
	modified:   metricbeat/module/uwsgi/module.yml
	deleted:    metricbeat/module/vsphere/_meta/kibana/7/dashboard/metricbeat-vsphere-host.json
	new file:   metricbeat/module/vsphere/_meta/kibana/7/dashboard/metricbeat-vsphere-host.ndjson
	deleted:    metricbeat/module/vsphere/_meta/kibana/7/dashboard/metricbeat-vsphere-vm.json
	new file:   metricbeat/module/vsphere/_meta/kibana/7/dashboard/metricbeat-vsphere-vm.ndjson
	modified:   metricbeat/module/vsphere/module.yml
	deleted:    metricbeat/module/windows/_meta/kibana/7/dashboard/metricbeat-windows-service.json
	new file:   metricbeat/module/windows/_meta/kibana/7/dashboard/metricbeat-windows-service.ndjson
	modified:   metricbeat/module/windows/module.yml
	deleted:    metricbeat/module/zookeeper/_meta/kibana/7/dashboard/Metricbeat-zookeeper-overview.json
	new file:   metricbeat/module/zookeeper/_meta/kibana/7/dashboard/Metricbeat-zookeeper-overview.ndjson
	modified:   metricbeat/tests/system/test_base.py
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-cassandra.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-cassandra.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-dhcpv4.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-dhcpv4.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-dns-overview.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-dns-overview.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-dns-tunneling.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-dns-tunneling.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-flows.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-flows.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-http.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-http.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-mongodb.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-mongodb.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-mysql.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-mysql.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-nfs.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-nfs.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-overview.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-overview.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-pgsql.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-pgsql.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-thrift.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-thrift.ndjson
	deleted:    packetbeat/_meta/kibana/7/dashboard/Packetbeat-tls.json
	new file:   packetbeat/_meta/kibana/7/dashboard/Packetbeat-tls.ndjson
	deleted:    winlogbeat/_meta/kibana/7/dashboard/Winlogbeat-overview.json
	new file:   winlogbeat/_meta/kibana/7/dashboard/Winlogbeat-overview.ndjson
	modified:   winlogbeat/magefile.go
	new file:   x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-host-dashboard.ndjson
	deleted:    x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-login-dashboard.json
	new file:   x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-login-dashboard.ndjson
	deleted:    x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-overview-dashboard.json
	new file:   x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-overview-dashboard.ndjson
	deleted:    x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-package-dashboard.json
	new file:   x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-package-dashboard.ndjson
	deleted:    x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-process-dashboard.json
	new file:   x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-process-dashboard.ndjson
	deleted:    x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-socket-dashboard.json
	new file:   x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-socket-dashboard.ndjson
	deleted:    x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-user-dashboard.json
	new file:   x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-user-dashboard.ndjson
	deleted:    x-pack/filebeat/module/activemq/_meta/kibana/7/dashboard/Filebeat-activemq-application-events.json
	new file:   x-pack/filebeat/module/activemq/_meta/kibana/7/dashboard/Filebeat-activemq-application-events.ndjson
	deleted:    x-pack/filebeat/module/activemq/_meta/kibana/7/dashboard/Filebeat-activemq-audit-events.json
	new file:   x-pack/filebeat/module/activemq/_meta/kibana/7/dashboard/Filebeat-activemq-audit-events.ndjson
	modified:   x-pack/filebeat/module/activemq/module.yml
	deleted:    x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-elb-overview.json
	new file:   x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-elb-overview.ndjson
	deleted:    x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-s3access-overview.json
	new file:   x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-s3access-overview.ndjson
	deleted:    x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-vpcflow-overview.json
	new file:   x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-vpcflow-overview.ndjson
	deleted:    x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/filebeat-aws-cloudtrail.json
	new file:   x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/filebeat-aws-cloudtrail.ndjson
	modified:   x-pack/filebeat/module/aws/module.yml
	deleted:    x-pack/filebeat/module/azure/_meta/kibana/7/dashboard/Filebeat-azure-alerts-overview.json
	new file:   x-pack/filebeat/module/azure/_meta/kibana/7/dashboard/Filebeat-azure-alerts-overview.ndjson
	deleted:    x-pack/filebeat/module/azure/_meta/kibana/7/dashboard/Filebeat-azure-overview.json
	new file:   x-pack/filebeat/module/azure/_meta/kibana/7/dashboard/Filebeat-azure-overview.ndjson
	deleted:    x-pack/filebeat/module/azure/_meta/kibana/7/dashboard/Filebeat-azure-user-activity.json
	new file:   x-pack/filebeat/module/azure/_meta/kibana/7/dashboard/Filebeat-azure-user-activity.ndjson
	deleted:    x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-endpoint-os-activity.json
	new file:   x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-endpoint-os-activity.ndjson
	deleted:    x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-endpoint-overview.json
	new file:   x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-endpoint-overview.ndjson
	deleted:    x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-microsoft-dns.json
	new file:   x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-microsoft-dns.ndjson
	deleted:    x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-network-overview.json
	new file:   x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-network-overview.ndjson
	deleted:    x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-network-suspicious-activity.json
	new file:   x-pack/filebeat/module/cef/_meta/kibana/7/dashboard/filebeat-cef-network-suspicious-activity.ndjson
	deleted:    x-pack/filebeat/module/cisco/_meta/kibana/7/dashboard/Filebeat-Cisco-ASA.json
	new file:   x-pack/filebeat/module/cisco/_meta/kibana/7/dashboard/Filebeat-Cisco-ASA.ndjson
	modified:   x-pack/filebeat/module/cisco/module.yml
	deleted:    x-pack/filebeat/module/coredns/_meta/kibana/7/dashboard/Coredns-Overview-Dashboard.json
	new file:   x-pack/filebeat/module/coredns/_meta/kibana/7/dashboard/Coredns-Overview-Dashboard.ndjson
	modified:   x-pack/filebeat/module/coredns/module.yml
	modified:   x-pack/filebeat/module/crowdstrike/module.yml
	deleted:    x-pack/filebeat/module/cyberarkpas/_meta/kibana/7/dashboard/Filebeat-cyberarkpas-audit.json
	new file:   x-pack/filebeat/module/cyberarkpas/_meta/kibana/7/dashboard/Filebeat-cyberarkpas-audit.ndjson
	modified:   x-pack/filebeat/module/cyberarkpas/module.yml
	deleted:    x-pack/filebeat/module/envoyproxy/_meta/kibana/7/dashboard/Filebeat-Envoyproxy-Overview.json
	new file:   x-pack/filebeat/module/envoyproxy/_meta/kibana/7/dashboard/Filebeat-Envoyproxy-Overview.ndjson
	modified:   x-pack/filebeat/module/envoyproxy/module.yml
	deleted:    x-pack/filebeat/module/gcp/_meta/kibana/7/dashboard/filebeat-gcp-audit.json
	new file:   x-pack/filebeat/module/gcp/_meta/kibana/7/dashboard/filebeat-gcp-audit.ndjson
	deleted:    x-pack/filebeat/module/ibmmq/_meta/kibana/7/dashboard/Filebeat-IBMMQ-Overview.json
	new file:   x-pack/filebeat/module/ibmmq/_meta/kibana/7/dashboard/Filebeat-IBMMQ-Overview.ndjson
	modified:   x-pack/filebeat/module/ibmmq/module.yml
	deleted:    x-pack/filebeat/module/iptables/_meta/kibana/7/dashboard/Filebeat-Iptables-Overview.json
	new file:   x-pack/filebeat/module/iptables/_meta/kibana/7/dashboard/Filebeat-Iptables-Overview.ndjson
	deleted:    x-pack/filebeat/module/iptables/_meta/kibana/7/dashboard/Filebeat-Iptables-Ubiquiti-Firewall-Overview.json
	new file:   x-pack/filebeat/module/iptables/_meta/kibana/7/dashboard/Filebeat-Iptables-Ubiquiti-Firewall-Overview.ndjson
	modified:   x-pack/filebeat/module/iptables/module.yml
	deleted:    x-pack/filebeat/module/microsoft/_meta/kibana/7/dashboard/Filebeat-microsoft-atp-overview.json
	new file:   x-pack/filebeat/module/microsoft/_meta/kibana/7/dashboard/Filebeat-microsoft-atp-overview.ndjson
	modified:   x-pack/filebeat/module/microsoft/module.yml
	deleted:    x-pack/filebeat/module/misp/_meta/kibana/7/dashboard/Filebeat-MISP-Overview.json
	new file:   x-pack/filebeat/module/misp/_meta/kibana/7/dashboard/Filebeat-MISP-Overview.ndjson
	modified:   x-pack/filebeat/module/misp/module.yml
	deleted:    x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-autonomous-systems.json
	new file:   x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-autonomous-systems.ndjson
	deleted:    x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-conversation-partners.json
	new file:   x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-conversation-partners.ndjson
	new file:   x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-flow-exporters.ndjson
	deleted:    x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-flow-records.json
	new file:   x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-flow-records.ndjson
	deleted:    x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-geo-location.json
	new file:   x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-geo-location.ndjson
	new file:   x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-overview.ndjson
	new file:   x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-top-n.ndjson
	deleted:    x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-traffic-analysis.json
	new file:   x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-traffic-analysis.ndjson
	deleted:    x-pack/filebeat/module/o365/_meta/kibana/7/dashboard/Filebeat-O365-Audit.json
	new file:   x-pack/filebeat/module/o365/_meta/kibana/7/dashboard/Filebeat-O365-Audit.ndjson
	modified:   x-pack/filebeat/module/o365/module.yml
	deleted:    x-pack/filebeat/module/okta/_meta/kibana/7/dashboard/749203a0-67b1-11ea-a76f-bf44814e437d.json
	new file:   x-pack/filebeat/module/okta/_meta/kibana/7/dashboard/749203a0-67b1-11ea-a76f-bf44814e437d.ndjson
	modified:   x-pack/filebeat/module/okta/module.yml
	deleted:    x-pack/filebeat/module/panw/_meta/kibana/7/dashboard/Filebeat-panw-network-overview.json
	new file:   x-pack/filebeat/module/panw/_meta/kibana/7/dashboard/Filebeat-panw-network-overview.ndjson
	deleted:    x-pack/filebeat/module/panw/_meta/kibana/7/dashboard/Filebeat-panw-threat-overview.json
	new file:   x-pack/filebeat/module/panw/_meta/kibana/7/dashboard/Filebeat-panw-threat-overview.ndjson
	modified:   x-pack/filebeat/module/panw/module.yml
	deleted:    x-pack/filebeat/module/suricata/_meta/kibana/7/dashboard/filebeat-suricata-alert-overview.json
	new file:   x-pack/filebeat/module/suricata/_meta/kibana/7/dashboard/filebeat-suricata-alert-overview.ndjson
	deleted:    x-pack/filebeat/module/suricata/_meta/kibana/7/dashboard/filebeat-suricata-event-overview.json
	new file:   x-pack/filebeat/module/suricata/_meta/kibana/7/dashboard/filebeat-suricata-event-overview.ndjson
	modified:   x-pack/filebeat/module/suricata/module.yml
	deleted:    x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-abuse-url.json
	new file:   x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-abuse-url.ndjson
	deleted:    x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-alienvault-otx.json
	new file:   x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-alienvault-otx.ndjson
	deleted:    x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-anomali.json
	new file:   x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-anomali.ndjson
	deleted:    x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-aubse-malware.json
	new file:   x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-aubse-malware.ndjson
	deleted:    x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-malwarebazaar.json
	new file:   x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-malwarebazaar.ndjson
	deleted:    x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-misp.json
	new file:   x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-misp.ndjson
	deleted:    x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-overview.json
	new file:   x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-overview.ndjson
	deleted:    x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-recordedfuture.json
	new file:   x-pack/filebeat/module/threatintel/_meta/kibana/7/dashboard/Filebeat-threatintel-recordedfuture.ndjson
	modified:   x-pack/filebeat/module/threatintel/module.yml
	deleted:    x-pack/filebeat/module/zeek/_meta/kibana/7/dashboard/Filebeat-Zeek-Overview.json
	new file:   x-pack/filebeat/module/zeek/_meta/kibana/7/dashboard/Filebeat-Zeek-Overview.ndjson
	modified:   x-pack/filebeat/module/zeek/module.yml
	deleted:    x-pack/metricbeat/module/activemq/_meta/kibana/7/dashboard/metricbeat-activemq-broker-overview.json
	new file:   x-pack/metricbeat/module/activemq/_meta/kibana/7/dashboard/metricbeat-activemq-broker-overview.ndjson
	deleted:    x-pack/metricbeat/module/activemq/_meta/kibana/7/dashboard/metricbeat-activemq-queues-overview.json
	new file:   x-pack/metricbeat/module/activemq/_meta/kibana/7/dashboard/metricbeat-activemq-queues-overview.ndjson
	deleted:    x-pack/metricbeat/module/activemq/_meta/kibana/7/dashboard/metricbeat-activemq-topics-overview.json
	new file:   x-pack/metricbeat/module/activemq/_meta/kibana/7/dashboard/metricbeat-activemq-topics-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-billing-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-billing-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-dynamodb-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-dynamodb-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-ebs-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-ebs-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-ec2-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-ec2-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-elb-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-elb-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-kinesis-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-kinesis-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-lambda-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-lambda-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-natgateway-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-natgateway-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-rds-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-rds-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-s3-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-s3-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-sns-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-sns-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-sqs-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-sqs-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-trasitgateway-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-trasitgateway-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-usage-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-usage-overview.ndjson
	deleted:    x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-vpn-overview.json
	new file:   x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-vpn-overview.ndjson
	deleted:    x-pack/metricbeat/module/awsfargate/_meta/kibana/7/dashboard/Metricbeat-awsfargate-overview.json
	new file:   x-pack/metricbeat/module/awsfargate/_meta/kibana/7/dashboard/Metricbeat-awsfargate-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-app-state-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-app-state-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-billing-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-billing-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-blob-storage-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-blob-storage-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-container-instance-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-container-instance-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-container-registry-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-container-registry-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-container-service-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-container-service-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-database-account-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-database-account-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-file-storage-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-file-storage-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-queue-storage-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-queue-storage-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-storage-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-storage-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-table-storage-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-table-storage-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-vm-guestmetrics-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-vm-guestmetrics-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-vm-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-vm-overview.ndjson
	deleted:    x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-vmss-overview.json
	new file:   x-pack/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-vmss-overview.ndjson
	deleted:    x-pack/metricbeat/module/cloudfoundry/_meta/kibana/7/dashboard/Metricbeat-cloudfoundry-overview.json
	new file:   x-pack/metricbeat/module/cloudfoundry/_meta/kibana/7/dashboard/Metricbeat-cloudfoundry-overview.ndjson
	deleted:    x-pack/metricbeat/module/cloudfoundry/_meta/kibana/7/dashboard/Metricbeat-cloudfoundry-platform-health.json
	new file:   x-pack/metricbeat/module/cloudfoundry/_meta/kibana/7/dashboard/Metricbeat-cloudfoundry-platform-health.ndjson
	deleted:    x-pack/metricbeat/module/cockroachdb/_meta/kibana/7/dashboard/Metricbeat-cockroachdb-overview.json
	new file:   x-pack/metricbeat/module/cockroachdb/_meta/kibana/7/dashboard/Metricbeat-cockroachdb-overview.ndjson
	deleted:    x-pack/metricbeat/module/cockroachdb/_meta/kibana/7/dashboard/Metricbeat-cockroachdb-sql.json
	new file:   x-pack/metricbeat/module/cockroachdb/_meta/kibana/7/dashboard/Metricbeat-cockroachdb-sql.ndjson
	deleted:    x-pack/metricbeat/module/coredns/_meta/kibana/7/dashboard/Metricbeat-coredns-overview.json
	new file:   x-pack/metricbeat/module/coredns/_meta/kibana/7/dashboard/Metricbeat-coredns-overview.ndjson
	deleted:    x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-billing-overview.json
	new file:   x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-billing-overview.ndjson
	deleted:    x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-compute-overview.json
	new file:   x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-compute-overview.ndjson
	deleted:    x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-load-balancing-https-overview.json
	new file:   x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-load-balancing-https-overview.ndjson
	deleted:    x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-l3-overview.json
	new file:   x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-l3-overview.ndjson
	deleted:    x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-tcp-ssl-proxy-overview.json
	new file:   x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-tcp-ssl-proxy-overview.ndjson
	deleted:    x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-pubsub-overview.json
	new file:   x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-pubsub-overview.ndjson
	deleted:    x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-storage-overview.json
	new file:   x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-storage-overview.ndjson
	deleted:    x-pack/metricbeat/module/ibmmq/_meta/kibana/7/dashboard/Metricbeat-ibmmq-calls-overview.json
	new file:   x-pack/metricbeat/module/ibmmq/_meta/kibana/7/dashboard/Metricbeat-ibmmq-calls-overview.ndjson
	deleted:    x-pack/metricbeat/module/ibmmq/_meta/kibana/7/dashboard/Metricbeat-ibmmq-messages-overview.json
	new file:   x-pack/metricbeat/module/ibmmq/_meta/kibana/7/dashboard/Metricbeat-ibmmq-messages-overview.ndjson
	deleted:    x-pack/metricbeat/module/ibmmq/_meta/kibana/7/dashboard/Metricbeat-ibmmq-subscriptions-overview.json
	new file:   x-pack/metricbeat/module/ibmmq/_meta/kibana/7/dashboard/Metricbeat-ibmmq-subscriptions-overview.ndjson
	deleted:    x-pack/metricbeat/module/iis/_meta/kibana/7/dashboard/Metricbeat-iis-application-pool-overview.json
	new file:   x-pack/metricbeat/module/iis/_meta/kibana/7/dashboard/Metricbeat-iis-application-pool-overview.ndjson
	deleted:    x-pack/metricbeat/module/iis/_meta/kibana/7/dashboard/Metricbeat-iis-webserver-overview.json
	new file:   x-pack/metricbeat/module/iis/_meta/kibana/7/dashboard/Metricbeat-iis-webserver-overview.ndjson
	deleted:    x-pack/metricbeat/module/iis/_meta/kibana/7/dashboard/Metricbeat-iis-webserver-process-overview.json
	new file:   x-pack/metricbeat/module/iis/_meta/kibana/7/dashboard/Metricbeat-iis-webserver-process-overview.ndjson
	deleted:    x-pack/metricbeat/module/iis/_meta/kibana/7/dashboard/Metricbeat-iis-website-overview.json
	new file:   x-pack/metricbeat/module/iis/_meta/kibana/7/dashboard/Metricbeat-iis-website-overview.ndjson
	deleted:    x-pack/metricbeat/module/istio/_meta/kibana/7/dashboard/Metricbeat-istio-overview.json
	new file:   x-pack/metricbeat/module/istio/_meta/kibana/7/dashboard/Metricbeat-istio-overview.ndjson
	deleted:    x-pack/metricbeat/module/istio/_meta/kibana/7/dashboard/Metricbeat-istio-traffic.json
	new file:   x-pack/metricbeat/module/istio/_meta/kibana/7/dashboard/Metricbeat-istio-traffic.ndjson
	deleted:    x-pack/metricbeat/module/mssql/_meta/kibana/7/dashboard/Metricbeat-mssql-performance.json
	new file:   x-pack/metricbeat/module/mssql/_meta/kibana/7/dashboard/Metricbeat-mssql-performance.ndjson
	deleted:    x-pack/metricbeat/module/mssql/_meta/kibana/7/dashboard/Metricbeat-mssql-transaction_log.json
	new file:   x-pack/metricbeat/module/mssql/_meta/kibana/7/dashboard/Metricbeat-mssql-transaction_log.ndjson
	deleted:    x-pack/metricbeat/module/oracle/_meta/kibana/7/dashboard/Metricbeat-Oracle-overview.json
	new file:   x-pack/metricbeat/module/oracle/_meta/kibana/7/dashboard/Metricbeat-Oracle-overview.ndjson
	deleted:    x-pack/metricbeat/module/oracle/_meta/kibana/7/dashboard/Metricbeat-Oracle-tablespaces.json
	new file:   x-pack/metricbeat/module/oracle/_meta/kibana/7/dashboard/Metricbeat-Oracle-tablespaces.ndjson
	deleted:    x-pack/metricbeat/module/redisenterprise/_meta/kibana/7/dashboard/Metricbeat-redisenterprise-overview.json
	new file:   x-pack/metricbeat/module/redisenterprise/_meta/kibana/7/dashboard/Metricbeat-redisenterprise-overview.ndjson
	deleted:    x-pack/metricbeat/module/stan/_meta/kibana/7/dashboard/Metricbeat-STAN-overview.json
	new file:   x-pack/metricbeat/module/stan/_meta/kibana/7/dashboard/Metricbeat-STAN-overview.ndjson
	modified:   x-pack/metricbeat/module/stan/module.yml
	deleted:    x-pack/metricbeat/module/tomcat/_meta/kibana/7/dashboard/Metricbeat-Tomcat-overview.json
	new file:   x-pack/metricbeat/module/tomcat/_meta/kibana/7/dashboard/Metricbeat-Tomcat-overview.ndjson
	deleted:    x-pack/winlogbeat/module/powershell/_meta/kibana/7/dashboard/Powershell-Overview-Dashboard.json
	new file:   x-pack/winlogbeat/module/powershell/_meta/kibana/7/dashboard/Powershell-Overview-Dashboard.ndjson
	deleted:    x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-failed-blocked-accounts-tsvb.json
	new file:   x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-failed-blocked-accounts-tsvb.ndjson
	deleted:    x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-failed-blocked-accounts.json
	new file:   x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-failed-blocked-accounts.ndjson
	deleted:    x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-group-management-tsvb.json
	new file:   x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-group-management-tsvb.ndjson
	deleted:    x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-group-management.json
	new file:   x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-group-management.ndjson
	deleted:    x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-user-logons-tsvb.json
	new file:   x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-user-logons-tsvb.ndjson
	deleted:    x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-user-logons.json
	new file:   x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-user-logons.ndjson
	deleted:    x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-user-management-tsvb.json
	new file:   x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-user-management-tsvb.ndjson
	deleted:    x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-user-management.json
	new file:   x-pack/winlogbeat/module/security/_meta/kibana/7/dashboard/winlogbeat-security-user-management.ndjson

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-executions.json
	deleted by them: auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-overview.json
	deleted by them: auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-sockets.json
	deleted by them: filebeat/module/osquery/_meta/kibana/7/dashboard/osquery-rootkit.json
	deleted by them: filebeat/module/santa/_meta/kibana/7/dashboard/filebeat-santa-log-overview.json
	both modified:   libbeat/dashboards/decode.go
	both modified:   libbeat/dashboards/modify_json.go
	both modified:   libbeat/kibana/client.go
	deleted by them: metricbeat/module/docker/_meta/kibana/7/dashboard/Metricbeat-docker-overview.json
	deleted by them: x-pack/auditbeat/module/system/_meta/kibana/7/dashboard/auditbeat-system-host-dashboard.json
	deleted by them: x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-flow-exporters.json
	deleted by them: x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-overview.json
	deleted by them: x-pack/filebeat/module/netflow/_meta/kibana/7/dashboard/filebeat-netflow-top-n.json

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 16, 2021 15:50
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 16, 2021
@mergify mergify bot assigned kvch Aug 16, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 16, 2021
@botelastic
Copy link

botelastic bot commented Aug 16, 2021

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 16, 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-16T16:49:31.217+0000

  • Duration: 155 min 29 sec

  • Commit: 0172cee

Test stats 🧪

Test Results
Failed 0
Passed 52565
Skipped 5267
Total 57832

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 52565
Skipped 5267
Total 57832

@kvch kvch force-pushed the mergify/bp/7.x/pr-27220 branch from 7180241 to 07c2697 Compare August 16, 2021 16:15
@mergify
Copy link
Contributor Author

mergify bot commented Aug 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-27220 upstream/mergify/bp/7.x/pr-27220
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-27220

This PR adopts the Saved Objects API for exporting and importing dashboards and index templates. We have agreed to provide essential support, so there are a few limitations:

* You can only import assets they have exported using Beats 7.15 and the assets we ship with Beats.
* You can only export new assets, not legacy format.

We have to move forward to let Kibana remove the old API.

Try to setup the dashboards of a Beat:

```sh
./filebeat setup --dashboards
```

Export dashboards:

```sh
./filebeat export dashboard --id {my-id}
```
and:

```sh
go run dev-tools/cmd/dashboards/export_dashboards.go -dashboard {my-id}
```

The changeset is huge, but most of it comes from converting the dashboards. I suggest you use the file filter and disable json, ndjson and yml files. The changes are moving json to ndjson format and changing the extensions in the module.yml files from json to ndjson.

Please also test it manually with both the setup command and `export_dashboards.go`.

Closes #20672
@kvch kvch force-pushed the mergify/bp/7.x/pr-27220 branch from 1184f9d to 0172cee Compare August 16, 2021 16:49
@kvch kvch merged commit 191e7ac into 7.x Aug 16, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-27220 branch August 16, 2021 19:28
- Update to ECS 1.9.0. {pull}24909[24909]
- Remove the deprecated `xpack.monitoring.*` settings. Going forward only `monitoring.*` settings may be used. {issue}9424[9424] {pull}18608[18608]
- Add daemonset.name in pods controlled by DaemonSets {pull}26808[26808], {issue}25816[25816]
- Kubernetes autodiscover fails in node scope if node name cannot be discovered {pull}26947[26947]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra changelogs.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shoooot. Let me open a PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR: #27407

- Remove the deprecated `xpack.monitoring.*` settings. Going forward only `monitoring.*` settings may be used. {issue}9424[9424] {pull}18608[18608]
- Add daemonset.name in pods controlled by DaemonSets {pull}26808[26808], {issue}25816[25816]
- Kubernetes autodiscover fails in node scope if node name cannot be discovered {pull}26947[26947]
- Loading Kibana assets (dashboards, index templates) rely on Saved Object API. So to provide a reliable service, Beats can only import and export dasbhboards using at least Kibana 7.15. {issue}20672[20672] {pull}27220[27220]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in dashboards.

Suggested change
- Loading Kibana assets (dashboards, index templates) rely on Saved Object API. So to provide a reliable service, Beats can only import and export dasbhboards using at least Kibana 7.15. {issue}20672[20672] {pull}27220[27220]
- Loading Kibana assets (dashboards, index templates) rely on Saved Object API. So to provide a reliable service, Beats can only import and export dashboards using at least Kibana 7.15. {issue}20672[20672] {pull}27220[27220]

@mergify
Copy link
Contributor Author

mergify bot commented Nov 15, 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-27220 upstream/mergify/bp/7.x/pr-27220
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-27220

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.

3 participants