sensu-plugins-elasticsearch 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5642696a8f37d54e95e2be913af5fb1694dee4c86e73e700cc1bb14c4ebdec14
-  data.tar.gz: 253b4e9aaf0a44a6aa1d8224644343b9f5d27d6cadbdb4de73a36e2cb6dfbfb9
+  metadata.gz: 3e6d8d406b64519a41b89611e55d812b206e846897f981208b97b4c8bd632ef9
+  data.tar.gz: a2c9523a27c183d831c4d846e8fa5087fdca790414a3f1234e87abece5098a68
 SHA512:
-  metadata.gz: 1c8299a54b50656ac4da0a7682694024586cda2d9228af287de7a83d6579b14155c8aacf01656b170a91ac1728ff1358d55eab3be4621f7146dbff8e843fbd8c
-  data.tar.gz: 519e411301630fcfb1e40af4af6b369f4f08ff2aea3308287aba2f5a9981444fdaea84aa4e348b6c26431797fc794b6d0b5b05f3b6bef50b2d631a91bbe19f0c
+  metadata.gz: ff0e1e1efc65008d3fcd2235a4bc54682319a20ac5457c83a9e49d30e1b519a6d734678c5004f09ec27d12f749261c1e2870f655dfbcb73b051af130db8ddb06
+  data.tar.gz: 1d0bc776c389b430a758b0f5df0fd9803cda7d04725814491e73d7b8ef4f20cb9c05a3c5835d409b7bbb239ca8ba1a31be2e8efd4a8a97fa2830eb24ca9f2b79

data/CHANGELOG.md

@@ -5,6 +5,15 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [1.11.0] - 2018-02-23
+### Added
+- bin/check-es-query-average.rb: added flag of '--headers' so that headers can be passed to the elasticsearch http client (@alexandrustaetu)
+- bin/check-es-query-average.rb: added flag of '--headers' so that headers can be passed to the elasticsearch http client (@alexandrustaetu)
+- bin/check-es-query-average.rb: added flag of '--headers' so that headers can be passed to the elasticsearch http client (@alexandrustaetu)
+- bin/check-es-query-average.rb: added flag of '--headers' so that headers can be passed to the elasticsearch http client (@alexandrustaetu)
+- lib/sensu-plugins-elasticsearch/elasticsearch-common.rb: collect headers originating from query commands and pass them to the elasticsearch client (@alexandrustaetu)
+- integration testing with es6 (@alexandrustaetu) (@majormoses)
+
 ## [1.10.0] - 2018-02-19
 ### Added
 - check-es-circuit-breakers.rb, check-es-cluster-status.rb, check-es-indices-sizes.rb, check-es-node-status.rb, metrics-es-cluster.rb, metrics-es-node-graphite.rb, metrics-es-node.rb: added `--cert-file` option which allows you to specify a ca-cert to be used to verify TLS (@csoleimani) (@majormoses)
@@ -217,7 +226,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 - initial release
 
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.10.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.11.0...HEAD
+[1.11.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.10.0...1.11.0
 [1.10.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.9.0...1.10.0
 [1.9.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.8.1...1.9.0
 [1.8.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.8.0...1.8.1

data/README.md

@@ -33,3 +33,22 @@
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes
+
+## Testing
+
+This repository uses the [Kitchen](https://kitchen.ci/) suite for it's tests.
+
+Note: The test suite uses an elasticsearch instance in order to have passing tests. Execute the following command to create a mock elasticsearch 6 instance:
+
+```bash
+docker run -d --name sensu-elasticsearch-6 docker.elastic.co/elasticsearch/elasticsearch:6.2.2
+``` 
+
+Running the tests:
+
+```bash
+bundle install --path vendor/bundle
+bundle exec kitchen test
+``` 
+
+You can find sample output for all tests running successfully in [this gist](https://gist.github.com/alexandrustaetu/d19feea1296d2ce7e367542265252d7a). 

data/bin/check-es-query-average.rb

@@ -183,6 +183,12 @@ class ESQueryAverage < Sensu::Plugin::Check::CLI
          short: '-u USER',
          long: '--user USER'
 
+  option :headers,
+         description: 'A comma separated list of headers to pass to elasticsearch http client',
+         short: '-H headers',
+         long: '--headers headers',
+         default: 'Content-Type: application/json'
+
   option :timeout,
          description: 'Elasticsearch query timeout in seconds',
          short: '-t TIMEOUT',

data/bin/check-es-query-count.rb

@@ -171,6 +171,12 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
          short: '-u USER',
          long: '--user USER'
 
+  option :headers,
+         description: 'A comma separated list of headers to pass to elasticsearch http client',
+         short: '-H headers',
+         long: '--headers headers',
+         default: 'Content-Type: application/json'
+
   option :timeout,
          description: 'Elasticsearch query timeout in seconds',
          short: '-t TIMEOUT',

data/bin/check-es-query-exists.rb

@@ -157,6 +157,12 @@ class ESQueryExists < Sensu::Plugin::Check::CLI
          short: '-u USER',
          long: '--user USER'
 
+  option :headers,
+         description: 'A comma separated list of headers to pass to elasticsearch http client',
+         short: '-H headers',
+         long: '--headers headers',
+         default: 'Content-Type: application/json'
+
   option :timeout,
          description: 'Elasticsearch query timeout in seconds',
          short: '-t TIMEOUT',

data/bin/check-es-query-ratio.rb

@@ -179,6 +179,12 @@ class ESQueryRatio < Sensu::Plugin::Check::CLI
          short: '-u USER',
          long: '--user USER'
 
+  option :headers,
+         description: 'A comma separated list of headers to pass to elasticsearch http client',
+         short: '-H headers',
+         long: '--headers headers',
+         default: 'Content-Type: application/json'
+
   option :timeout,
          description: 'Elasticsearch query timeout in seconds',
          short: '-t TIMEOUT',

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

@@ -43,6 +43,21 @@ module ElasticsearchCommon
       host[:scheme] = 'https' unless config[:scheme]
     end
 
-    @client ||= Elasticsearch::Client.new(transport_class: transport_class, hosts: [host], region: config[:region])
+    transport_options = {}
+
+    if config[:headers]
+
+      headers = {}
+
+      config[:headers].split(',').each do |header|
+        h, v = header.split(':', 2)
+        headers[h.strip] = v.strip
+      end
+
+      transport_options[:headers] = headers
+
+    end
+
+    @client ||= Elasticsearch::Client.new(transport_class: transport_class, hosts: [host], region: config[:region], transport_options: transport_options)
   end
 end

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

@@ -1,7 +1,7 @@
 module SensuPluginsElasticsearch
   module Version
     MAJOR = 1
-    MINOR = 10
+    MINOR = 11
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-es-transport
@@ -134,6 +134,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: kitchen-docker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +218,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.40.0
+- !ruby/object:Gem::Dependency
+  name: test-kitchen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -224,23 +252,23 @@ description: |-
                                 service health and metrics for cluster, node, and more.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- check-es-circuit-breakers.rb
+- metrics-es-node.rb
+- metrics-es-cluster.rb
 - check-es-cluster-health.rb
 - check-es-cluster-status.rb
-- check-es-file-descriptors.rb
 - check-es-heap.rb
 - check-es-indexes.rb
+- check-es-query-ratio.rb
 - check-es-indices-sizes.rb
-- check-es-node-status.rb
-- check-es-query-average.rb
+- metrics-es-node-graphite.rb
+- check-es-circuit-breakers.rb
 - check-es-query-count.rb
 - check-es-query-exists.rb
-- check-es-query-ratio.rb
 - check-es-shard-allocation-status.rb
+- check-es-node-status.rb
+- check-es-query-average.rb
 - handler-es-delete-indices.rb
-- metrics-es-cluster.rb
-- metrics-es-node-graphite.rb
-- metrics-es-node.rb
+- check-es-file-descriptors.rb
 extensions: []
 extra_rdoc_files: []
 files: