docs: remove kibana and dashboards (#1715)

elastic · Jan 18, 2019 · 8c39a87 · 8c39a87
1 parent 2344435
commit 8c39a87
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 823 deletions.
diff --git a/_meta/beat.yml b/_meta/beat.yml
@@ -213,115 +213,11 @@ apm-server:
     #enabled: false
 
 
-#============================== Deprecated: Dashboards =====================================
-#
-# Deprecated: Loading dashboards from the APM Server into Kibana is deprecated from 6.4 on.
-#             We suggest to use the Kibana UI to load APM Server dashboards and index pattern instead.
-#
-# These settings control loading the sample dashboards to the Kibana index. Loading
-# the dashboards are disabled by default and can be enabled either by setting the
-# options here, or by using the `-setup` CLI flag or the `setup` command.
-#setup.dashboards.enabled: false
-
-# The directory from where to read the dashboards. The default is the `kibana`
-# folder in the home path.
-#setup.dashboards.directory: ${path.home}/kibana
-
-# The URL from where to download the dashboards archive. It is used instead of
-# the directory if it has a value.
-#setup.dashboards.url:
-
-# The file archive (zip file) from where to read the dashboards. It is used instead
-# of the directory when it has a value.
-#setup.dashboards.file:
-
-# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
-#setup.dashboards.kibana_index: .kibana
-
-# The Elasticsearch index name. This overwrites the index name defined in the
-# dashboards and index pattern. Example: testbeat-*
-# The dashboards.index needs to be changed in case the elasticsearch index pattern is modified.
-#setup.dashboards.index:
-
-# Always use the Kibana API for loading the dashboards instead of autodetecting
-# how to install the dashboards by first querying Elasticsearch.
-#setup.dashboards.always_kibana: false
-
-# If true and Kibana is not reachable at the time when dashboards are loaded,
-# it will retry to reconnect to Kibana instead of exiting with an error.
-#setup.dashboards.retry.enabled: false
-
-# Duration interval between Kibana connection retries.
-#setup.dashboards.retry.interval: 1s
-
-# Maximum number of retries before exiting with an error, 0 for unlimited retrying.
-#setup.dashboards.retry.maximum: 0
-
-
-#============================== Deprecated: Kibana =====================================
-
-# Deprecated: Starting with APM Server version 6.4, loading dashboards and index pattern
-#             from the APM Server into Kibana is deprecated.
-#             We suggest to use the Kibana UI to load APM Server dashboards and index pattern instead.
-#
-#             Setting up a Kibana endpoint is not necessary when loading the index pattern and dashboards via the UI.
-
-#setup.kibana:
-
-  # Kibana Host
-  # Scheme and port can be left out and will be set to the default (http and 5601)
-  # In case you specify and additional path, the scheme is required: http://localhost:5601/path
-  # IPv6 addresses should always be defined as: https://[2001:db8::1]:5601
-  #host: "localhost:5601"
-
-  # Optional protocol and basic auth credentials.
-  #protocol: "https"
-  #username: "elastic"
-  #password: "changeme"
-
-  # Optional HTTP Path
-  #path: ""
-
-  # Use SSL settings for HTTPS. Default is false.
-  #ssl.enabled: false
-
-  # Configure SSL verification mode. If `none` is configured, all server hosts
-  # and certificates will be accepted. In this mode, SSL based connections are
-  # susceptible to man-in-the-middle attacks. Use only for testing. Default is
-  # `full`.
-  #ssl.verification_mode: full
-
-  # List of supported/valid TLS versions. By default all TLS versions 1.0 up to
-  # 1.2 are enabled.
-  #ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2]
-
-  # SSL configuration. By default is off.
-  # List of root certificates for HTTPS server verifications
-  #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
-
-  # Certificate for SSL client authentication
-  #ssl.certificate: "/etc/pki/client/cert.pem"
-
-  # Client Certificate Key
-  #ssl.key: "/etc/pki/client/cert.key"
-
-  # Optional passphrase for decrypting the Certificate Key.
-  # It is recommended to use the provided keystore instead of entering the passphrase in plain text.
-  #ssl.key_passphrase: ''
-
-  # Configure cipher suites to be used for SSL connections
-  #ssl.cipher_suites: []
-
-  # Configure curve types for ECDHE based cipher suites
-  #ssl.curve_types: []
-
-
 #============================= Elastic Cloud ==================================
 
 # These settings simplify using APM Server with the Elastic Cloud (https://cloud.elastic.co/).
 
-# The cloud.id setting overwrites the `output.elasticsearch.hosts` and
-# [deprecated] `setup.kibana.host` options.
+# The cloud.id setting overwrites the `output.elasticsearch.hosts` option.
 # You can find the `cloud.id` in the Elastic Cloud web UI.
 #cloud.id:
 
@@ -372,12 +268,11 @@ output.elasticsearch:
   # end with the information of the day they got indexed.
   # e.g. "apm-6.3.0-transaction-2018.03.20"
   #
-  # Be aware that you can only specify one Elasticsearch template and one Kibana Index Pattern,
+  # Be aware that you can only specify one Elasticsearch template.
   # In case you modify the index patterns you must also update those configurations accordingly,
   # as they need to be aligned:
   # * `setup.template.name`
   # * `setup.template.pattern`
-  # * `setup.dashboards.index`
   #index: "apm-%{[beat.version]}-%{+yyyy.MM.dd}"
   indices:
     - index: "apm-%{[beat.version]}-sourcemap"
@@ -730,7 +625,7 @@ output.elasticsearch:
 
 # The home path for the apm-server installation. This is the default base path
 # for all other path settings and for miscellaneous files that come with the
-# distribution (for example, the sample dashboards).
+# distribution.
 # If not set by a CLI flag or in the configuration file, the default for the
 # home path is the location of the binary.
 #path.home:

diff --git a/apm-server.docker.yml b/apm-server.docker.yml
@@ -213,115 +213,11 @@ apm-server:
     #enabled: false
 
 
-#============================== Deprecated: Dashboards =====================================
-#
-# Deprecated: Loading dashboards from the APM Server into Kibana is deprecated from 6.4 on.
-#             We suggest to use the Kibana UI to load APM Server dashboards and index pattern instead.
-#
-# These settings control loading the sample dashboards to the Kibana index. Loading
-# the dashboards are disabled by default and can be enabled either by setting the
-# options here, or by using the `-setup` CLI flag or the `setup` command.
-#setup.dashboards.enabled: false
-
-# The directory from where to read the dashboards. The default is the `kibana`
-# folder in the home path.
-#setup.dashboards.directory: ${path.home}/kibana
-
-# The URL from where to download the dashboards archive. It is used instead of
-# the directory if it has a value.
-#setup.dashboards.url:
-
-# The file archive (zip file) from where to read the dashboards. It is used instead
-# of the directory when it has a value.
-#setup.dashboards.file:
-
-# The name of the Kibana index to use for setting the configuration. Default is ".kibana"
-#setup.dashboards.kibana_index: .kibana
-
-# The Elasticsearch index name. This overwrites the index name defined in the
-# dashboards and index pattern. Example: testbeat-*
-# The dashboards.index needs to be changed in case the elasticsearch index pattern is modified.
-#setup.dashboards.index:
-
-# Always use the Kibana API for loading the dashboards instead of autodetecting
-# how to install the dashboards by first querying Elasticsearch.
-#setup.dashboards.always_kibana: false
-
-# If true and Kibana is not reachable at the time when dashboards are loaded,
-# it will retry to reconnect to Kibana instead of exiting with an error.
-#setup.dashboards.retry.enabled: false
-
-# Duration interval between Kibana connection retries.
-#setup.dashboards.retry.interval: 1s
-
-# Maximum number of retries before exiting with an error, 0 for unlimited retrying.
-#setup.dashboards.retry.maximum: 0
-
-
-#============================== Deprecated: Kibana =====================================
-
-# Deprecated: Starting with APM Server version 6.4, loading dashboards and index pattern
-#             from the APM Server into Kibana is deprecated.
-#             We suggest to use the Kibana UI to load APM Server dashboards and index pattern instead.
-#
-#             Setting up a Kibana endpoint is not necessary when loading the index pattern and dashboards via the UI.
-
-#setup.kibana:
-
-  # Kibana Host
-  # Scheme and port can be left out and will be set to the default (http and 5601)
-  # In case you specify and additional path, the scheme is required: http://localhost:5601/path
-  # IPv6 addresses should always be defined as: https://[2001:db8::1]:5601
-  #host: "localhost:5601"
-
-  # Optional protocol and basic auth credentials.
-  #protocol: "https"
-  #username: "elastic"
-  #password: "changeme"
-
-  # Optional HTTP Path
-  #path: ""
-
-  # Use SSL settings for HTTPS. Default is false.
-  #ssl.enabled: false
-
-  # Configure SSL verification mode. If `none` is configured, all server hosts
-  # and certificates will be accepted. In this mode, SSL based connections are
-  # susceptible to man-in-the-middle attacks. Use only for testing. Default is
-  # `full`.
-  #ssl.verification_mode: full
-
-  # List of supported/valid TLS versions. By default all TLS versions 1.0 up to
-  # 1.2 are enabled.
-  #ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2]
-
-  # SSL configuration. By default is off.
-  # List of root certificates for HTTPS server verifications
-  #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
-
-  # Certificate for SSL client authentication
-  #ssl.certificate: "/etc/pki/client/cert.pem"
-
-  # Client Certificate Key
-  #ssl.key: "/etc/pki/client/cert.key"
-
-  # Optional passphrase for decrypting the Certificate Key.
-  # It is recommended to use the provided keystore instead of entering the passphrase in plain text.
-  #ssl.key_passphrase: ''
-
-  # Configure cipher suites to be used for SSL connections
-  #ssl.cipher_suites: []
-
-  # Configure curve types for ECDHE based cipher suites
-  #ssl.curve_types: []
-
-
 #============================= Elastic Cloud ==================================
 
 # These settings simplify using APM Server with the Elastic Cloud (https://cloud.elastic.co/).
 
-# The cloud.id setting overwrites the `output.elasticsearch.hosts` and
-# [deprecated] `setup.kibana.host` options.
+# The cloud.id setting overwrites the `output.elasticsearch.hosts` option.
 # You can find the `cloud.id` in the Elastic Cloud web UI.
 #cloud.id:
 
@@ -368,12 +264,11 @@ output.elasticsearch:
   # end with the information of the day they got indexed.
   # e.g. "apm-6.3.0-transaction-2018.03.20"
   #
-  # Be aware that you can only specify one Elasticsearch template and one Kibana Index Pattern,
-  # In case you modify the index patterns you must also update those configurations accordingly,
+  # Be aware that you can only specify one Elasticsearch template.
+  # In case you modify the index pattern you must also update those configurations accordingly,
   # as they need to be aligned:
   # * `setup.template.name`
   # * `setup.template.pattern`
-  # * `setup.dashboards.index`
   #index: "apm-%{[beat.version]}-%{+yyyy.MM.dd}"
   indices:
     - index: "apm-%{[beat.version]}-sourcemap"
@@ -726,7 +621,7 @@ output.elasticsearch:
 
 # The home path for the apm-server installation. This is the default base path
 # for all other path settings and for miscellaneous files that come with the
-# distribution (for example, the sample dashboards).
+# distribution.
 # If not set by a CLI flag or in the configuration file, the default for the
 # home path is the location of the binary.
 #path.home: