Skip to content

Commit 3a21d9c

Browse files
vjkoskelaBrandonArp
authored andcommitted
Allow the configuration to customize the monitoring service. (#112)
1 parent 0f7cab3 commit 3a21d9c

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

src/main/java/com/arpnetworking/metrics/mad/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ private Injector launchGuice(final ActorSystem actorSystem) {
260260
+ _configuration.getMetricsClientPort() + "/metrics/v2/application");
261261
final MetricsFactory metricsFactory = new TsdMetricsFactory.Builder()
262262
.setClusterName(_configuration.getMonitoringCluster())
263-
.setServiceName("mad")
263+
.setServiceName(_configuration.getMonitoringService())
264264
.setSinks(
265265
Collections.singletonList(
266266
new ApacheHttpSink.Builder()

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ public String getMonitoringCluster() {
4141
return _monitoringCluster;
4242
}
4343

44+
public String getMonitoringService() {
45+
return _monitoringService;
46+
}
47+
4448
public File getLogDirectory() {
4549
return _logDirectory;
4650
}
@@ -90,6 +94,7 @@ public String toString() {
9094
return MoreObjects.toStringHelper(this)
9195
.add("id", Integer.toHexString(System.identityHashCode(this)))
9296
.add("MonitoringCluster", _monitoringCluster)
97+
.add("MonitoringService", _monitoringService)
9398
.add("LogDirectory", _logDirectory)
9499
.add("PipelinesDirectory", _pipelinesDirectory)
95100
.add("HttpHost", _httpHost)
@@ -106,6 +111,7 @@ public String toString() {
106111

107112
private AggregatorConfiguration(final Builder builder) {
108113
_monitoringCluster = builder._monitoringCluster;
114+
_monitoringService = builder._monitoringService;
109115
_logDirectory = builder._logDirectory;
110116
_pipelinesDirectory = builder._pipelinesDirectory;
111117
_httpHost = builder._httpHost;
@@ -121,6 +127,7 @@ private AggregatorConfiguration(final Builder builder) {
121127
}
122128

123129
private final String _monitoringCluster;
130+
private final String _monitoringService;
124131
private final File _logDirectory;
125132
private final File _pipelinesDirectory;
126133
private final String _httpHost;
@@ -158,6 +165,18 @@ public Builder setMonitoringCluster(final String value) {
158165
return this;
159166
}
160167

168+
/**
169+
* The monitoring service. Optional. Cannot be null or empty. The
170+
* default value is {@code mad}.
171+
*
172+
* @param value The monitoring service.
173+
* @return This instance of <code>Builder</code>.
174+
*/
175+
public Builder setMonitoringService(final String value) {
176+
_monitoringService = value;
177+
return this;
178+
}
179+
161180
/**
162181
* The log directory. Cannot be null.
163182
*
@@ -293,6 +312,9 @@ public Builder setAkkaConfiguration(final Map<String, ?> value) {
293312
@NotEmpty
294313
private String _monitoringCluster;
295314
@NotNull
315+
@NotEmpty
316+
private String _monitoringService = "mad";
317+
@NotNull
296318
private File _logDirectory;
297319
@NotNull
298320
private File _pipelinesDirectory;

0 commit comments

Comments
 (0)