Add wavefront micrometer registry support

- add wavefront micrometer registry deps
 - fix wrong core artifact names

 Part of #https://github.com/spring-cloud/spring-cloud-dataflow/issues/3938
This commit is contained in:
Christian Tzolov
2020-05-18 17:29:39 +02:00
committed by Soby Chacko
parent c598674a98
commit 2b1089a009
5 changed files with 19 additions and 12 deletions

View File

@@ -16,17 +16,17 @@ The **$$cassandra$$** $$sink$$ has the following options:
//tag::configuration-properties[]
$$spring.data.cassandra.cluster-name$$:: $$<documentation missing>$$ *($$String$$, default: `$$<none>$$`)*
$$spring.data.cassandra.compression$$:: $$Compression supported by the Cassandra binary protocol.$$ *($$Compression$$, default: `$$none$$`, possible values: `LZ4`,`SNAPPY`,`NONE`)*
$$spring.data.cassandra.connect-timeout$$:: $$Socket option: connection time out.$$ *($$Duration$$, default: `$$<none>$$`)*
$$spring.data.cassandra.consistency-level$$:: $$Queries consistency level.$$ *($$DefaultConsistencyLevel$$, default: `$$<none>$$`, possible values: `ANY`,`ONE`,`TWO`,`THREE`,`QUORUM`,`ALL`,`LOCAL_ONE`,`LOCAL_QUORUM`,`EACH_QUORUM`,`SERIAL`,`LOCAL_SERIAL`)*
$$spring.data.cassandra.connect-timeout$$:: $$<documentation missing>$$ *($$Duration$$, default: `$$<none>$$`)*
$$spring.data.cassandra.consistency-level$$:: $$<documentation missing>$$ *($$DefaultConsistencyLevel$$, default: `$$<none>$$`, possible values: `ANY`,`ONE`,`TWO`,`THREE`,`QUORUM`,`ALL`,`LOCAL_ONE`,`LOCAL_QUORUM`,`EACH_QUORUM`,`SERIAL`,`LOCAL_SERIAL`)*
$$spring.data.cassandra.contact-points$$:: $$Cluster node addresses in the form 'host:port', or a simple 'host' to use the configured port.$$ *($$List<String>$$, default: `$$[127.0.0.1:9042]$$`)*
$$spring.data.cassandra.fetch-size$$:: $$<documentation missing>$$ *($$Integer$$, default: `$$<none>$$`)*
$$spring.data.cassandra.keyspace-name$$:: $$Keyspace name to use.$$ *($$String$$, default: `$$<none>$$`)*
$$spring.data.cassandra.local-datacenter$$:: $$Datacenter that is considered "local". Contact points should be from this datacenter.$$ *($$String$$, default: `$$<none>$$`)*
$$spring.data.cassandra.page-size$$:: $$Queries default page size.$$ *($$Integer$$, default: `$$5000$$`)*
$$spring.data.cassandra.password$$:: $$Login password of the server.$$ *($$String$$, default: `$$<none>$$`)*
$$spring.data.cassandra.read-timeout$$:: $$Socket option: read time out.$$ *($$Duration$$, default: `$$<none>$$`)*
$$spring.data.cassandra.port$$:: $$Port to use if a contact point does not specify one.$$ *($$Integer$$, default: `$$9042$$`)*
$$spring.data.cassandra.read-timeout$$:: $$<documentation missing>$$ *($$Duration$$, default: `$$<none>$$`)*
$$spring.data.cassandra.schema-action$$:: $$Schema action to take at startup.$$ *($$String$$, default: `$$none$$`)*
$$spring.data.cassandra.serial-consistency-level$$:: $$Queries serial consistency level.$$ *($$DefaultConsistencyLevel$$, default: `$$<none>$$`, possible values: `ANY`,`ONE`,`TWO`,`THREE`,`QUORUM`,`ALL`,`LOCAL_ONE`,`LOCAL_QUORUM`,`EACH_QUORUM`,`SERIAL`,`LOCAL_SERIAL`)*
$$spring.data.cassandra.serial-consistency-level$$:: $$<documentation missing>$$ *($$DefaultConsistencyLevel$$, default: `$$<none>$$`, possible values: `ANY`,`ONE`,`TWO`,`THREE`,`QUORUM`,`ALL`,`LOCAL_ONE`,`LOCAL_QUORUM`,`EACH_QUORUM`,`SERIAL`,`LOCAL_SERIAL`)*
$$spring.data.cassandra.session-name$$:: $$Name of the Cassandra session.$$ *($$String$$, default: `$$<none>$$`)*
$$spring.data.cassandra.ssl$$:: $$Enable SSL support.$$ *($$Boolean$$, default: `$$false$$`)*
$$spring.data.cassandra.username$$:: $$Login user of the server.$$ *($$String$$, default: `$$<none>$$`)*

View File

@@ -31,6 +31,7 @@ $$spring.redis.password$$:: $$Login password of the redis server.$$ *($$String$$
$$spring.redis.port$$:: $$Redis server port.$$ *($$Integer$$, default: `$$6379$$`)*
$$spring.redis.sentinel.master$$:: $$Name of the Redis server.$$ *($$String$$, default: `$$<none>$$`)*
$$spring.redis.sentinel.nodes$$:: $$Comma-separated list of "host:port" pairs.$$ *($$List<String>$$, default: `$$<none>$$`)*
$$spring.redis.sentinel.password$$:: $$Password for authenticating with sentinel(s).$$ *($$String$$, default: `$$<none>$$`)*
$$spring.redis.ssl$$:: $$Whether to enable SSL support.$$ *($$Boolean$$, default: `$$false$$`)*
$$spring.redis.timeout$$:: $$Connection timeout.$$ *($$Duration$$, default: `$$<none>$$`)*
$$spring.redis.url$$:: $$Connection URL. Overrides host, port, and password. User is ignored. Example: redis://user:password@example.com:6379$$ *($$String$$, default: `$$<none>$$`)*

View File

@@ -36,7 +36,7 @@ public class SpringCloudStreamMicrometerEnvironmentPostProcessor implements Envi
private final static String METRICS_PROPERTY_NAME_TEMPLATE = "management.metrics.export.%s.enabled";
private final static String[] METRICS_REPOSITORY_NAMES =
new String[]{"datadog", "influx", "prometheus", "prometheus.rsocket"};
new String[]{"datadog", "influx", "prometheus", "prometheus.rsocket", "wavefront"};
@Override
public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {

View File

@@ -61,6 +61,7 @@ public class SpringCloudStreamMicrometerEnvironmentPostProcessorTest {
"management.metrics.export.prometheus.enabled=true",
"management.metrics.export.prometheus.rsocket.enabled=true",
"management.metrics.export.datadog.enabled=true",
"management.metrics.export.wavefront.enabled=true",
"management.endpoints.web.exposure.include=info,health"})
public static class TestOverrideMetricsEnabledProperties extends AbstractMicrometerTagTest {
@@ -77,6 +78,7 @@ public class SpringCloudStreamMicrometerEnvironmentPostProcessorTest {
assertThat(context.getEnvironment().getProperty("management.metrics.export.prometheus.enabled")).isEqualTo("true");
assertThat(context.getEnvironment().getProperty("management.metrics.export.prometheus.rsocket.enabled")).isEqualTo("true");
assertThat(context.getEnvironment().getProperty("management.metrics.export.datadog.enabled")).isEqualTo("true");
assertThat(context.getEnvironment().getProperty("management.metrics.export.wavefront.enabled")).isEqualTo("true");
assertThat(context.getEnvironment().getProperty("management.endpoints.web.exposure.include")).isEqualTo("info,health");
}

View File

@@ -12,13 +12,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.0.M4</version>
<version>2.3.0.RELEASE</version>
</parent>
<properties>
<java.version>1.8</java.version>
<stream-apps-core.version>3.0.0.M2</stream-apps-core.version>
<spring-boot.version>2.3.0.M4</spring-boot.version>
<stream-apps-core.version>3.0.0-SNAPSHOT</stream-apps-core.version>
<spring-boot.version>2.3.0.RELEASE</spring-boot.version>
<app-metadata-maven-plugin-version>2.0.1.M1</app-metadata-maven-plugin-version>
<scst-app-maven-plugin.version>2.0.0.M2</scst-app-maven-plugin.version>
<stream-apps-docs-plugin.version>3.0.0.M1</stream-apps-docs-plugin.version>
@@ -26,7 +26,7 @@
<spring-cloud-function-dependencies.version>3.0.2.RELEASE</spring-cloud-function-dependencies.version>
<spring-cloud-dependencies.version>Hoxton.SR2</spring-cloud-dependencies.version>
<spring-cloud-stream-dependencies.version>Horsham.SR2</spring-cloud-stream-dependencies.version>
<java-cfenv-boot.version>2.1.1.RELEASE</java-cfenv-boot.version>
<java-cfenv-boot.version>2.1.2.RELEASE</java-cfenv-boot.version>
<java-functions.version>1.0.0-SNAPSHOT</java-functions.version>
<prometheus-rsocket.version>0.9.0</prometheus-rsocket.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
@@ -251,12 +251,12 @@
<globalDependencies>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-apps-security-common</artifactId>
<artifactId>stream-applications-security-common</artifactId>
<version>${stream-apps-core.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-apps-micrometer-common</artifactId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>${stream-apps-core.version}</version>
</dependency>
<dependency>
@@ -267,6 +267,10 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-wavefront</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-spring</artifactId>