sensu-plugins-influxdb 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec209e3360b44cc83697818a5c19d93ed8466fa5
-  data.tar.gz: aa0a0f10accf7e58c5aeda689b43494e0abe40d6
+  metadata.gz: 2c2865ca231332d9ea2177ff7bf8cc81440750d9
+  data.tar.gz: b630343c0021124c0d2d0d53273d84802f9bf16f
 SHA512:
-  metadata.gz: b227625ca89bb05eb8e7ebd8a0260f38b67e6df94d49a55587edc6bdf4b8c588d36d1d66c21135d94d5c3e420dcad85bd5b8131eb8ea4417cf627efed326f13c
-  data.tar.gz: e9d54190bd57e31deb5fbaa998be0978e55f55ed16cced478ba5e2a0c22feba9ebacff427efe615c35f35115e5ca877f44a2d1e2afc1a2e7576432243f99ee69
+  metadata.gz: 045e6e8d6412bfb22a3f8cf46136b6b6715e07296e0b5261903c2d3cb3f5724417396b18b79b1a1930c3d8590c59e4c7e5fc303ccb9a358cb95fa27590096d86
+  data.tar.gz: d38e0e8610737c96cc647700e95530043a53c0c071d40cd276648eb5af9f0325c96eed3c86ef2587de829b54b308fdd2cf9053008f6e7dda50b4f43a135a18c9

data/CHANGELOG.md

@@ -4,9 +4,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## Unreleased
-- nothing
 
-### [0.0.3] - 2015-08-10
+### [0.0.5] - 2015-10-19
+- added support for https in check-influxdb.
+- pass ssl arguments to the influxdb object in check-influxdb-query.
+- renamed the config option in check-influxdb from ssl to verify_ssl.
+- changed README to update the config option ssl_ca_cert.
+
+### [0.0.4] - 2015-08-10
 - updated metrics-influxdb.rb to symbolize keys for InfluxDB::Client
 - updated influxdb gem to 0.2.2
 - updated metrics-influxdb.rb to support influxdb 0.9.x

data/README.md

@@ -18,27 +18,27 @@
 **metrics-influxdb**
 ```
 {
-    "influxdb"   : {
-               "hosts"          : ["influxdb.familyguy.com", ],
-               "host"           : "influxdb.familyguy.com",
-               "port"           : "8086",
-               "username"       : "root",
-               "password"       : "root",
-               "database"       : "stats"
-               # OPTIONAL
-               "time_precision" : "s",
-               "use_ssl         : false,
-               "verify_ssl      : true,
-               "ssl_ca_cert     : false,
-               "auth_method     : "params",
-               "initial_delay   : 0.01,
-               "max_delay       : 30,
-               "open_timeout    : 5,
-               "read_timeout    : 300,
-               "retry           : nil,
-               "prefix          : '',
-               "denormalize     : true
-     }
+    "influxdb": {
+        "hosts"         : ["influxdb.familyguy.com"],
+        "host"          : "influxdb.familyguy.com",
+        "port"          : "8086",
+        "username"      : "root",
+        "password"      : "root",
+        "database"      : "stats",
+        # OPTIONAL
+        "time_precision": "s",
+        "use_ssl"       : false,
+        "verify_ssl"    : true,
+        "ssl_ca_cert"   : "path to the ca certificate file",
+        "auth_method"   : "params",
+        "initial_delay" : 0.01,
+        "max_delay"     : 30,
+        "open_timeout"  : 5,
+        "read_timeout"  : 300,
+        "retry"         : null,
+        "prefix"        : "",
+        "denormalize"   : true
+    }
 }
 ```
 

data/bin/check-influxdb-query.rb

@@ -54,6 +54,25 @@ class CheckInfluxdbQuery < Sensu::Plugin::Check::CLI
          default: '8086',
          description: 'InfluxDB port'
 
+  option :use_ssl,
+         description: 'Turn on/off SSL (default: false)',
+         short: '-s',
+         long: '--use_ssl',
+         boolean: true,
+         default: false
+
+  option :verify_ssl,
+         description: 'Turn on/off using SSL certificate (default: false)',
+         short: '-v',
+         long: '--verify_ssl',
+         boolean: true,
+         default: false
+
+  option :ssl_ca_cert,
+         description: 'Path to the ssl ca certificate to connect to the InfluxDB server',
+         short: '-c CA_CERT',
+         long: '--ssl_ca_cert CA_CERT'
+
   option :database,
          short: '-d DATABASE',
          long: '--database DATABASE',
@@ -130,6 +149,9 @@ class CheckInfluxdbQuery < Sensu::Plugin::Check::CLI
     influxdb = InfluxDB::Client.new config[:database],
                                     host: config[:host],
                                     port: config[:port],
+                                    use_ssl: config[:use_ssl],
+                                    verify_ssl: config[:verify_ssl],
+                                    ssl_ca_cert: config[:ssl_ca_cert],
                                     username: config[:username],
                                     password: config[:password]
 

data/bin/check-influxdb.rb

@@ -13,8 +13,6 @@
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
-#   gem: uri
-#   gem: json
 #
 # USAGE:
 #   #YELLOW
@@ -28,9 +26,7 @@
 #
 
 require 'sensu-plugin/check/cli'
-require 'net/http'
-require 'uri'
-require 'json'
+require 'net/https'
 
 #
 # Check InfluxDB
@@ -49,13 +45,25 @@ class CheckInfluxDB < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          default: 8086
 
-  option :ssl,
+  option :use_ssl,
          description: 'Turn on/off SSL (default: false)',
          short: '-s',
-         long: '--ssl',
+         long: '--use_ssl',
          boolean: true,
          default: false
 
+  option :verify_ssl,
+         description: 'Turn on/off using SSL certificate (default: false)',
+         short: '-v',
+         long: '--verify_ssl',
+         boolean: true,
+         default: false
+
+  option :ssl_ca_cert,
+         description: 'Path to the ssl ca certificate to connect to the InfluxDB server',
+         short: '-c CA_CERT',
+         long: '--ssl_ca_cert CA_CERT'
+
   option :timeout,
          description: 'Seconds to wait for the connection to open or read (default: 1.0s)',
          short: '-t SECONDS',
@@ -67,7 +75,13 @@ class CheckInfluxDB < Sensu::Plugin::Check::CLI
     http = Net::HTTP.new(config[:host], config[:port])
     http.open_timeout = config[:timeout]
     http.read_timeout = config[:timeout]
-    http.use_ssl = config[:ssl]
+    http.use_ssl = config[:use_ssl]
+    if config[:verify_ssl]
+      http.ca_file = config[:ssl_ca_cert]
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    else
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
     http.start do
       response = http.get('/ping')
       status_line = "#{response.code} #{response.message}"

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

@@ -2,7 +2,7 @@ module SensuPluginsInfluxdb
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 4
+    PATCH = 5
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dentaku
@@ -214,7 +214,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Sensu plugins for influxDB
+description: |-
+  This plugin provides native InfluxDB instrumentation
+                                for monitoring and metrics collection, including:
+                                service health via `/ping`, running queries, and service
+                                metrics
 email: "<sensu-users@googlegroups.com>"
 executables:
 - metrics-influxdb.rb