riemann-elasticsearch 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a150bc9f0e28b4a26dd6c0a897bfb3d1a484c42c
-  data.tar.gz: 21cbd6c24b3fb27157300760755fee7373b4d274
+  metadata.gz: 7e1225c22e80a1d45434c03d349b067670190f4f
+  data.tar.gz: bc8a6881c0f6109f7fff364d5cbdb834e713173d
 SHA512:
-  metadata.gz: a79cbb77d1f89e5419d7393e40335dba5635ea3a5f0bcaebd4d56f51a056bfed18714b3bd26e925cfaf2f1f9cca42aa8f181534113d493f62de64f5191c8953b
-  data.tar.gz: b91194acde151ebdbd02eaa4ed2303a3192291af66459b7ec0812ba8d0c14380eae53693da576c2264f6c143d208dd6c50c23764c1a893066facec0f457d023e
+  metadata.gz: e9d07022decd084de14f1dc69d956fc98a6f3c007b3069de18d33b84560d6cda900c06aa5f0b6571988f96cfcfe6dbe675b884a487c19efe0ad1ca6facebba8c
+  data.tar.gz: 276954e703705a80b392a8393f3b5a6e2ecf6546fcf74dea53c8e512eeaac5cd0af5a95110051cc5544b7603acd02795ed43f66f7e01a3f9081842789259e835

data/bin/riemann-elasticsearch

@@ -13,6 +13,7 @@ class Riemann::Tools::Elasticsearch
   opt :path_prefix, 'Elasticsearch path prefix for proxied installations e.g. "els" for target http://localhost/els/_cluster/health', default: "/"
   opt :es_host, 'Elasticsearch host', default: "localhost"
   opt :es_port, 'Elasticsearch port', type: :int, default: 9200
+  opt :es_search_index, 'Elasticsearch index to fetch search statistics for', default: "_all"
 
 
   # Handles HTTP connections and GET requests safely
@@ -35,90 +36,119 @@ class Riemann::Tools::Elasticsearch
       response
   end
 
-  def health_url
+  def make_es_url(path)
     path_prefix = options[:path_prefix]
     path_prefix[0] = '' if path_prefix[0]=='/'
     path_prefix[path_prefix.length-1] = '' if path_prefix[path_prefix.length-1]=='/'
-    "http://#{options[:es_host]}:#{options[:es_port]}#{path_prefix.length>0?'/':''}#{path_prefix}/_cluster/health"
+    "http://#{options[:es_host]}:#{options[:es_port]}#{path_prefix.length>0?'/':''}#{path_prefix}/#{path}"
+  end
+
+  def health_url
+    make_es_url("_cluster/health")
   end
 
   def indices_url
-    path_prefix = options[:path_prefix]
-    path_prefix[0] = '' if path_prefix[0]=='/'
-    path_prefix[path_prefix.length-1] = '' if path_prefix[path_prefix.length-1]=='/'
-    "http://#{options[:es_host]}:#{options[:es_port]}#{path_prefix.length>0?'/':''}#{path_prefix}/_stats/index,store"
+    make_es_url("_stats/index,store")
+  end
+
+  def search_url
+    es_search_index = options[:es_search_index]
+    make_es_url("#{es_search_index}/_stats/search")
+  end
+
+  def is_bad?(response, uri)
+    if response.success?
+      false
+    else
+      report(:host => uri.host,
+             :service => "elasticsearch health",
+             :state => "critical",
+             :description => response.nil? ? "HTTP response is empty!" : "HTTP connection error: #{response.status} - #{response.body}"
+      )
+    end
   end
 
   def tick_indices
     uri = URI(indices_url)
     response = safe_get(uri)
 
-    return if response.nil?
+    return if response.is_bad?(uri)
 
-    if response.status != 200
-        report(:host => uri.host,
-          :service => "elasticsearch health",
-          :state => "critical",
-          :description => "HTTP connection error: #{response.status} - #{response.body}"
-        )
-    else
-      # Assuming that a 200 will give json
-      json = JSON.parse(response.body)
+    # Assuming that a 200 will give json
+    json = JSON.parse(response.body)
 
-      json["indices"].each_pair do |k,v|
-        report(:host => uri.host,
-               :service => "elasticsearch index/#{k}/primaries/size_in_bytes",
-               :metric => v["primaries"]["store"]["size_in_bytes"]
-        )
-        report(:host => uri.host,
-               :service => "elasticsearch index/#{k}/total/size_in_bytes",
-               :metric => v["total"]["store"]["size_in_bytes"]
-        )
-      end
+    json["indices"].each_pair do |k,v|
+      report(:host => uri.host,
+             :service => "elasticsearch index/#{k}/primaries/size_in_bytes",
+             :metric => v["primaries"]["store"]["size_in_bytes"]
+      )
+      report(:host => uri.host,
+             :service => "elasticsearch index/#{k}/total/size_in_bytes",
+             :metric => v["total"]["store"]["size_in_bytes"]
+      )
     end
   end
 
-  def tick
-    tick_indices
-    uri = URI(health_url)
+  def tick_search
+    uri = URI(search_url)
     response = safe_get(uri)
 
-    return if response.nil?
+    return if response.is_bad?(uri)
 
-    if response.status != 200
-        report(:host => uri.host,
-          :service => "elasticsearch health",
-          :state => "critical",
-          :description => "HTTP connection error: #{response.status} - #{response.body}"
-        )
-    else
-      # Assuming that a 200 will give json
-      json = JSON.parse(response.body)
-      cluster_name = json.delete("cluster_name")
-      cluster_status = json.delete("status")
-      state = case cluster_status
-      when "green"
-        "ok"
-      when "yellow"
-        "warning"
-      when "red"
-        "critical"
-      end
+    es_search_index = options[:es_search_index]
+    # Assuming that a 200 will give json
+    json = JSON.parse(response.body)
+
+    json["_all"].each_pair do |type, data|
+      query = data["search"]["query_time_in_millis"].to_f / data["search"]["query_total"].to_f
+      fetch = data["search"]["fetch_time_in_millis"].to_f / data["search"]["fetch_total"].to_f
 
       report(:host => uri.host,
-             :service => "elasticsearch health",
-             :state => state,
-             :description => "Elasticsearch cluster: #{cluster_name} - #{cluster_status}")
+             :service => "elasticsearch search/#{es_search_index}/query",
+             :metric => query
+      )
+      report(:host => uri.host,
+             :service => "elasticsearch search/#{es_search_index}/fetch",
+             :metric => fetch
+      )
+    end
+  end
 
-      json.each_pair do |k,v|
-        report(:host => uri.host,
-               :service => "elasticsearch #{k}",
-               :metric => v,
-               :description => "Elasticsearch cluster #{k}"
-        )
+  def tick
+    tick_indices
+    tick_search
+    uri = URI(health_url)
+    response = safe_get(uri)
+
+    return if response.is_bad?(uri)
+
+    # Assuming that a 200 will give json
+    json = JSON.parse(response.body)
+    cluster_name = json.delete("cluster_name")
+    cluster_status = json.delete("status")
+    state = case cluster_status
+              when "green"
+                "ok"
+              when "yellow"
+                "warning"
+              when "red"
+                "critical"
+            end
+
+    report(:host => uri.host,
+           :service => "elasticsearch health",
+           :state => state,
+           :description => "Elasticsearch cluster: #{cluster_name} - #{cluster_status}")
+
+    json.each_pair do |k,v|
+      report(:host => uri.host,
+             :service => "elasticsearch #{k}",
+             :metric => v,
+             :description => "Elasticsearch cluster #{k}"
+      )
 
-      end
     end
+
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gavin Sandie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-tools