sensu-plugins-elasticsearch 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd1578a35f585df777a0e1c90e333d6d2a5463c
-  data.tar.gz: b702fb67209f601680305df43988c8085e47e643
+  metadata.gz: d7cd67baf0aee4b5113c8168a5ab1497825578e3
+  data.tar.gz: f68dcbde8239e84eb7bd7a2ff6a4749a4229ebbd
 SHA512:
-  metadata.gz: 46c95cbfb1fa1798a2f42296cd00e105eac50b0a7b1450563dab5296a36a28890bc754e197253e2df924726fb17203c3083cab84de90af2f877b48658ab8d82b
-  data.tar.gz: 057d2d45e35b9b085958a15186032b3152c4bdf8d80fe6b18bb5f1710cf1b70bb2167eb42df171327be5686f0b71db0f53b32dd1603a4391b0e464049592a935
+  metadata.gz: 738b0414e12bf04a69d85a82cf6cb7c01e3183030b850636d2a1181eff66d9786c8a4599b3286b1ed83c1a6524ee63cb2af86505b72b13409255ee719143b61a
+  data.tar.gz: 71695dab68c8fea9b76bbabab4d97b532871069eea58eef198dee4c0bc73b893d1dc5b4ee0ac28f26d6435623897318490e498d0fd37fe57dda138eaa9905b4d

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.4.0] - 2016-01-22
+### Added
+- metrics-es-node-graphite.rb: Added file system and cpu stats
+- metrics-es-cluster.rb: Added cluster metrics including optional percolator metrics, allocation status, and option to run on non-master nodes
+
 ## [0.3.2] - 2015-12-29
 ### Changed
 - Update metrics-es-node.rb for Elasticsearch 2.0

data/bin/metrics-es-cluster.rb

@@ -5,7 +5,7 @@
 # DESCRIPTION:
 #   This plugin uses the ES API to collect metrics, producing a JSON
 #   document which is outputted to STDOUT. An exit status of 0 indicates
-#   the plugin has successfully collected and produced.
+#   the plugin has successfully collected and produced metrics.
 #
 # OUTPUT:
 #   metric data
@@ -63,6 +63,18 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
          proc: proc(&:to_i),
          default: 30
 
+  option :allow_non_master,
+         description: 'Allow check to run on non-master nodes',
+         short: '-a',
+         long: '--allow-non-master',
+         default: false
+
+  option :enable_percolate,
+         description: 'Enables percolator stats',
+         short: '-o',
+         long: '--enable-percolate',
+         default: false
+
   option :user,
          description: 'Elasticsearch User',
          short: '-u USER',
@@ -113,12 +125,42 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
     document_count['_all']['total']['docs']['count']
   end
 
+  def acquire_cluster_metrics
+    cluster_stats = get_es_resource('/_cluster/stats')
+    cluster_metrics = Hash.new { |h, k| h[k] = {} }
+    cluster_metrics['fs']['total_in_bytes'] = cluster_stats['nodes']['fs']['total_in_bytes']
+    cluster_metrics['fs']['free_in_bytes'] = cluster_stats['nodes']['fs']['free_in_bytes']
+    cluster_metrics['fs']['store_in_bytes'] = cluster_stats['indices']['store']['size_in_bytes']
+    cluster_metrics['fielddata']['memory_size_in_bytes'] = cluster_stats['indices']['fielddata']['memory_size_in_bytes']
+    cluster_metrics['fielddata']['evictions'] = cluster_stats['indices']['fielddata']['evictions']
+    cluster_metrics['filter_cache']['memory_size_in_bytes'] = cluster_stats['indices']['filter_cache']['memory_size_in_bytes']
+    cluster_metrics['filter_cache']['evictions'] = cluster_stats['indices']['filter_cache']['evictions']
+    cluster_metrics['mem'] = cluster_stats['nodes']['jvm']['mem']
+    if config[:enable_percolate]
+      cluster_metrics['percolate']['total'] = cluster_stats['indices']['percolate']['total']
+      cluster_metrics['percolate']['time_in_millis'] = cluster_stats['indices']['percolate']['time_in_millis']
+      cluster_metrics['percolate']['queries'] = cluster_stats['indices']['percolate']['queries']
+    end
+    cluster_metrics
+  end
+
+  def acquire_allocation_status
+    cluster_config = get_es_resource('/_cluster/settings')
+    %w(none new_primaries primaries all).index(cluster_config['transient']['cluster']['routing']['allocation']['enable'])
+  end
+
   def run
-    if master?
+    if config[:allow_non_master] || master?
       acquire_health.each do |k, v|
         output(config[:scheme] + '.' + k, v)
       end
+      acquire_cluster_metrics.each do |cluster_metric|
+        cluster_metric[1].each do |k, v|
+          output(config[:scheme] + '.' + cluster_metric[0] + '.' + k, v)
+        end
+      end
       output(config[:scheme] + '.document_count', acquire_document_count)
+      output(config[:scheme] + '.allocation_status', acquire_allocation_status)
     end
     ok
   end

data/bin/metrics-es-node-graphite.rb

@@ -94,6 +94,12 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
          boolean: true,
          default: false
 
+  option :disable_fs_stats,
+         description: 'Disable filesystem statistics',
+         long: '--disable-fs-stats',
+         boolean: true,
+         default: false
+
   option :user,
          description: 'Elasticsearch User',
          short: '-u USER',
@@ -129,6 +135,7 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
     process_stats = !config[:disable_process_stats]
     jvm_stats = !config[:disable_jvm_stats]
     tp_stats = !config[:disable_thread_pool_stats]
+    fs_stats = !config[:disable_fs_stats]
 
     es_version = Gem::Version.new(acquire_es_version)
 
@@ -138,6 +145,7 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
       stats_query_array.push('os') if os_stat == true
       stats_query_array.push('process') if process_stats == true
       stats_query_array.push('tp_stats') if tp_stats == true
+      stats_query_array.push('fs_stats') if fs_stats == true
       stats_query_string = stats_query_array.join(',')
     else
       stats_query_string = [
@@ -150,7 +158,8 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
         "process=#{process_stats}",
         "thread_pool=#{tp_stats}",
         'transport=true',
-        'thread_pool=true'
+        'thread_pool=true',
+        "fs=#{fs_stats}"
       ].join('&')
     end
 
@@ -177,6 +186,12 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
       metrics['os.mem.free_in_bytes']             = node['os']['mem']['free_in_bytes']
       # ... Process uptime in millis?
       metrics['os.uptime']                        = node['os']['uptime_in_millis'] if node['os']['uptime_in_millis']
+
+      metrics['os.cpu.sys']                       = node['os']['cpu']['sys']
+      metrics['os.cpu.user']                      = node['os']['cpu']['user']
+      metrics['os.cpu.idle']                      = node['os']['cpu']['idle']
+      metrics['os.cpu.usage']                     = node['os']['cpu']['usage']
+      metrics['os.cpu.stolen']                    = node['os']['cpu']['stolen']
     end
 
     if process_stats
@@ -254,6 +269,16 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
       end
     end
 
+    if fs_stats
+      node['fs'].each do |fs, fs_value|
+        unless fs =~ /(timestamp|data)/
+          fs_value.each do |k, v|
+            metrics["fs.#{fs}.#{k}"] = v
+          end
+        end
+      end
+    end
+
     metrics.each do |k, v|
       output([config[:scheme], k].join('.'), v, timestamp)
     end

data/lib/sensu-plugins-elasticsearch/version.rb

@@ -1,8 +1,8 @@
 module SensuPluginsElasticsearch
   module Version
     MAJOR = 0
-    MINOR = 3
-    PATCH = 2
+    MINOR = 4
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client