sensu-plugins-influxdb 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2c2865ca231332d9ea2177ff7bf8cc81440750d9
-  data.tar.gz: b630343c0021124c0d2d0d53273d84802f9bf16f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWZlZjM2ZDlkODg5ZjQwMmQ2ZTRiZTJjNWEwNDI1NGM3YmU2OGNiNA==
+  data.tar.gz: !binary |-
+    NDgwMDMzZDdkNzA0ZWQzNDY3YzMzMTgxZGNkYTczZWVkMWI0NDUzNA==
 SHA512:
-  metadata.gz: 045e6e8d6412bfb22a3f8cf46136b6b6715e07296e0b5261903c2d3cb3f5724417396b18b79b1a1930c3d8590c59e4c7e5fc303ccb9a358cb95fa27590096d86
-  data.tar.gz: d38e0e8610737c96cc647700e95530043a53c0c071d40cd276648eb5af9f0325c96eed3c86ef2587de829b54b308fdd2cf9053008f6e7dda50b4f43a135a18c9
+  metadata.gz: !binary |-
+    YWViZjUwMmU0MzYwMDQ1NzhkMGIyM2EzMmE5NTM2NDQzMmE5OTEyZjRjMmNi
+    OGE4MjdlMmUyMWI1Y2Q4NmVjOTc3MWIyMWJiZjJlZjljNDM2OTkyMGE1NTA0
+    NWQ0ODhhNWQ5YWJlMDNlNGZlZmYwMmM2ZDRmZjA4YTJjNTUxYzY=
+  data.tar.gz: !binary |-
+    YzBjOGNlMzEyYjBlNjhmZDgxYzUzM2E2N2U2MmUwZWM5ZjIyOTMyYTc5Yzgw
+    YzQ5ZjJhZGUxNTQ5YmNkMDhiNDJmYmZmZWNjNjU0MzNiY2VmNDkyNjIzMDU5
+    MTY0MmJlMTQ2NDU4Zjg4MTA3ZWZiMDUzNTRjNWUyMjdkZGM1YmI=

data/CHANGELOG.md

@@ -3,7 +3,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased
+## [Unreleased]
+
+### [0.0.7] - 2016-04-26
+- Line protocol mutator extension
+- added tags support for metrics-influxdb.rb
+- Fixed option tag in check-influxdb-query
+- added support for storing check status for metrics-influxdb.rb
+- metrics-influxdb.rb will now create the database if needed
+- metrics-influxdb.rb can now be configured to use a specific settings block
+
+### [0.0.6] - 2016-04-18
+- supress warning if only checking for an existing return value in check-influxdb-query.
 
 ### [0.0.5] - 2015-10-19
 - added support for https in check-influxdb.
@@ -22,15 +33,21 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Changed
 - updated sensu-plugin gem to 1.2.0
 
-## 0.0.1 - 2015-04-29
-
-### Added
-- initial release
-
 ## [0.0.2] - 2015-06-03
-
 ### Fixed
 - added binstubs
 
 ### Changed
 - removed cruft from /lib
+
+## 0.0.1 - 2015-04-29
+### Added
+- initial release
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.7...HEAD
+[0.0.7]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.6...0.0.7
+[0.0.6]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.5...0.0.6
+[0.0.5]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.4...0.0.5
+[0.0.4]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.3...0.0.4
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,7 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-influxdb/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-influxdb)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-influxdb/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-influxdb)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-influxdb.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-influxdb)
-[![Codeship Status for sensu-plugins/sensu-plugins-influxdb](https://codeship.com/projects/94979580-cd12-0132-f567-767651b3a193/status?branch=master)](https://codeship.com/projects/76219)
+
 ## Functionality
 
 ## Files
@@ -37,10 +37,14 @@
         "read_timeout"  : 300,
         "retry"         : null,
         "prefix"        : "",
-        "denormalize"   : true
+        "denormalize"   : true,
+        "status"        : true
     }
 }
 ```
+To ship additional tags to your metrics via metrics-influxdb.rb (only available in influxdb >= 0.9), just add a tags block inside your check.
+
+Setting "status" to true will store the metric using the status as the value and the check name as the series
 
 ## Installation
 

data/bin/check-influxdb-query.rb

@@ -70,7 +70,7 @@ class CheckInfluxdbQuery < Sensu::Plugin::Check::CLI
 
   option :ssl_ca_cert,
          description: 'Path to the ssl ca certificate to connect to the InfluxDB server',
-         short: '-c CA_CERT',
+         short: '-C CA_CERT',
          long: '--ssl_ca_cert CA_CERT'
 
   option :database,
@@ -157,14 +157,16 @@ class CheckInfluxdbQuery < Sensu::Plugin::Check::CLI
 
     value = influxdb.query config[:query]
 
-    if config[:alias]
-      query_name = config[:alias]
-    else
-      query_name = config[:query]
-    end
+    query_name = if config[:alias]
+                   config[:alias]
+                 else
+                   config[:query]
+                 end
 
     if config[:noresult] && value.empty?
       critical "No result for query '#{query_name}'"
+    elsif config[:noresult] && !config[:jsonpath] && !value.empty?
+      ok "Value returned for query '#{query_name}'"
     end
 
     if config[:jsonpath]

data/bin/metrics-influxdb.rb

@@ -33,37 +33,59 @@ require 'influxdb'
 # Sensu To Influxdb
 #
 class SensuToInfluxDB < Sensu::Handler
-  def filter; end
-
-  def handle
-    opts = settings['influxdb'].each_with_object({}) do |(k, v), sym|
-      sym[k.to_sym] = v
-    end
-
-    database = opts[:database]
+  option :config,
+         description: 'Configuration information to use',
+         short: '-c CONFIG',
+         long: '--config CONFIG',
+         default: 'influxdb'
 
-    influxdb_data = InfluxDB::Client.new database, opts
-
-    client_name = @event['client']['name']
-    metric_name = @event['check']['name']
+  def filter; end
 
-    metric_raw = @event['check']['output']
+  def create_point(series, value, time)
+    point = { series: series,
+              tags: { host: @event['client']['name'], metric: @event['check']['name'] },
+              values: { value: value },
+              timestamp: time
+            }
+    point[:tags].merge!(@event['check']['tags']) unless @event['check']['tags'].nil?
+    point
+  end
 
+  def parse_output
     data = []
+    metric_raw = @event['check']['output']
     metric_raw.split("\n").each do |metric|
       m = metric.split
       next unless m.count == 3
       key = m[0].split('.', 2)[1]
-      key.gsub!('.', '_')
+      key.tr!('.', '_')
       value = m[1].to_f
       time = m[2]
-      point = { series: key,
-                tags: { host: client_name, metric: metric_name },
-                values: { value: value },
-                timestamp: time
-              }
+      point = create_point(key, value, time)
       data.push(point)
     end
+    data
+  end
+
+  def check_status
+    data = []
+    data.push(create_point(@event['check']['name'], @event['check']['status'], @event['client']['timestamp']))
+  end
+
+  def handle
+    opts = settings[config[:config]].each_with_object({}) do |(k, v), sym|
+      sym[k.to_sym] = v
+    end
+    database = opts[:database]
+
+    influxdb_data = InfluxDB::Client.new database, opts
+    influxdb_data.create_database(database) # Ensure the database exists
+
+    data = if opts[:status] == false || opts[:status].nil?
+             parse_output
+           else
+             check_status
+           end
     influxdb_data.write_points(data)
   end
 end

data/bin/mutator-influxdb-line-protocol.rb

@@ -0,0 +1,55 @@
+#! /usr/bin/env ruby
+#
+#   mutator-influxdb-line-protocol
+#
+# DESCRIPTION:
+#   Mutates check results to conform to InfluxDB's line protocol format
+#
+# Place this file in /etc/sensu/extensions and modify your handlers JSON config
+#
+# handlers.json
+# {
+#   "influxdb_udp": {
+#      "type": "udp",
+#      "mutator": "mutator-influxdb-line-protocol",
+#      "socket": {
+#        "host": "mgt-monitor-db1",
+#        "port": 8090
+#      }
+#    }
+# }
+
+require 'sensu/extension'
+
+module Sensu
+  module Extension
+    class InfluxDBLineProtocol < Mutator
+      def name
+        'influxdb_line_protocol'
+      end
+
+      def description
+        "returns check output formatted for InfluxDB's line protocol"
+      end
+
+      def run(event)
+        host = event[:client][:name]
+        metric = event[:check][:name]
+        output = event[:check][:output]
+
+        data = []
+        output.split("\n").each do |result|
+          m = result.split
+          next unless m.count == 3
+          key = m[0].split('.', 2)[1]
+          key.tr!('.', '_')
+          value = m[1].to_f
+          time = m[2].ljust(19, '0')
+          data << "#{key},host=#{host},metric=#{metric} value=#{value} #{time}"
+        end
+
+        yield data.join("\n"), 0
+      end
+    end
+  end
+end

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

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

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-10-20 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dentaku
@@ -38,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: influxdb
   requirement: !ruby/object:Gem::Requirement
@@ -66,164 +44,163 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.37'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.37'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-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>"
+description: ! "This plugin provides native InfluxDB instrumentation\n                              for
+  monitoring and metrics collection, including:\n                              service
+  health via `/ping`, running queries, and service\n                              metrics."
+email: <sensu-users@googlegroups.com>
 executables:
-- metrics-influxdb.rb
-- check-influxdb.rb
 - check-influxdb-query.rb
+- check-influxdb.rb
+- metrics-influxdb.rb
+- mutator-influxdb-line-protocol.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -233,13 +210,14 @@ files:
 - bin/check-influxdb-query.rb
 - bin/check-influxdb.rb
 - bin/metrics-influxdb.rb
+- bin/mutator-influxdb-line-protocol.rb
 - lib/sensu-plugins-influxdb.rb
 - lib/sensu-plugins-influxdb/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-influxdb
 licenses:
 - MIT
 metadata:
-  maintainer: "@mattyjones"
+  maintainer: ! '@mattyjones'
   development_status: active
   production_status: unstable - testing recommended
   release_draft: 'false'
@@ -251,17 +229,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for influxdb