Merge pull request #13 from Graylog2/searches-alerts-stats

add additional stats for searches, alert count and alarmcallback usage

Author: bernd

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

@@ -35,9 +35,11 @@
 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.SearchStats;
 import org.graylog.plugins.usagestatistics.dto.SessionStats;
 import org.graylog.plugins.usagestatistics.dto.ThroughputStats;
 import org.graylog.plugins.usagestatistics.util.MetricUtils;
+import org.graylog2.indexer.elasticsearch.GlobalTimeoutClient;
 import org.graylog2.inputs.Input;
 import org.graylog2.inputs.InputService;
 import org.graylog2.plugin.PluginMetaData;
@@ -46,6 +48,10 @@
 import org.graylog2.plugin.cluster.ClusterConfigService;
 import org.graylog2.plugin.cluster.ClusterId;
 import org.graylog2.plugin.system.NodeId;
+import org.graylog2.rest.resources.search.AbsoluteSearchResource;
+import org.graylog2.rest.resources.search.KeywordSearchResource;
+import org.graylog2.rest.resources.search.RelativeSearchResource;
+import org.graylog2.rest.resources.search.SearchResource;
 import org.graylog2.rest.resources.system.SessionsResource;
 import org.graylog2.security.realm.SessionAuthenticator;
 import org.graylog2.shared.system.stats.StatsService;
@@ -65,6 +71,7 @@
 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;
+import static org.graylog.plugins.usagestatistics.util.MetricUtils.safeGetTimer;
 
 @Singleton
 public class NodeCollector {
@@ -278,6 +285,14 @@ private NodeStats buildNodeStats() {
                 safeGetMeter(metricRegistry, name(SessionsResource.class, "terminateSession")).getCount()
         );
 
+        final SearchStats searchStats = SearchStats.create(
+                safeGetCounter(metricRegistry, name(SearchResource.class, "empty-search-results")).getCount(),
+                safeGetTimer(metricRegistry, name(AbsoluteSearchResource.class, "searchAbsolute")).getCount(),
+                safeGetTimer(metricRegistry, name(KeywordSearchResource.class, "searchKeyword")).getCount(),
+                safeGetTimer(metricRegistry, name(RelativeSearchResource.class, "searchRelative")).getCount(),
+                safeGetCounter(metricRegistry, name(GlobalTimeoutClient.class, "search-requests")).getCount()
+        );
+
         return NodeStats.create(
                 uptime,
                 inputService.totalCountForNode(nodeId.toString()),
@@ -286,6 +301,7 @@ private NodeStats buildNodeStats() {
                 journalStats,
                 searchTimings,
                 searchRanges,
+                searchStats,
                 sessionStats
         );
     }

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

@@ -29,6 +29,7 @@ public static NodeStats create(long uptime,
                                    JournalStats journalStats,
                                    Histogram searchTimings,
                                    Histogram searchRanges,
+                                   SearchStats searchStats,
                                    SessionStats sessionStats) {
         return new AutoValue_NodeStats(uptime,
                                        inputCount,
@@ -37,6 +38,7 @@ public static NodeStats create(long uptime,
                                        journalStats,
                                        searchTimings,
                                        searchRanges,
+                                       searchStats,
                                        sessionStats);
     }
 
@@ -61,6 +63,9 @@ public static NodeStats create(long uptime,
     @JsonProperty
     public abstract Histogram searchRanges();
 
+    @JsonProperty
+    public abstract SearchStats searchStats();
+
     @JsonProperty
     public abstract SessionStats sessionStats();
 }

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

@@ -0,0 +1,48 @@
+/**
+ * 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 SearchStats {
+
+    public static SearchStats create(long emptySearches,
+                                     long absoluteSearches,
+                                     long keywordSearches,
+                                     long relativeSearches,
+                                     long totalSearches) {
+        return new AutoValue_SearchStats(emptySearches, absoluteSearches, keywordSearches, relativeSearches, totalSearches);
+    }
+
+    @JsonProperty
+    public abstract long emptySearches();
+
+    @JsonProperty
+    public abstract long absoluteSearches();
+
+    @JsonProperty
+    public abstract long keywordSearches();
+
+    @JsonProperty
+    public abstract long relativeSearches();
+
+    @JsonProperty
+    public abstract long totalSearches();
+}