Skip to content

Commit e8514ed

Browse files
authored
Monitoring sinks configuration. (#222)
1 parent e0052f3 commit e8514ed

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<log4j.over.slf4j.version>1.7.25</log4j.over.slf4j.version>
9393
<metrics.aggregator.protocol.prometheus.version>1.0.0</metrics.aggregator.protocol.prometheus.version>
9494
<metrics.aggregator.protocol.version>1.0.10</metrics.aggregator.protocol.version>
95-
<metrics.client.version>0.11.2</metrics.client.version>
95+
<metrics.client.version>0.11.3</metrics.client.version>
9696
<metrics.client.http.version>0.11.2</metrics.client.http.version>
9797
<metrics.client.incubator.version>0.11.2</metrics.client.incubator.version>
9898
<metrics.jvm.extra.version>0.11.2</metrics.jvm.extra.version>
@@ -465,8 +465,8 @@
465465
<KAFKA_SOURCE_BOOTSTRAP_HOST>kafka</KAFKA_SOURCE_BOOTSTRAP_HOST>
466466
<!-- TODO(ville): Obtain these from the current user! -->
467467
<!-- Ref: https://github.com/rynr/user-id-maven-plugin -->
468-
<KDB_UID>1000</KDB_UID>
469-
<KDB_GID>1000</KDB_GID>
468+
<MAD_UID>1000</MAD_UID>
469+
<MAD_GID>1000</MAD_GID>
470470
</env>
471471
<volumes>
472472
<bind>

src/main/java/com/arpnetworking/metrics/mad/configuration/AggregatorConfiguration.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ public Builder setMonitoringService(final String value) {
209209
}
210210

211211
/**
212-
* The monitoring sinks. Optional. The default value is the default
213-
* instance of {@link com.arpnetworking.metrics.impl.ApacheHttpSink}.
212+
* The monitoring sinks. Optional. Cannot be null. The default value is
213+
* the default instance of {@link com.arpnetworking.metrics.impl.ApacheHttpSink}.
214214
*
215-
* @param value The monitoring service.
215+
* @param value The monitoring sinks.
216216
* @return This instance of {@link Builder}.
217217
*/
218218
public Builder setMonitoringSinks(final ImmutableList<JsonNode> value) {
@@ -374,6 +374,7 @@ public Builder setAkkaConfiguration(final Map<String, ?> value) {
374374
@NotNull
375375
@NotEmpty
376376
private String _monitoringService = "mad";
377+
// TODO(ville): Apply the default here once we migrate off JsonNode.
377378
@NotNull
378379
private ImmutableList<JsonNode> _monitoringSinks;
379380
@Nullable
@@ -383,7 +384,7 @@ public Builder setAkkaConfiguration(final Map<String, ?> value) {
383384
@Range(min = 1, max = 65535)
384385
private Integer _metricsClientPort;
385386
@NotNull
386-
private Duration _jvmMetricsCollectionInterval = Duration.ofMillis(500);
387+
private Duration _jvmMetricsCollectionInterval = Duration.ofMillis(1000);
387388
@NotNull
388389
private File _logDirectory;
389390
@NotNull

0 commit comments

Comments
 (0)