sensu-cli 0.6.3 → 0.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzZlY2RkYTliOTM4ZjIxZjRlNWNkNDViOTZkNTdjNzQzZTVhNDY4OQ==
-  data.tar.gz: !binary |-
-    MzFlZGM2ZGUxZDRhZmQ4NmY2ZGZlNWNjZTc1ZTdlYzJkNTNmMjg1Zg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjU1MTQ1NTBkYjg5NDlmZjM4ZWQyMGJkOGEwMjEzNGMzNWUwNTU3ZTM0Y2Q5
-    MGM3YjVkMzQzYTFjYjI1OWQ0OTdiMGI0MjJmNzhmMjVhNTE2MGQwOWMxYmZj
-    MmUwZGFlYTUwM2FmYzMwN2UxNTk1YWUzOTY2MGYyNDQ2MTZkMDg=
-  data.tar.gz: !binary |-
-    YTg5MTA4NGVkNGVhMjM1MTc5NWE5OTc4YjQ0MjQ5MjBkMzMxM2Y3OTgxMTQx
-    M2IyYmVmZDFhNjJkZTM0YmY5ZDY0ODc2NmZmYmI4NWJkYjc3ZDlmYWIxZWFk
-    MDZmMWYwMzJmODczNjM0N2Q4NDViNTEzODZiNmJjYjRlMmVlZGI=
+SHA1:
+  metadata.gz: 854aa85dfba14210e13adefaba1ff9baa21279af
+  data.tar.gz: e5afa7923f4ba3dc88ad92130478bedae923c0ca
+SHA512:
+  metadata.gz: 1025529356b48ff380ce2729e7b36ce95cc4fdf3f00e34b34843df6eaf173b2caf2f0aae9aec26434491d90abf571a3cfa1667197eb5112963e4aeeec1f1225b
+  data.tar.gz: cba672217a1d45e04507c86499acc6a478721bd1cd3d9455f5b629c57ba1f5dffe43c9aa5146f30736d278b6ccbad96c3c48dccaeb9ac8d4d48e58a89416d34f

data/README.md

@@ -36,22 +36,24 @@ Usage and Configuration
 host  "127.0.0.1"
 port  "4567"
 ssl   false
+api_endpoint "/api"
 read_timeout 20
 open_timeout 20
 ````
 This format was chosen so you can do some ENV magic via your profile and setting up an alias. For details see the [wiki](https://github.com/agent462/sensu-cli/wiki)
 
-* All Configuration Settings   
-`host` String - Required   
-`port` String/Integer - Required   
-`ssl`  Boolean - Optional - Defaults False   
-`read_timeout` Integer - Optional - Default 15 (seconds)   
-`open_timeout` Integer - Optional - Default 5 (seconds)   
+* All Configuration Settings    
+`host` String - Required - Host of the Sensu API    
+`port` String/Integer - Required - Port of the Sensu API    
+`ssl`  Boolean - Optional - Defaults False    
+`api_endpoint` String - Optional - Default ''    
+`read_timeout` Integer - Optional - Default 15 (seconds)    
+`open_timeout` Integer - Optional - Default 5 (seconds)    
 `pretty_colors` Boolean - Optional - Default True    
 `proxy_address` String - Optional    
 `proxy_port` Integer - Optional    
-`user` String - Optional   
-`password` String - Optional   
+`user` String - Optional - User for the Sensu API    
+`password` String - Optional - Password for the Sensu API    
 
 Examples
 -----------
@@ -97,10 +99,40 @@ sensu-cli stash create PATH
 ** Resolve Commands **
 sensu-cli resolve NODE CHECK
 
+** Socket Commands **
+sensu-cli socket create (OPTIONS)
+sensu-cli socket raw INPUT
+
   --version, -v:   Print version and exit
      --help, -h:   Show this message
 ````
 
+Filters
+-------
+
+Filters are strings in 'key,value' format.
+
+````
+Examples:
+
+# show all events with name matching 'foo'
+sensu-cli event list -i name,foo
+
+# show all events whose output matches 'foo'
+sensu-cli event list -i output,foo
+````
+
+Socket
+-------
+This command can only be used on a host that is running sensu-client.  sensu-client exposes a socket for arbritary check results.  For more information you can see the [sensu client documentation](https://sensuapp.org/docs/0.18/clients#client-socket-input).
+````
+# send a check result to the sensu server
+sensu-cli socket create -name "host33" --output "Something broke really bad" --status 1
+
+# send raw json check result to the sensu server
+sensu-cli socket raw '{"name": "host34", "output": "Something broke even worse than on host33", "status": 1}'
+````
+
 Contributions
 -------------
 Please provide a pull request.  I'm an ops guy, not a developer, so if you're submitting code cleanup, all I ask is that you explain the improvement so I can learn.

data/lib/sensu-cli.rb

@@ -7,6 +7,7 @@ require 'sensu-cli/api.rb'
 require 'sensu-cli/base.rb'
 require 'sensu-cli/version.rb'
 require 'sensu-cli/filter.rb'
+require 'sensu-cli/client/socket.rb'
 
 module SensuCli
   def self.die(code = 0, msg = nil)

data/lib/sensu-cli/base.rb

@@ -1,10 +1,22 @@
 module SensuCli
   class Base
+    attr_accessor :cli
     def setup
-      @cli = Cli.new.global
+      self.cli = Cli.new.global
       settings
-      api_path(@cli)
-      make_call
+      if cli[:command] == 'socket'
+        socket
+      else
+        api_path(cli)
+        make_call
+      end
+    end
+
+    def socket
+      socket = SensuCli::Client::Socket.new
+      socket.format_message(cli[:fields]) if cli[:method] == 'create'
+      socket.message = cli[:raw] if cli[:method] == 'raw'
+      socket.send_udp_message
     end
 
     def settings
@@ -46,21 +58,21 @@ module SensuCli
       api = Api.new
       res = api.request(opts)
       msg = api.response(res.code, res.body, @api[:command])
-      msg = Filter.new(@cli[:fields][:filter]).process(msg) if @cli[:fields][:filter]
+      msg = Filter.new(cli[:fields][:filter]).process(msg) if cli[:fields][:filter]
       endpoint = @api[:command]
       if res.code != '200'
         SensuCli::die(0)
-      elsif @cli[:fields][:format] == 'single'
+      elsif cli[:fields][:format] == 'single'
         Pretty.single(msg, endpoint)
-      elsif @cli[:fields][:format] == 'table'
-        fields = nil || @cli[:fields][:fields]
+      elsif cli[:fields][:format] == 'table'
+        fields = nil || cli[:fields][:fields]
         Pretty.table(msg, endpoint, fields)
-      elsif @cli[:fields][:format] == 'json'
+      elsif cli[:fields][:format] == 'json'
         Pretty.json(msg)
       else
         Pretty.print(msg, endpoint)
       end
-      Pretty.count(msg) unless @cli[:fields][:format] == 'table' or @cli[:fields][:format] == 'json'
+      Pretty.count(msg) unless cli[:fields][:format] == 'table' or cli[:fields][:format] == 'json'
     end
   end
 end

data/lib/sensu-cli/cli.rb

@@ -4,7 +4,7 @@ require 'rainbow/ext/string'
 
 module SensuCli
   class Cli # rubocop:disable ClassLength
-    SUB_COMMANDS    = %w(info client check event stash aggregate silence resolve health)
+    SUB_COMMANDS    = %w(info client check event stash aggregate silence resolve health socket)
     CLIENT_COMMANDS = %w(list show delete history)
     CHECK_COMMANDS  = %w(list show request)
     EVENT_COMMANDS  = %w(list show delete)
@@ -14,6 +14,7 @@ module SensuCli
     RES_COMMANDS    = ''
     INFO_COMMANDS   = ''
     HEALTH_COMMANDS = ''
+    SOCKET_COMMANDS = %w(create raw)
 
     CLIENT_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Client Commands **
@@ -63,7 +64,11 @@ module SensuCli
           ** Resolve Commands **
           sensu-cli resolve NODE CHECK\n\r
         EOS
-
+    SOCKET_BANNER = <<-EOS.gsub(/^ {10}/, '')
+          ** Socket Commands **
+          sensu-cli socket create (OPTIONS)
+          sensu-cli socket raw INPUT\n\r
+        EOS
     def global
       global_opts = Trollop::Parser.new do
         version "sensu-cli version: #{SensuCli::VERSION}"
@@ -90,6 +95,7 @@ module SensuCli
         banner SIL_BANNER
         banner STASH_BANNER
         banner RES_BANNER
+        banner SOCKET_BANNER
         stop_on SUB_COMMANDS
       end
 
@@ -309,5 +315,26 @@ module SensuCli
       ARGV.empty? ? explode(opts) : check = next_argv
       deep_merge({ :command => 'resolve', :method => 'Post', :fields => { :client => command, :check => check } }, { :fields => p })
     end
+
+    def socket
+      opts = parser('SOCKET')
+      command = next_argv
+      explode_if_empty(opts, command)
+      case command
+      when 'create'
+        p = Trollop::options do
+          opt :name, 'The check name to report as', :short => 'n', :type => :string, :required => true
+          opt :output, 'The check result output', :short => 'o', :type => :string, :required => true
+          opt :status, 'The check result exit status to indicate severity.', :short => 's', :type => :integer
+          # opt :handlers, 'The check result handlers.', :type => :string
+        end
+        { :command => 'socket', :method => 'create', :fields => p }
+      when 'raw'
+        p = Trollop::options
+        { :command => 'socket', :method => 'raw', :raw => next_argv }
+      else
+        explode(opts)
+      end
+    end
   end
 end

data/lib/sensu-cli/client/socket.rb

@@ -0,0 +1,20 @@
+require 'socket'
+require 'json'
+
+module SensuCli
+  module Client
+    class Socket
+      attr_accessor :message
+
+      def send_udp_message
+        udp = UDPSocket.new
+        udp.send(message, 0, '127.0.0.1', 3030)
+        puts 'UDP Socket Message Sent'
+      end
+
+      def format_message(data)
+        self.message = { 'name' => data[:name], 'output' => data[:output], 'status' => data[:status] }.to_json
+      end
+    end
+  end
+end

data/lib/sensu-cli/path.rb

@@ -90,7 +90,7 @@ module SensuCli
     end
 
     def respond(path, payload = false)
-      { :path => path, :payload => payload }
+      { :path => "#{Config.api_endpoint}#{path}", :payload => payload }
     end
   end
 end

data/lib/sensu-cli/settings.rb

@@ -11,7 +11,7 @@ module SensuCli
     def create(directory, file)
       FileUtils.mkdir_p(directory) unless File.directory?(directory)
       FileUtils.cp(File.join(File.dirname(__FILE__), '../../settings.example.rb'), file)
-      SensuCli::die(0, "We created the configuration file for you at #{file}.  You can also place this in /etc/sensu/sensu-cli. Edit the settings as needed.".color(:red))
+      SensuCli::die(0, "We created the configuration file for you at #{file}.  You can also place this in /etc/sensu/sensu-cli/settings.rb. Edit the settings as needed.".color(:red))
     end
   end
 

data/lib/sensu-cli/version.rb

@@ -1,3 +1,3 @@
 module SensuCli
-  VERSION = '0.6.3'
+  VERSION = '0.7.0'
 end

data/sensu-cli.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.licenses    = %w(MIT APACHE)
   s.homepage    = 'http://github.com/agent462/sensu-cli'
 
-  s.add_dependency('rainbow', '2.0.0')
+  s.add_dependency('rainbow', '1.99.2')
   s.add_dependency('trollop', '2.0')
-  s.add_dependency('mixlib-config', '2.1.0')
+  s.add_dependency('mixlib-config', '>=2.1.0')
   s.add_dependency('hirb', '0.7.1')
   s.add_dependency('erubis', '2.7.0')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.99.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.99.2
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +42,14 @@ dependencies:
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A command line utility for interacting with the Sensu api.
@@ -116,11 +116,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/sensu
 - bin/sensu-cli
+- lib/sensu-cli.rb
 - lib/sensu-cli/api.rb
 - lib/sensu-cli/base.rb
 - lib/sensu-cli/cli.rb
+- lib/sensu-cli/client/socket.rb
 - lib/sensu-cli/editor.rb
 - lib/sensu-cli/filter.rb
 - lib/sensu-cli/path.rb
@@ -128,9 +131,7 @@ files:
 - lib/sensu-cli/settings.rb
 - lib/sensu-cli/templates/event.erb
 - lib/sensu-cli/version.rb
-- lib/sensu-cli.rb
 - sensu-cli.gemspec
-- README.md
 - settings.example.rb
 homepage: http://github.com/agent462/sensu-cli
 licenses:
@@ -143,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A command line utility for Sensu.