github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

reinstate x-pack.monitoring settings in logstash.yml

Browse source
This commit is contained in:
Joao Duarte 2020-04-22 06:57:01 +01:00
parent 65bca0ca6c
commit c73544f1ed
2 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

40
config/logstash.yml
View file

@ -249,29 +249,27 @@ pipeline.ordered: auto
# Default is false
# pipeline.separate_logs: false
#
# ------------ Monitoring Settings (not applicable for OSS build)--------------
#
# https://www.elastic.co/guide/en/logstash/current/monitoring-internal-collection.html
# Enable monitoring via internal collector to an Elasticsearch monitoring cluster
#monitoring.enabled: false
#monitoring.cluster_uuid: elasticsearch_cluster_uuid
#monitoring.elasticsearch.username: logstash_system
#monitoring.elasticsearch.password: password
#monitoring.elasticsearch.hosts: ["https://es1:9200", "https://es2:9200"]
# an alternative to hosts + username/password settings is to use cloud_id/cloud_auth
#monitoring.elasticsearch.cloud_id: monitoring_cluster_id:xxxxxxxxxx
#monitoring.elasticsearch.cloud_auth: logstash_system:password
#monitoring.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
#monitoring.elasticsearch.ssl.truststore.path: path/to/file
#monitoring.elasticsearch.ssl.truststore.password: password
#monitoring.elasticsearch.ssl.keystore.path: /path/to/file
#monitoring.elasticsearch.ssl.keystore.password: password
#monitoring.elasticsearch.ssl.verification_mode: certificate
#monitoring.elasticsearch.sniffing: false
#monitoring.collection.interval: 10s
#monitoring.collection.pipeline.details.enabled: true
# ------------ X-Pack Settings (not applicable for OSS build)--------------
#
# X-Pack Monitoring
# https://www.elastic.co/guide/en/logstash/current/monitoring-logstash.html
#xpack.monitoring.enabled: false
#xpack.monitoring.elasticsearch.username: logstash_system
#xpack.monitoring.elasticsearch.password: password
#xpack.monitoring.elasticsearch.hosts: ["https://es1:9200", "https://es2:9200"]
# an alternative to hosts + username/password settings is to use cloud_id/cloud_auth
#xpack.monitoring.elasticsearch.cloud_id: monitoring_cluster_id:xxxxxxxxxx
#xpack.monitoring.elasticsearch.cloud_auth: logstash_system:password
#xpack.monitoring.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
#xpack.monitoring.elasticsearch.ssl.truststore.path: path/to/file
#xpack.monitoring.elasticsearch.ssl.truststore.password: password
#xpack.monitoring.elasticsearch.ssl.keystore.path: /path/to/file
#xpack.monitoring.elasticsearch.ssl.keystore.password: password
#xpack.monitoring.elasticsearch.ssl.verification_mode: certificate
#xpack.monitoring.elasticsearch.sniffing: false
#xpack.monitoring.collection.interval: 10s
#xpack.monitoring.collection.pipeline.details.enabled: true
#
# X-Pack Management
# https://www.elastic.co/guide/en/logstash/current/logstash-centralized-pipeline-management.html
#xpack.management.enabled: false

4
x-pack/lib/monitoring/monitoring.rb
View file

@ -191,7 +191,6 @@ module LogStash
opt = retrieve_collection_settings(settings)
else
opt = retrieve_collection_settings(settings, "xpack.")
deprecation_logger.deprecated("xpack.monitoring.* settings are deprecated use the new monitoring.*. Please see https://www.elastic.co/guide/en/logstash/current/monitoring-internal-collection.html")
end
es_settings = es_options_from_settings_or_modules('monitoring', settings)
data = TemplateData.new(LogStash::SETTINGS.get("node.uuid"), API_VERSION,
@ -235,9 +234,8 @@ module LogStash
def additionals_settings(settings)
logger.trace("registering additionals_settings")
# Deprecated settings from 7.7
register_monitoring_settings(settings, "xpack.")
# Direct shipping settings
# (Experimental) Direct shipping settings
register_monitoring_settings(settings)
# These Settings were renamed and deprecated in 6.x timeframe and removed for 7.0; provide guidance to ease transition.