From 5765ed00e840324064c436f3fb0eeaac3d97c3cd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 24 Sep 2018 10:53:22 +0200 Subject: [PATCH] Polish --- .../metrics/export/elastic/ElasticProperties.java | 4 ++-- .../main/asciidoc/appendix-application-properties.adoc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java index 426405f06c..7b45645056 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java @@ -55,12 +55,12 @@ public class ElasticProperties extends StepRegistryProperties { private boolean autoCreateIndex = true; /** - * Username for basic authentication. + * Login user of the Elastic server. */ private String userName = ""; /** - * Password for basic authentication. + * Login password of the Elastic server. */ private String password = ""; diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index abbc1d6b1f..2b1372195e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -1420,15 +1420,15 @@ content into your application. Rather, pick only the properties that you need. management.metrics.export.elastic.batch-size=10000 # Number of measurements per request to use for this backend. If more measurements are found, then multiple requests will be made. management.metrics.export.elastic.connect-timeout=1s # Connection timeout for requests to this backend. management.metrics.export.elastic.enabled=true # Whether exporting of metrics to this backend is enabled. - management.metrics.export.elastic.hosts= # Hosts to export metrics to. - management.metrics.export.elastic.index= # Index to export metrics to. - management.metrics.export.elastic.index-date-format= # Index date format used for rolling indices. Appended to the index name, preceded by a '-'. + management.metrics.export.elastic.hosts=http://localhost:9200 # Hosts to export metrics to. + management.metrics.export.elastic.index=metrics # Index to export metrics to. + management.metrics.export.elastic.index-date-format=yyyy-MM # Index date format used for rolling indices. Appended to the index name, preceded by a '-'. management.metrics.export.elastic.num-threads=2 # Number of threads to use with the metrics publishing scheduler. - management.metrics.export.elastic.password= # Password for basic authentication. + management.metrics.export.elastic.password= # Login password of the Elastic server. management.metrics.export.elastic.read-timeout=10s # Read timeout for requests to this backend. management.metrics.export.elastic.step=1m # Step size (i.e. reporting frequency) to use. management.metrics.export.elastic.timestamp-field-name=@timestamp # Name of the timestamp field. - management.metrics.export.elastic.user-name= # User name for basic authentication. + management.metrics.export.elastic.user-name= # Login user of the Elastic server. management.metrics.export.ganglia.addressing-mode=multicast # UDP addressing mode, either unicast or multicast. management.metrics.export.ganglia.duration-units=milliseconds # Base time unit used to report durations. management.metrics.export.ganglia.enabled=true # Whether exporting of metrics to Ganglia is enabled.