track session stats data for each participating node

Author: kroepke

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

@@ -35,6 +35,7 @@
 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.SessionStats;
 import org.graylog.plugins.usagestatistics.dto.ThroughputStats;
 import org.graylog.plugins.usagestatistics.util.MetricUtils;
 import org.graylog2.inputs.Input;
@@ -45,6 +46,8 @@
 import org.graylog2.plugin.cluster.ClusterConfigService;
 import org.graylog2.plugin.cluster.ClusterId;
 import org.graylog2.plugin.system.NodeId;
+import org.graylog2.rest.resources.system.SessionsResource;
+import org.graylog2.security.realm.SessionAuthenticator;
 import org.graylog2.shared.system.stats.StatsService;
 import org.graylog2.shared.system.stats.jvm.JvmStats;
 import org.graylog2.shared.system.stats.network.NetworkStats;
@@ -60,6 +63,8 @@
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.graylog.plugins.usagestatistics.util.MetricUtils.safeGetCounter;
+import static org.graylog.plugins.usagestatistics.util.MetricUtils.safeGetMeter;
 
 @Singleton
 public class NodeCollector {
@@ -261,14 +266,23 @@ private NodeStats buildNodeStats() {
                 MetricUtils.safeGetHistogram(metricRegistry, "org.graylog2.indexer.searches.Searches.elasticsearch.ranges")
         );
 
+        final SessionStats sessionStats = SessionStats.create(
+                safeGetCounter(metricRegistry, name(SessionAuthenticator.class, "sessions-authenticated")).getCount(),
+                safeGetCounter(metricRegistry, name(SessionAuthenticator.class, "sessions-extended")).getCount(),
+                safeGetCounter(metricRegistry, name(SessionAuthenticator.class, "sessions-expired")).getCount(),
+                safeGetMeter(metricRegistry, name(SessionsResource.class, "newSession")).getCount(),
+                safeGetMeter(metricRegistry, name(SessionsResource.class, "terminateSession")).getCount()
+        );
+
         return NodeStats.create(
                 uptime,
                 inputService.totalCountForNode(nodeId.toString()),
                 throughputStats,
                 bufferStats,
                 journalStats,
                 searchTimings,
-                searchRanges
+                searchRanges,
+                sessionStats
         );
     }
 

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

@@ -28,8 +28,16 @@ public static NodeStats create(long uptime,
                                    BufferStats bufferStats,
                                    JournalStats journalStats,
                                    Histogram searchTimings,
-                                   Histogram searchRanges) {
-        return new AutoValue_NodeStats(uptime, inputCount, throughputStats, bufferStats, journalStats, searchTimings, searchRanges);
+                                   Histogram searchRanges,
+                                   SessionStats sessionStats) {
+        return new AutoValue_NodeStats(uptime,
+                                       inputCount,
+                                       throughputStats,
+                                       bufferStats,
+                                       journalStats,
+                                       searchTimings,
+                                       searchRanges,
+                                       sessionStats);
     }
 
     @JsonProperty
@@ -52,4 +60,7 @@ public static NodeStats create(long uptime,
 
     @JsonProperty
     public abstract Histogram searchRanges();
+
+    @JsonProperty
+    public abstract SessionStats sessionStats();
 }

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

@@ -0,0 +1,38 @@
+package org.graylog.plugins.usagestatistics.dto;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.auto.value.AutoValue;
+
+@JsonAutoDetect
+@AutoValue
+public abstract class SessionStats {
+    @JsonProperty
+    public abstract long authenticated();
+
+    @JsonProperty
+    public abstract long extended();
+
+    @JsonProperty
+    public abstract long expired();
+
+    @JsonProperty
+    public abstract long logins();
+
+    @JsonProperty
+    public abstract long logouts();
+
+    @JsonCreator
+    public static SessionStats create(long authenticated,
+                                      long extended,
+                                      long expired,
+                                      long logins,
+                                      long logouts) {
+        return new AutoValue_SessionStats(authenticated,
+                                          extended,
+                                          expired,
+                                          logins,
+                                          logouts);
+    }
+}