Browse Source

Make the Graphite export protocol configurable

Closes gh-10523
pull/10535/head
Jon Schneider 9 years ago committed by Andy Wilkinson
parent
commit
ff636b58e1
  1. 17
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteProperties.java
  2. 6
      spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphitePropertiesConfigAdapter.java

17
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteProperties.java

@ -19,6 +19,8 @@ package org.springframework.boot.actuate.autoconfigure.metrics.export.graphite;
import java.time.Duration; import java.time.Duration;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import io.micrometer.graphite.GraphiteProtocol;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
/** /**
@ -29,6 +31,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*/ */
@ConfigurationProperties(prefix = "spring.metrics.graphite") @ConfigurationProperties(prefix = "spring.metrics.graphite")
public class GraphiteProperties { public class GraphiteProperties {
/** /**
* Enable publishing to the backend. * Enable publishing to the backend.
*/ */
@ -59,6 +62,11 @@ public class GraphiteProperties {
*/ */
private Integer port; private Integer port;
/**
* Protocol to use while shipping data to Graphite.
*/
private GraphiteProtocol protocol = GraphiteProtocol.Pickled;
public Boolean getEnabled() { public Boolean getEnabled() {
return this.enabled; return this.enabled;
} }
@ -106,4 +114,13 @@ public class GraphiteProperties {
public void setPort(Integer port) { public void setPort(Integer port) {
this.port = port; this.port = port;
} }
public GraphiteProtocol getProtocol() {
return this.protocol;
}
public void setProtocol(GraphiteProtocol protocol) {
this.protocol = protocol;
}
} }

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphitePropertiesConfigAdapter.java

@ -20,6 +20,7 @@ import java.time.Duration;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import io.micrometer.graphite.GraphiteConfig; import io.micrometer.graphite.GraphiteConfig;
import io.micrometer.graphite.GraphiteProtocol;
import org.springframework.boot.actuate.autoconfigure.metrics.export.PropertiesConfigAdapter; import org.springframework.boot.actuate.autoconfigure.metrics.export.PropertiesConfigAdapter;
@ -74,4 +75,9 @@ class GraphitePropertiesConfigAdapter
return get(GraphiteProperties::getPort, GraphiteConfig::port); return get(GraphiteProperties::getPort, GraphiteConfig::port);
} }
@Override
public GraphiteProtocol protocol() {
return get(GraphiteProperties::getProtocol, GraphiteConfig::protocol);
}
} }

Loading…
Cancel
Save