sensu-plugins-influxdb 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e60bed4cf08bb07fd187b26359669a089847f3
-  data.tar.gz: 6b708e051ae61b3827061a350c8757e5f9f88f31
+  metadata.gz: 9274a7f429a5773b2b87785eb228d28732f870ba
+  data.tar.gz: 181b6d9c4d45098cfe3a9d5d2ac479b69da97b09
 SHA512:
-  metadata.gz: 5416d5d859e726b30fe77df0037291d3b5fc730d4c6ab72bf783e129d1a1448d364894601e026f4da2f23c9332b9bc60b0cb5b89b9e6fc8d75c2e4668e915f34
-  data.tar.gz: d171b90c97e6ac57eb76c5fa13de93eae795146d9d94814d197fe61a9f0fbb88c807f65afab8dc50c8133e5460f99aaee13dfd996d5913f9377dadc9a8a05f78
+  metadata.gz: 9e2825358b70d0459f0a51362dce642f3869135fb720a353b7d7f83c65ff6cfb1b96928c45f3eee13576b596207e9a0c0b5d70da16a6714dbc91ab8480fad6bc
+  data.tar.gz: 615ebd06c4d6ee7365689df7f16e72777af450e2dd021ea9eae4227a7ce840c02478b54837bb173a541acafafad711b3d610f5c0b0a70396bedf53bd9b53488c

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.0] - 2016-12-01
+### Added
+- Added tags support for mutator-influxdb-line-protocol.rb 
+- Added retry support for check-influxdb-query.rb - The InfluxDB gem by default retries indefinitely and will cause the query to hang.  A retry of 12 will retry for approx 37 seconds.
+
+### Changed
+- Update to `influxdb` gem 0.3.13
+
 ## [1.0.0] - 2016-10-06
 ### Added
 - Ruby 2.3.0 support
@@ -58,7 +66,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.7...1.0.0
 [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

data/README.md

@@ -12,8 +12,9 @@
  * bin/check-influxdb.rb
  * bin/check-influxdb-query.rb
  * bin/metrics-influxdb.rb
+ * bin/mutator-influxdb-line-protocol.rb 
 
-## Usage
+## Usage - metrics-influxdb.rb
 Add the following to `/etc/sensu/conf.d/influx.conf` "plugin expects `influxdb` to be a top level node in the json
 **metrics-influxdb**
 ```
@@ -53,10 +54,53 @@ Then add the following to your `/ect/sensu/conf.d/handlers.conf`:
    }
 }
 ```
-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
 
+## Usage - mutator-influxdb-line-protocol.rb
+Add the mutator-influxdb-line-protocol.rb file into /etc/sensu/extensions/
+
+Then add the following to your `/ect/sensu/conf.d/handlers.conf`:
+```
+{
+  "handlers": {
+    "influxdb_udp": {
+      "type": "udp",
+      "socket": {
+        "host": "localhost",
+        "port": 8090
+      },
+      "mutator": "influxdb_line_protocol",
+    }
+  }
+}
+```
+
+## Check configuration
+To ship additional tags to your metrics via mutator-influxdb-line-protocol.rb (only available in influxdb >= 0.9), just add a tags block inside your check.
+
+```
+{
+  "checks": {
+    "cpu-metrics": {
+      "command": "/opt/sensu/embedded/bin/metrics-cpu-pcnt-usage.rb",
+      "handlers": [
+        "influxdb_udp"
+      ],
+      "interval": 60,
+      "subscribers": [
+        "base"
+      ],
+      "type": "metric",
+      "standalone": false,
+      "tags": {
+        "group": "operations",
+      }
+    }
+  }
+}
+```
+
 ## Installation
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)

data/bin/check-influxdb-query.rb

@@ -79,6 +79,13 @@ class CheckInfluxdbQuery < Sensu::Plugin::Check::CLI
          default: 'influxdb',
          description: 'InfluxDB database name'
 
+  option :retry,
+         short: '-r RETRY',
+         long: '--retry RETRY',
+         description: 'InfluxDB retry count with exponential back-off',
+         proc: proc(&:to_i),
+         default: 12
+
   option :username,
          short: '-u USERNAME',
          long: '--username USERNAME',
@@ -152,6 +159,7 @@ class CheckInfluxdbQuery < Sensu::Plugin::Check::CLI
                                     use_ssl: config[:use_ssl],
                                     verify_ssl: config[:verify_ssl],
                                     ssl_ca_cert: config[:ssl_ca_cert],
+                                    retry: config[:retry],
                                     username: config[:username],
                                     password: config[:password]
 

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

@@ -11,7 +11,7 @@
 # {
 #   "influxdb_udp": {
 #      "type": "udp",
-#      "mutator": "mutator-influxdb-line-protocol",
+#      "mutator": "influxdb_line_protocol",
 #      "socket": {
 #        "host": "mgt-monitor-db1",
 #        "port": 8090
@@ -33,6 +33,7 @@ module Sensu
       end
 
       def run(event)
+        tags = event[:check][:tags]
         host = event[:client][:name]
         metric = event[:check][:name]
         output = event[:check][:output]
@@ -45,7 +46,13 @@ module Sensu
           key.tr!('.', '_')
           value = m[1].to_f
           time = m[2].ljust(19, '0')
-          data << "#{key},host=#{host},metric=#{metric} value=#{value} #{time}"
+          linedata = "#{key},host=#{host},metric=#{metric}"
+          if tags
+            tags.each do |tagname, tagvalue|
+              linedata << ",#{tagname}=#{tagvalue}"
+            end
+          end
+          data << "#{linedata} value=#{value} #{time}"
         end
 
         yield data.join("\n"), 0

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-influxdb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dentaku
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.13
 - !ruby/object:Gem::Dependency
   name: jsonpath
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for influxdb