Merge pull request #7 from Graylog2/issue-3

Add support for discovering the OS platform

Author: bernd

pom.xml

@@ -75,6 +75,11 @@
             <artifactId>jackson-dataformat-smile</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.graylog.repackaged</groupId>
+            <artifactId>os-platform-finder</artifactId>
+            <version>1.0</version>
+        </dependency>
         <dependency>
             <groupId>com.google.auto.value</groupId>
             <artifactId>auto-value</artifactId>

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

@@ -31,13 +31,13 @@
 import org.graylog.plugins.usagestatistics.dto.NodeInfo;
 import org.graylog.plugins.usagestatistics.dto.NodeRole;
 import org.graylog.plugins.usagestatistics.dto.NodeStats;
+import org.graylog.plugins.usagestatistics.dto.Os;
 import org.graylog.plugins.usagestatistics.dto.PluginInfo;
 import org.graylog.plugins.usagestatistics.dto.ThroughputStats;
 import org.graylog.plugins.usagestatistics.util.MetricUtils;
 import org.graylog2.inputs.InputService;
 import org.graylog2.plugin.PluginMetaData;
 import org.graylog2.plugin.ServerStatus;
-import org.graylog2.plugin.Tools;
 import org.graylog2.plugin.Version;
 import org.graylog2.plugin.cluster.ClusterConfigService;
 import org.graylog2.plugin.cluster.ClusterId;
@@ -108,10 +108,20 @@ private NodeInfo buildNodeInfo() {
         return NodeInfo.create(
                 NodeRole.fromCapabilities(serverStatus),
                 Version.CURRENT_CLASSPATH.toString(),
-                buildPluginInfo(plugins)
+                buildPluginInfo(plugins),
+                buildOsInfo()
         );
     }
 
+    private Os buildOsInfo() {
+        org.jsoftbiz.utils.OS os = org.jsoftbiz.utils.OS.getOs();
+        return Os.create(
+                os.getName(),
+                os.getVersion(),
+                os.getArch(),
+                os.getPlatformName());
+    }
+
     private Set<PluginInfo> buildPluginInfo(Set<PluginMetaData> plugins) {
         final Set<PluginInfo> pluginInfos = Sets.newHashSetWithExpectedSize(plugins.size());
         for (PluginMetaData pluginMetaData : plugins) {

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

@@ -26,8 +26,9 @@
 public abstract class NodeInfo {
     public static NodeInfo create(NodeRole role,
                                   String serverVersion,
-                                  Set<PluginInfo> plugins) {
-        return new AutoValue_NodeInfo(role, serverVersion, plugins);
+                                  Set<PluginInfo> plugins,
+                                  Os os) {
+        return new AutoValue_NodeInfo(role, serverVersion, plugins, os);
     }
 
     @JsonProperty
@@ -38,4 +39,7 @@ public static NodeInfo create(NodeRole role,
 
     @JsonProperty
     public abstract Set<PluginInfo> plugins();
+
+    @JsonProperty
+    public abstract Os os();
 }

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

@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) 2015 Graylog, Inc. ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.graylog.plugins.usagestatistics.dto;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.auto.value.AutoValue;
+
+@JsonAutoDetect
+@AutoValue
+public abstract class Os {
+    public static Os create(String name,
+                            String version,
+                            String arch,
+                            String platformName) {
+        return new AutoValue_Os(name, version, arch, platformName);
+    }
+
+    @JsonProperty
+    public abstract String name();
+
+    @JsonProperty
+    public abstract String version();
+
+    @JsonProperty
+    public abstract String arch();
+
+    @JsonProperty
+    public abstract String platformName();
+}