Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
f478911c
Commit
f478911c
authored
Jul 19, 2018
by
Jon Schneider
Committed by
Stephane Nicoll
Jul 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Micrometer 1.0.6
See gh-13819
parent
dcb68d4c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
58 additions
and
1 deletion
+58
-1
InfluxProperties.java
...autoconfigure/metrics/export/influx/InfluxProperties.java
+38
-0
InfluxPropertiesConfigAdapter.java
.../metrics/export/influx/InfluxPropertiesConfigAdapter.java
+18
-0
SignalFxPropertiesConfigAdapter.java
...rics/export/signalfx/SignalFxPropertiesConfigAdapter.java
+1
-0
pom.xml
spring-boot-project/spring-boot-dependencies/pom.xml
+1
-1
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java
View file @
f478911c
...
@@ -57,6 +57,21 @@ public class InfluxProperties extends StepRegistryProperties {
...
@@ -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 {
...
@@ -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
;
}
}
}
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxPropertiesConfigAdapter.java
View file @
f478911c
...
@@ -60,6 +60,24 @@ class InfluxPropertiesConfigAdapter extends
...
@@ -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
);
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxPropertiesConfigAdapter.java
View file @
f478911c
...
@@ -32,6 +32,7 @@ public class SignalFxPropertiesConfigAdapter
...
@@ -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
...
...
spring-boot-project/spring-boot-dependencies/pom.xml
View file @
f478911c
...
@@ -122,7 +122,7 @@
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment