Skip to content

Upgrade to Micrometer 1.0.6 #13819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,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)
*/
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.
*/
Expand Down Expand Up @@ -137,4 +152,27 @@ public void setAutoCreateDb(boolean 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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,24 @@ public String 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
public String uri() {
return get(InfluxProperties::getUri, InfluxConfig.super::uri);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class SignalFxPropertiesConfigAdapter

public SignalFxPropertiesConfigAdapter(SignalFxProperties properties) {
super(properties);
accessToken(); // validate that an access token is set
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-project/spring-boot-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<logback.version>1.2.3</logback.version>
<lombok.version>1.16.22</lombok.version>
<mariadb.version>2.2.5</mariadb.version>
<micrometer.version>1.0.5</micrometer.version>
<micrometer.version>1.0.6</micrometer.version>
<mockito.version>2.15.0</mockito.version>
<mongo-driver-reactivestreams.version>1.7.1</mongo-driver-reactivestreams.version>
<mongodb.version>3.6.4</mongodb.version>
Expand Down