sensu-extensions-influxdb2 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0f5ae119ad47adabd692247f89da5e49cb47de
-  data.tar.gz: 0ae41118ccc5cc0e25601dcb74100f962bf00e3b
+  metadata.gz: 2391a1c283a6fbca0bb750960d1ede012272b8c8
+  data.tar.gz: 44da7aef7f23edac1e6a7e2dd55f9a1df6f6288e
 SHA512:
-  metadata.gz: 467a5cdf430eeace8fa6fd22031a6298414bccc34e4060d5dca52f300b9a2132f2d6d95754d0a8623b0e52ec3acc953261772a6862b70123bb7b62cab8efc518
-  data.tar.gz: a9f5a6f2640344f25b1ad23e7a7a34e90405fa5c5241992fc50be12520988f584b613dbdd05e4c55a5d02515190b3ca5cf21797926c2a6cf48ee89867932fe31
+  metadata.gz: e1e4d7535c89ce23eaafc069d321266ef11b22c8fe58344ada125c0a7fa76fcfdc54f08b7aad6c0f8fe768c648ed6ef9fc835408aa442302bf8c681914918623
+  data.tar.gz: 151b76ad0eb22dff5dc8f95905edd07488262f6f511157faf92e03a1273a70669a919778c703a15956395d57cd750578a70ce0413a7ac7782a93f0bc4496e889

data/README.md

@@ -1,4 +1,4 @@
-__NOTE:__ running `sensu-install -e sensu-extensions-influxdb` will __NOT__ install this extension, as a project with the same name already exists on Rubygems.org. Before reporting any issues here, make sure you are using this version of the extension. (_hint:_ check the version number on the logs)
+__NOTE:__ running `sensu-install -e sensu-extensions-influxdb` will __NOT__ install this extension, as a project with the same name already exists on Rubygems.org. Before reporting any issues here, make sure you are using this version of the extension. (_hint:_ check the version number on the logs) In order to install this extension, run `sensu-install -e sensu-extensions-influxdb2`.
 
 # Requirements
 
@@ -59,10 +59,10 @@ To [load the extension](https://sensuapp.org/docs/latest/reference/extensions.ht
 {
   "extensions": {
     "influxdb": {
-      "gem": "sensu-extensions-influxdb",
+      "gem": "sensu-extensions-influxdb2"
     },
     "history": {
-      "gem": "sensu-extensions-history",
+      "gem": "sensu-extensions-history"
     }
   }
 }
@@ -78,8 +78,10 @@ _/etc/sensu/conf.d/handlers/metrics.json_ :
   "handlers": {
     "metrics": {
       "type": "set",
-      "handlers": [ "debug", "influxdb"]
-      }
+      "handlers": [
+        "debug",
+        "influxdb"
+      ]
     }
   }
 }
@@ -109,7 +111,7 @@ Check definitions can now specify a Sensu check extension to run,
       "stage": "prod"
     },
     "templates": [
-      {"^sensu\\.checks\\..*":"source.measurement.field*"},
+      {"^sensu\\.checks\\..*": "source.measurement.field*"},
       {".*\\.cgroup\\..*": "host.path.component"}
     ]
   }
@@ -132,7 +134,7 @@ For example, if you have a metric named:
 ```
 You can set a template like:
 ```json
-  "templates":{
+  "templates": {
     ".*\\.host_stats\\..*": "host.type"
   }
 ```
@@ -149,7 +151,7 @@ Example, considereing the following metrics:
 ```
 You could create a template like this:
 ```json
-  "templates":{
+  "templates": {
     ".*\\.host_stats\\..*": "host.measurement.field*"
   }
 ```
@@ -161,7 +163,7 @@ And you would get:
 ```
 Or, a template like this:
 ```json
-  "templates":{
+  "templates": {
     ".*\\.host_stats\\..*": "host.measurement.field.aggregation"
   }
 ```
@@ -199,6 +201,7 @@ Note that :
 * `buffer_max_size` : buffer size limit before flush - This is the amount of points in the InfluxDB batch - (default is `500`)
 * `buffer_max_age` : buffer maximum age - Flush will be forced after this amount of time - (default is `6` seconds)
 * `Proxy mode` : If the extension is configured to be in proxy mode, it will skip the transformation step and assume that the data is valid [line protocol](https://docs.influxdata.com/influxdb/latest/write_protocols/line_protocol_reference). It will not take into account any tags defined in the sensu-configuration.
+* `enhanced_history`: by default this extension writes checks history as separated measurements on InfluxDB. Setting this attribute to true will write all check history in the same metric (sensu.checks), tagging check name and subscriptions, allowing the user to write InfluxDB queries filtering by check name and subscriptions.
 
 ## Check options
 

data/lib/sensu/extensions/history.rb

@@ -43,7 +43,12 @@ module Sensu
         metric = event_data[:check][:name]
         timestamp = event_data[:check][:executed]
         value = event_data[:check][:status]
-        output = "#{@influx_conf['scheme']}.checks.#{metric},type=history,host=#{host} value=#{value} #{timestamp}"
+        subscribers = event_data[:check][:subscribers].join('_')
+        output = if @influx_conf['enhanced_history']
+                   "#{@influx_conf['scheme']}.checks,check_name=#{metric},type=history,host=#{host},subscribers=#{subscribers} value=#{value} #{timestamp}"
+                 else
+                   "#{@influx_conf['scheme']}.checks.#{metric},type=history,host=#{host} value=#{value} #{timestamp}"
+                 end
 
         @relay.push(@influx_conf['database'], @influx_conf['time_precision'], output)
         yield output, 0
@@ -72,6 +77,7 @@ module Sensu
         settings['port'] ||= 8086
         settings['scheme'] ||= 'sensu'
         settings['base_url'] = "#{settings['protocol']}://#{settings['host']}:#{settings['port']}"
+        settings['enhanced_history'] ||= false
         return settings
       rescue => e
         logger.error("Failed to parse History settings #{e}")

data/lib/sensu/extensions/influxdb2/version.rb

@@ -2,8 +2,8 @@
 module SensuExtensionsInfluxDB2
   module Version
     MAJOR = 0
-    MINOR = 0
-    PATCH = 2
+    MINOR = 1
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-extensions-influxdb2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Critical Media
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-18 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-extension