Upgrade to Micrometer 1.0.6

See gh-13819
pull/14003/head
Jon Schneider 6 years ago committed by Stephane Nicoll
parent dcb68d4c64
commit f478911c54

@ -57,6 +57,21 @@ public class InfluxProperties extends StepRegistryProperties {
*/ */
private String retentionPolicy; private String retentionPolicy;
/**
* Time period for which influx should retain data in the current database (e.g. 2h, 52w)
*/
private String retentionDuration;
/**
* 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).
*/
private String retentionShardDuration;
/** /**
* URI of the Influx server. * URI of the Influx server.
*/ */
@ -137,4 +152,27 @@ public class InfluxProperties extends StepRegistryProperties {
this.autoCreateDb = autoCreateDb; 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;
}
} }

@ -60,6 +60,24 @@ class InfluxPropertiesConfigAdapter extends
InfluxConfig.super::retentionPolicy); InfluxConfig.super::retentionPolicy);
} }
@Override
public Integer retentionReplicationFactor() {
return get(InfluxProperties::getRetentionReplicationFactor,
InfluxConfig.super::retentionReplicationFactor);
}
@Override
public String retentionDuration() {
return get(InfluxProperties::getRetentionDuration,
InfluxConfig.super::retentionDuration);
}
@Override
public String retentionShardDuration() {
return get(InfluxProperties::getRetentionShardDuration,
InfluxConfig.super::retentionShardDuration);
}
@Override @Override
public String uri() { public String uri() {
return get(InfluxProperties::getUri, InfluxConfig.super::uri); return get(InfluxProperties::getUri, InfluxConfig.super::uri);

@ -32,6 +32,7 @@ public class SignalFxPropertiesConfigAdapter
public SignalFxPropertiesConfigAdapter(SignalFxProperties properties) { public SignalFxPropertiesConfigAdapter(SignalFxProperties properties) {
super(properties); super(properties);
accessToken(); // validate that an access token is set
} }
@Override @Override

@ -122,7 +122,7 @@
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<lombok.version>1.16.22</lombok.version> <lombok.version>1.16.22</lombok.version>
<mariadb.version>2.2.6</mariadb.version> <mariadb.version>2.2.6</mariadb.version>
<micrometer.version>1.0.5</micrometer.version> <micrometer.version>1.0.6</micrometer.version>
<mockito.version>2.15.0</mockito.version> <mockito.version>2.15.0</mockito.version>
<mongo-driver-reactivestreams.version>1.7.1</mongo-driver-reactivestreams.version> <mongo-driver-reactivestreams.version>1.7.1</mongo-driver-reactivestreams.version>
<mongodb.version>3.6.4</mongodb.version> <mongodb.version>3.6.4</mongodb.version>

Loading…
Cancel
Save