Skip to content
This repository was archived by the owner on Dec 23, 2017. It is now read-only.

Commit b38f7d2

Browse files
committed
Set installation_source in NodeInfo
1 parent 048e3fb commit b38f7d2

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/main/java/org/graylog/plugins/usagestatistics/collectors/NodeCollector.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public class NodeCollector {
7878
private final ClusterConfigService clusterConfigService;
7979
private final Set<PluginMetaData> plugins;
8080
private final long reportIntervalMs;
81+
private final String installationSource;
8182

8283
@Inject
8384
public NodeCollector(NodeId nodeId,
@@ -87,7 +88,8 @@ public NodeCollector(NodeId nodeId,
8788
InputService inputService,
8889
ClusterConfigService clusterConfigService,
8990
Set<PluginMetaData> plugins,
90-
@Named("usage_statistics_report_interval") Duration reportInterval) {
91+
@Named("usage_statistics_report_interval") Duration reportInterval,
92+
@Named("installation_source") String installationSource) {
9193
this.nodeId = checkNotNull(nodeId);
9294
this.serverStatus = checkNotNull(serverStatus);
9395
this.metricRegistry = checkNotNull(metricRegistry);
@@ -96,6 +98,7 @@ public NodeCollector(NodeId nodeId,
9698
this.clusterConfigService = checkNotNull(clusterConfigService);
9799
this.plugins = checkNotNull(plugins);
98100
this.reportIntervalMs = checkNotNull(reportInterval).toMilliseconds();
101+
this.installationSource = checkNotNull(installationSource);
99102
}
100103

101104
public NodeDataSet getNodeDataSet() {
@@ -120,7 +123,8 @@ private NodeInfo buildNodeInfo() {
120123
NodeRole.fromCapabilities(serverStatus),
121124
Version.CURRENT_CLASSPATH.toString(),
122125
buildPluginInfo(plugins),
123-
buildOsInfo()
126+
buildOsInfo(),
127+
installationSource
124128
);
125129
}
126130

src/main/java/org/graylog/plugins/usagestatistics/dto/NodeInfo.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ public abstract class NodeInfo {
2727
public static NodeInfo create(NodeRole role,
2828
String serverVersion,
2929
Set<PluginInfo> plugins,
30-
Os os) {
31-
return new AutoValue_NodeInfo(role, serverVersion, plugins, os);
30+
Os os,
31+
String installationSource) {
32+
return new AutoValue_NodeInfo(role, serverVersion, plugins, os, installationSource);
3233
}
3334

3435
@JsonProperty
@@ -42,4 +43,7 @@ public static NodeInfo create(NodeRole role,
4243

4344
@JsonProperty
4445
public abstract Os os();
46+
47+
@JsonProperty
48+
public abstract String installationSource();
4549
}

0 commit comments

Comments
 (0)