sensu-plugins-elasticsearch 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7cd67baf0aee4b5113c8168a5ab1497825578e3
-  data.tar.gz: f68dcbde8239e84eb7bd7a2ff6a4749a4229ebbd
+  metadata.gz: 9fd8010eda690389a21ef9f1b9704b8803bbfd8b
+  data.tar.gz: 9272fcbaa1ed975af17b3639aaee86a396d181f0
 SHA512:
-  metadata.gz: 738b0414e12bf04a69d85a82cf6cb7c01e3183030b850636d2a1181eff66d9786c8a4599b3286b1ed83c1a6524ee63cb2af86505b72b13409255ee719143b61a
-  data.tar.gz: 71695dab68c8fea9b76bbabab4d97b532871069eea58eef198dee4c0bc73b893d1dc5b4ee0ac28f26d6435623897318490e498d0fd37fe57dda138eaa9905b4d
+  metadata.gz: 9e2580830a11b829a518cfa81e8e51c208bd64d6b747e0ebd3692b31ab71f0fb7cd36e2f4692bcbf2a9d6771f41ee09df802537a5981a4f86363e532c3f174ce
+  data.tar.gz: e760023498bf149017232302fa6b54e9409bdbceb1516ea2e4c9da7e048db1725e8b22789c0f5450b604a0b45b50171e47474ae24e460ff6e26389ac12ffc8f3

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.4.1] - 2016-01-26 
+### Fixed
+- metrics-es-cluster.rb: Allow metrics to be gathered even if the cluster has zero documents. Also updated cache name for Elasticsearch 2.0+
+- metrics-es-node-graphite.rb: Update node stats for Elasticsearch 2.0+
+
 ## [0.4.0] - 2016-01-22
 ### Added
 - metrics-es-node-graphite.rb: Added file system and cpu stats

data/bin/metrics-es-cluster.rb

@@ -122,7 +122,12 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   def acquire_document_count
     document_count = get_es_resource('/_stats/docs')
-    document_count['_all']['total']['docs']['count']
+    count = document_count['_all']['total']
+    if count.empty?
+      return 0
+    else
+      return count['docs']['count']
+    end
   end
 
   def acquire_cluster_metrics
@@ -133,9 +138,14 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
     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']
+
+    # Elasticsearch changed the name filter_cache to query_cache in 2.0+
+    cache_name = Gem::Version.new(acquire_es_version) < Gem::Version.new('2.0.0') ? 'filter_cache' : 'query_cache'
+
+    cluster_metrics[cache_name]['memory_size_in_bytes'] = cluster_stats['indices'][cache_name]['memory_size_in_bytes']
+    cluster_metrics[cache_name]['evictions'] = cluster_stats['indices'][cache_name]['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']
@@ -146,7 +156,12 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   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'])
+    transient_settings = cluster_config['transient']
+    if transient_settings.empty?
+      return nil
+    else
+      return %w(none new_primaries primaries all).index(transient_settings['cluster']['routing']['allocation']['enable'])
+    end
   end
 
   def run
@@ -160,7 +175,7 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
         end
       end
       output(config[:scheme] + '.document_count', acquire_document_count)
-      output(config[:scheme] + '.allocation_status', acquire_allocation_status)
+      output(config[:scheme] + '.allocation_status', acquire_allocation_status) unless acquire_allocation_status.nil?
     end
     ok
   end

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

@@ -182,20 +182,19 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
         metrics['os.load_average.1']                = node['os']['load_average'][0]
         metrics['os.load_average.5']                = node['os']['load_average'][1]
         metrics['os.load_average.15']               = node['os']['load_average'][2]
+        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']
+        metrics['os.uptime']                        = node['os']['uptime_in_millis']
       end
       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
-      metrics['process.mem.resident_in_bytes']    = node['process']['mem']['resident_in_bytes']
+      metrics['process.cpu.percent']              = node['process']['cpu']['percent']
+      metrics['process.mem.resident_in_bytes']    = node['process']['mem']['resident_in_bytes'] if node['process']['mem']['resident_in_bytes']
     end
 
     if jvm_stats

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

@@ -2,7 +2,7 @@ module SensuPluginsElasticsearch
   module Version
     MAJOR = 0
     MINOR = 4
-    PATCH = 0
+    PATCH = 1
 
     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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sensu Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client

metadata.gz.sig

@@ -1,3 +1 @@
-}��L�h�?��E*������Mp�]7Ϣ3Ukڎ)�r�-�Bbo��r(������R��הd�lM]:cj>��C��R�Ő��ƇY��1y>#@H��~3R���5������L�X���*~���Bΰi�
-΋��9��0T�DC�9���0����Sx<B��!Eup�������,ٓ�8�	H�V֕�H�q���\��k�U�f��B�ؔ��5�NׇG
-'J
,ԋ�O�R����Vw��-@
+�?��H�|w�eO!ɹ�}���X$��>���u���_��I�撸~TȏXCG�_����]h/q(�P�����<X�6sTD{��5Vv����O�:yepIQ;LȻ����q�O��}�z������_*�+��?Is7���>Ǵlz��Z2]��]4�o����}��U˦�� ���o%�t�5�/�4</�J�.�Z��f�J.���ʽ�H0u�F��]G�,\�O�&�X�k*��u�a�2����ʤ`F�A���{l