From ecb8da25361ca494de9e10d97dbc68fe2ed3bb62 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 24 Jul 2018 09:25:54 +0200 Subject: [PATCH] Polish "Upgrade to Micrometer 1.0.6" Closes gh-13819 --- .../export/influx/InfluxProperties.java | 57 ++++++++++--------- .../export/influx/InfluxPropertiesTests.java | 6 ++ .../appendix-application-properties.adoc | 3 + 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java index 94898d5645e..a09029e534f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java @@ -58,17 +58,21 @@ public class InfluxProperties extends StepRegistryProperties { private String retentionPolicy; /** - * Time period for which influx should retain data in the current database (e.g. 2h, 52w) + * Time period for which Influx should retain data in the current database. For + * instance 7d, check the influx documentation for more details on the duration + * format. */ private String retentionDuration; /** - * How many copies of the data are stored in the cluster. Must be 1 for a single node instance. + * How many copies of the data are stored in the cluster. Must be 1 for a single node + * instance. */ private Integer retentionReplicationFactor; /** - * The time range covered by a shard group (e.g. 2h, 52w). + * Time range covered by a shard group. For instance 2w, check the influx + * documentation for more details on the duration format. */ private String retentionShardDuration; @@ -128,6 +132,30 @@ public class InfluxProperties extends StepRegistryProperties { this.retentionPolicy = retentionPolicy; } + public String getRetentionDuration() { + return this.retentionDuration; + } + + public void setRetentionDuration(String retentionDuration) { + this.retentionDuration = retentionDuration; + } + + public Integer getRetentionReplicationFactor() { + return this.retentionReplicationFactor; + } + + public void setRetentionReplicationFactor(Integer retentionReplicationFactor) { + this.retentionReplicationFactor = retentionReplicationFactor; + } + + public String getRetentionShardDuration() { + return this.retentionShardDuration; + } + + public void setRetentionShardDuration(String retentionShardDuration) { + this.retentionShardDuration = retentionShardDuration; + } + public String getUri() { return this.uri; } @@ -152,27 +180,4 @@ public class InfluxProperties extends StepRegistryProperties { this.autoCreateDb = autoCreateDb; } - public String getRetentionDuration() { - return retentionDuration; - } - - public void setRetentionDuration(String retentionDuration) { - this.retentionDuration = retentionDuration; - } - - public Integer getRetentionReplicationFactor() { - return retentionReplicationFactor; - } - - public void setRetentionReplicationFactor(Integer retentionReplicationFactor) { - this.retentionReplicationFactor = retentionReplicationFactor; - } - - public String getRetentionShardDuration() { - return retentionShardDuration; - } - - public void setRetentionShardDuration(String retentionShardDuration) { - this.retentionShardDuration = retentionShardDuration; - } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxPropertiesTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxPropertiesTests.java index 4d62674b11c..832a5c3abf8 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxPropertiesTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxPropertiesTests.java @@ -39,6 +39,12 @@ public class InfluxPropertiesTests extends StepRegistryPropertiesTests { assertThat(properties.getUserName()).isEqualTo(config.userName()); assertThat(properties.getPassword()).isEqualTo(config.password()); assertThat(properties.getRetentionPolicy()).isEqualTo(config.retentionPolicy()); + assertThat(properties.getRetentionDuration()) + .isEqualTo(config.retentionDuration()); + assertThat(properties.getRetentionReplicationFactor()) + .isEqualTo(config.retentionReplicationFactor()); + assertThat(properties.getRetentionShardDuration()) + .isEqualTo(config.retentionShardDuration()); assertThat(properties.getUri()).isEqualTo(config.uri()); assertThat(properties.isCompressed()).isEqualTo(config.compressed()); assertThat(properties.isAutoCreateDb()).isEqualTo(config.autoCreateDb()); 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 8d55d0b70d7..9a796c4b106 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 @@ -1371,7 +1371,10 @@ content into your application. Rather, pick only the properties that you need. management.metrics.export.influx.num-threads=2 # Number of threads to use with the metrics publishing scheduler. management.metrics.export.influx.password= # Login password of the Influx server. management.metrics.export.influx.read-timeout=10s # Read timeout for requests to this backend. + management.metrics.export.influx.retention-duration= # Time period for which Influx should retain data in the current database. + management.metrics.export.influx.retention-shard-duration= # Time range covered by a shard group. management.metrics.export.influx.retention-policy= # Retention policy to use (Influx writes to the DEFAULT retention policy if one is not specified). + management.metrics.export.influx.retention-replication-factor= # How many copies of the data are stored in the cluster. management.metrics.export.influx.step=1m # Step size (i.e. reporting frequency) to use. management.metrics.export.influx.uri=http://localhost:8086 # URI of the Influx server. management.metrics.export.influx.user-name= # Login user of the Influx server.