sensucronic 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e6fe2076af1cbc5abb22a7ba3c44f69681e48f6
-  data.tar.gz: 4ecb05e178254f4bca2db044de92bc4eff4c934e
+  metadata.gz: 9e01cc5d1c42a8bd017202854743c02ce9f898d8
+  data.tar.gz: 3391b35378ab5cb3af477a40ae9c71b10274e9fa
 SHA512:
-  metadata.gz: e226aa25c316211ba25f6e2956b8f481532849db6a5993dddbe1ca542d427c3fc0609b07bd7516c93fe8e1350e74588f97a07cf62293820fad82f83af1907442
-  data.tar.gz: b369c708948112ecbe4b6f7002cf2352b07dc44faab71e1895ddfe3d67a1ab13ca57acae9cba9905f11716f891e56182bf60784ff7830a7f0fe809cc9d7b1ca4
+  metadata.gz: 7a92ee79252c5e4dec6b1fe7587db98d4ed5cb7b0fe1fe896ae95789b5f571cd7af53933c220011b95905a68e6b84bf757fcf51d2d1b187330a3a200bb291e95
+  data.tar.gz: d56e75d329047d178d736861c29675a297d737dc385f8d5da9db113db53bafd2c58034b9b695e040dfc630f3b84210059e6013d495a4d4ad2bdf57f307b04732

data/README.md

@@ -8,8 +8,6 @@ sensu ecosystem
 
 ## Installation
 
-TODO: release gem so this works.
-
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -36,6 +34,19 @@ sensucronic [ OPTIONS ] [ -- ] 'COMMAND [ ARGS ]'
 sensucronic runs COMMAND with ARGS it generates a json report and submits
 it to the sensu-client input socket
 
+use --help to view options
+```
+prompt% sensucronic --help 
+s@otfess-3-1645% bundle exec exe/sensucronic --help 
+Usage: sensucronic (options)
+    -d, --dry-run                    output result to stdout only
+    -f, --field "key: value"         add a field to the json report
+    -h, --help                       print this message
+    -p, --port PORT                  the port number for the sensu client input socket
+    -s, --source SOURCE              set the source attribute on the sensu result
+
+```
+
 the OPTION --dryrun causes sensucronic to issue it's report to stdout
 instead of the sensu client input socket.
 
@@ -92,19 +103,27 @@ prompt% sensucronic --dry-run  'exit 3'
 
 ```
 
-use --help to view options
+the option --field allows you to add arbitrary attributes to the json
+report. you can repeat it as often as you need. note that you can't override the built in fields.
+
 ```
-prompt% sensucronic --help 
-Usage: sensucronic (options)
-    -d, --dry-run                    output result to stdout only
-    -h, --help                       print this message
-    -p, --port PORT                  the port number for the sensu client input socket
-    -s, --source SOURCE              set the source attribute on the sensu result
+prompt% sensucronic --field 'team: blah' --field foo:bar --field output:blah --dry-run 'echo hi; exit 20'
+{
+  "command": "echo\\ hi\\;\\ exit\\ 20",
+  "output": "hi\n",
+  "status": 3,
+  "exitcode": 20,
+  "agent": "sensucronic",
+  "team": "blah",
+  "foo": "bar"
+}
 ```
 
+
 ## TODO
-- accept options to add extra fields to the output
 - accept options to configure the status in response to the exitcodes.  (always warn,  always crit ) 
+- allow specifying alternate host, currently the sensu agent must be running on the local box. 
+- maybe submit via http to client http api on another host
 
 ## Development
 

data/lib/sensucronic.rb

@@ -15,6 +15,13 @@ class Sensucronic
     :default     => false,
     :description => 'output result to stdout only'
 
+  option :field,
+    :short       => '-f "key: value"',
+    :long        => '--field "key: value"',
+    :default     => [],
+    :proc        => proc { |f,cur| cur << f },
+    :description => 'add a field to the json report'
+
   option :port,
     :short       => '-p PORT',
     :long        => '--port PORT',
@@ -115,16 +122,23 @@ class Sensucronic
     end
   end
 
+  def fields
+    config[:field]
+      .map { |f| f.split(/:\s*/,2) }
+      .each_with_object({}) { |(k,v), h| h[k.to_sym] = v }
+  end
+
   def report
     {
       command:  Shellwords.shelljoin(cli_arguments),
       output:   output,
       status:   sensu_status,
       exitcode: exitcode,
-      agent:    self.class.to_s.downcase
+      agent:    self.class.to_s.downcase,
     }.tap do |r|
       r[:exitsignal] = status.termsig  if status.termsig
       r[:source]     = config[:source] if config[:source]
+      r.update(fields) { |k,o,n| o }
     end
   end
 

data/lib/sensucronic/version.rb

@@ -1,3 +1,3 @@
 class Sensucronic
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensucronic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - fess