sensu-cli 0.0.10 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjkwOGFmNTA0OWM4MzZhNThkNjE1NDkwYTZjMGNmNzY2YmYyOWQ3NA==
+    ZWUwZDFkN2IxNjBjNzJkMmRhMDM0NTYxMjcyMGExODg0M2U0Zjc3Mg==
   data.tar.gz: !binary |-
-    MjRkNzBkMTQ0ZWRhNGVkNTRlN2Y5YWVhNjVlODViZmJmNzllMGFmNQ==
+    ZGMyNDBjMjkwYmJlYzVhZmE5OWM2NmRjN2JmMThmM2YxZTZkMWI1Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWE3ZGZiODZhNzdhNTdhZmM3NjU4Zjk1YzRkNGQzNDZmNjQwMjcxNzE2OWZk
-    ZWE2ZWQzZmNkYTY0OTA5MjU5ODhlMTI4ZThmNDNkYmY2N2JiZWYyZGI1ZDk0
-    MWNhMzMyNTg3NGMzMzBjNWFjMjVkMGExYTMyZjMzOTg4NDc2NWI=
+    YmE4OThmNTNlNTU4Yjk0ODRmMDQ0NWI2M2IxMTYxYzBlZDM5MjVhYWYyYjVi
+    Y2ZlNTk5YmFjOTQxNTc4MWQzYzYwOWE0NjQ3YjM2Y2ZjZTI3YzUyNTIwZGJm
+    NjQ0OGUzMjNmOWI1MjA3NWI2MzNlMmRkZWQ1MmM0ZTkzZGFkNzQ=
   data.tar.gz: !binary |-
-    NTQ3ZjMzMWEyZDliNDk0NGU2NzhiZWU0YjI4NjEzZGEyN2M1MTJjYTg3YTU1
-    ZDk1ODQ4M2ExZWE3ODg1ZjcwOGMwZTE3ZGJkMTVkOWIxMDJiNmQ5YmI3ODZj
-    Y2Y0YTUzMzBlOTZhMmI0ZTdkMGYzMmQyMTBhNzdkOTM2NjliN2Y=
+    MzAwZDI5NjFhNjczMDVhYzQyY2U5NDQ4ZWNjOTFkMjE4ZDNkOTBkZjk2ZGM4
+    ZWFjNTlmZmY2Nzk5YmNhOGYyYzNlM2Y2YTA1ZmVlYzA1ZDQ0ZjNhMjU3ZmI5
+    ZDZlZGJlM2RlMjRlZTcwZWQ4MjI5MWQ5ZTBlNWQ5MjlmNzg3NzY=

data/README.md

@@ -10,7 +10,7 @@ sensu-cli
 #    ------------------
 #            /\
 #           '--'
-#          SENSU
+#         SENSU-CLI
 #
 ```
 A sensu-cli for interacting with the sensu api.
@@ -51,7 +51,7 @@ password "some_secret_password"
 
 Expire Silenced Hosts/Checks
 ----------------------------
-I added an expires option to `sensu silence` to be used like `sensu silence HOST -e 30` where `-e` denotes the number of minutes from now a host/checks silence should expire.  This won't work by itself.  We add a key to the silence stash with a time in the future.  If you run [check-stashes](https://github.com/agent462/sensu-check-stashes) on your sensu-server it will check for expired stashes and delete them.   
+I added an expires option to `sensu-cli silence` to be used like `sensu-cli silence HOST -e 30` where `-e` denotes the number of minutes from now a host/checks silence should expire.  This won't work by itself.  We add a key to the silence stash with a time in the future.  If you run [check-stashes](https://github.com/agent462/sensu-check-stashes) on your sensu-server it will check for expired stashes and delete them.   
 
 There is also a reason option `-r` available.  Be nice and use it so your colleagues know what you're doing.   
 
@@ -61,42 +61,43 @@ Examples
 Available subcommands: (for details, sensu SUB-COMMAND --help)
 
 ** Aggregate Commands **
-sensu aggregate list (OPTIONS)
-sensu aggregate show CHECK (OPTIONS)
-sensu aggregate delete CHECK
+sensu-cli aggregate list (OPTIONS)
+sensu-cli aggregate show CHECK (OPTIONS)
+sensu-cli aggregate delete CHECK
 
 ** Check Commands **
-sensu check list
-sensu check show CHECK
-sensu check request CHECK SUB1,SUB2
+sensu-cli check list
+sensu-cli check show CHECK
+sensu-cli check request CHECK SUB1,SUB2
 
 ** Client Commands **
-sensu client list (OPTIONS)
-sensu client show NODE
-sensu client delete NODE
-sensu client history NODE
+sensu-cli client list (OPTIONS)
+sensu-cli client show NODE
+sensu-cli client delete NODE
+sensu-cli client history NODE
 
 ** Event Commands **
-sensu event list
-sensu event show NODE (OPTIONS)
-sensu event delete NODE CHECK
+sensu-cli event list
+sensu-cli event show NODE (OPTIONS)
+sensu-cli event delete NODE CHECK
 
 ** Health Commands **
-sensu health (OPTIONS)
+sensu-cli health (OPTIONS)
 
 ** Info Commands **
-sensu info
+sensu-cli info
 
 ** Silence Commands **
-sensu silence NODE (OPTIONS)
+sensu-cli silence NODE (OPTIONS)
 
 ** Stash Commands **
-sensu stash list (OPTIONS)
-sensu stash show STASHPATH
-sensu stash delete STASHPATH
+sensu-cli stash list (OPTIONS)
+sensu-cli stash show STASHPATH
+sensu-cli stash delete STASHPATH
+sensu-cli stash create PATH
 
 ** Resolve Commands **
-sensu resolve NODE CHECK
+sensu-cli resolve NODE CHECK
 
   --version, -v:   Print version and exit
      --help, -h:   Show this message

data/bin/sensu-cli

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+  $: << File.dirname(__FILE__) + '/../lib'
+end
+
+require 'sensu-cli/sensu'
+sensu = SensuCli::Core.new
+sensu.setup

data/lib/sensu-cli/cli.rb

@@ -7,7 +7,7 @@ module SensuCli
     CLIENT_COMMANDS = %w(list show delete history)
     CHECK_COMMANDS  = %w(list show request)
     EVENT_COMMANDS  = %w(list show delete)
-    STASH_COMMANDS  = %w(list show delete)
+    STASH_COMMANDS  = %w(list show delete create)
     AGG_COMMANDS    = %w(list show delete)
     SIL_COMMANDS    = ""
     RES_COMMANDS    = ""
@@ -16,52 +16,52 @@ module SensuCli
 
     CLIENT_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Client Commands **
-          sensu client list (OPTIONS)
-          sensu client show NODE
-          sensu client delete NODE
-          sensu client history NODE\n\r
+          sensu-cli client list (OPTIONS)
+          sensu-cli client show NODE
+          sensu-cli client delete NODE
+          sensu-cli client history NODE\n\r
         EOS
     INFO_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Info Commands **
-          sensu info\n\r
+          sensu-cli info\n\r
         EOS
     HEALTH_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Health Commands **
-          sensu health (OPTIONS)\n\r
+          sensu-cli health (OPTIONS)\n\r
         EOS
     CHECK_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Check Commands **
-          sensu check list
-          sensu check show CHECK
-          sensu check request CHECK SUB1,SUB2\n\r
+          sensu-cli check list
+          sensu-cli check show CHECK
+          sensu-cli check request CHECK SUB1,SUB2\n\r
         EOS
     EVENT_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Event Commands **
-          sensu event list
-          sensu event show NODE (OPTIONS)
-          sensu event delete NODE CHECK\n\r
+          sensu-cli event list
+          sensu-cli event show NODE (OPTIONS)
+          sensu-cli event delete NODE CHECK\n\r
         EOS
     STASH_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Stash Commands **
-          sensu stash list (OPTIONS)
-          sensu stash show STASHPATH
-          sensu stash delete STASHPATH\n\r
+          sensu-cli stash list (OPTIONS)
+          sensu-cli stash show STASHPATH
+          sensu-cli stash delete STASHPATH
+          sensu-cli stash create PATH\n\r
         EOS
-        #sensu stash create
         #apost '/stashes'
     AGG_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Aggregate Commands **
-          sensu aggregate list (OPTIONS)
-          sensu aggregate show CHECK (OPTIONS)
-          sensu aggregate delete CHECK\n\r
+          sensu-cli aggregate list (OPTIONS)
+          sensu-cli aggregate show CHECK (OPTIONS)
+          sensu-cli aggregate delete CHECK\n\r
         EOS
     SIL_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Silence Commands **
-          sensu silence NODE (OPTIONS)\n\r
+          sensu-cli silence NODE (OPTIONS)\n\r
         EOS
     RES_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Resolve Commands **
-          sensu resolve NODE CHECK\n\r
+          sensu-cli resolve NODE CHECK\n\r
         EOS
 
     def global
@@ -77,10 +77,10 @@ module SensuCli
           #    ------------------
           #            /\
           #           '--'
-          #          SENSU
+          #         SENSU-CLI
           #
         EOS
-        banner "\n\rAvailable subcommands: (for details, sensu SUB-COMMAND --help)\n\r"
+        banner "\n\rAvailable subcommands: (for details, sensu-cli SUB-COMMAND --help)\n\r"
         banner AGG_BANNER
         banner CHECK_BANNER
         banner CLIENT_BANNER
@@ -235,6 +235,10 @@ module SensuCli
         p = Trollop::options
         item = next_argv
         deep_merge({:command => 'stashes', :method => 'Delete', :fields => {:path => item}},{:fields => p})
+      when 'create'
+        p = Trollop::options
+        item = next_argv
+        deep_merge({:command => 'stashes', :method => 'Post', :fields => {:create => true, :create_path => item}},{:fields => p})
       else
         explode(opts)
       end

data/lib/sensu-cli/editor.rb

@@ -0,0 +1,33 @@
+require 'json'
+require 'tempfile'
+
+module SensuCli
+  class Editor
+
+    def create_stash(create_path)
+      @create_path = create_path
+      file = create_file
+      open(file)
+    end
+
+    def open(file)
+      ENV['EDITOR'] ? editor = ENV['EDITOR'] : editor = 'vi'
+      system("#{editor} #{file}")
+      begin
+        JSON.parse(File.read(file))
+      rescue JSON::ParserError
+        puts "The stash you created has Invalid JSON."
+        exit
+      end
+    end
+
+    def create_file
+      template = {:path => @create_path, :content => {:timestamp => Time.now.to_i }}
+      file = Tempfile.new('sensu')
+      file.write(JSON.pretty_generate(template))
+      file.close
+      file.path
+    end
+
+  end
+end

data/lib/sensu-cli/sensu.rb

@@ -3,6 +3,7 @@ require 'net/https'
 require 'json'
 require 'sensu-cli/settings'
 require 'sensu-cli/cli'
+require 'sensu-cli/editor'
 require 'rainbow'
 
 module SensuCli
@@ -12,6 +13,7 @@ module SensuCli
       clis = Cli.new
       cli = clis.global
       settings
+      @command = cli[:command]
       api_path(cli)
       make_call
     end
@@ -31,44 +33,77 @@ module SensuCli
     end
 
     def api_path(cli)
-      @command = cli[:command]
-      case @command
-      when 'clients'
-        path = "/clients" << (cli[:fields][:name] ? "/#{cli[:fields][:name]}" : "") << (cli[:fields][:history] ? "/history" : "")
-      when 'info'
-        path = "/info"
-      when 'health'
-        path = "/health?consumers=#{cli[:fields][:consumers]}&messages=#{cli[:fields][:messages]}"
-      when 'stashes'
-        path = "/stashes" << (cli[:fields][:path] ? "/#{cli[:fields][:path]}" : "")
-      when 'checks'
-        if cli[:fields][:name]
-          path = "/check/#{cli[:fields][:name]}"
-        elsif cli[:fields][:subscribers]
-          path = "/check/request"
-          payload = {:check => cli[:fields][:check],:subscribers => cli[:fields][:subscribers]}.to_json
-        else
-          path = "/checks"
-        end
-      when 'events'
-        path = "/events" << (cli[:fields][:client] ? "/#{cli[:fields][:client]}" : "") << (cli[:fields][:check] ? "/#{cli[:fields][:check]}" : "")
-      when 'resolve'
-        payload = {:client => cli[:fields][:client], :check => cli[:fields][:check]}.to_json
-        path = "/event/resolve"
-      when 'silence'
-        payload = {:timestamp => Time.now.to_i}
-        payload.merge!({:reason => cli[:fields][:reason]}) if cli[:fields][:reason]
-        if cli[:fields][:expires]
-          expires = Time.now.to_i + (cli[:fields][:expires] * 60)
-          payload.merge!({:expires => expires})
-        end
-        payload = payload.to_json
-        path = "/stashes/silence" << (cli[:fields][:client] ? "/#{cli[:fields][:client]}" : "") << (cli[:fields][:check] ? "/#{cli[:fields][:check]}" : "")
-      when 'aggregates'
-        path = "/aggregates" << (cli[:fields][:check] ? "/#{cli[:fields][:check]}" : "") << (cli[:fields][:id] ? "/#{cli[:fields][:id]}" : "")
+      self.respond_to?(@command) ? path = send(@command, cli) : (puts "Something Bad Happened";exit)
+      @api = {:path => path, :method => cli[:method], :command => cli[:command], :payload => (@payload || false)}
+    end
+
+    def clients(cli)
+      path = "/clients"
+      path << "/#{cli[:fields][:name]}" if cli[:fields][:name]
+      path << "/history" if cli[:fields][:history]
+      path << pagination(cli)
+    end
+
+    def info(cli)
+      path = "/info"
+    end
+
+    def health(cli)
+      path = "/health?consumers=#{cli[:fields][:consumers]}&messages=#{cli[:fields][:messages]}"
+    end
+
+    def stashes(cli)
+      if cli[:fields][:create]
+        e = Editor.new
+        @payload = e.create_stash(cli[:fields][:create_path]).to_json
       end
-      path << pagination(cli) if ["stashes","clients","aggregates"].include?(@command)
-      @api = {:path => path, :method => cli[:method], :command => cli[:command], :payload => (payload || false)}
+      path = "/stashes"
+      path << "/#{cli[:fields][:path]}" if cli[:fields][:path]
+      path << pagination(cli)
+    end
+
+    def checks(cli)
+      if cli[:fields][:name]
+        path = "/check/#{cli[:fields][:name]}"
+      elsif cli[:fields][:subscribers]
+        @payload = {:check => cli[:fields][:check],:subscribers => cli[:fields][:subscribers]}.to_json
+        path = "/check/request"
+      else
+        path = "/checks"
+      end
+    end
+
+    def events(cli)
+      path = "/events"
+      path << "/#{cli[:fields][:client]}" if cli[:fields][:client]
+      path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
+      path
+    end
+
+    def resolve(cli)
+      @payload = {:client => cli[:fields][:client], :check => cli[:fields][:check]}.to_json
+      path = "/event/resolve"
+    end
+
+    def silence(cli)
+      payload = {:timestamp => Time.now.to_i}
+      payload.merge!({:reason => cli[:fields][:reason]}) if cli[:fields][:reason]
+      if cli[:fields][:expires]
+        expires = Time.now.to_i + (cli[:fields][:expires] * 60)
+        payload.merge!({:expires => expires})
+      end
+      @payload = payload.to_json
+      path = "/stashes/silence"
+      path << "/#{cli[:fields][:client]}" if cli[:fields][:client]
+      path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
+      path
+    end
+
+    def aggregates(cli)
+      path = "/aggregates"
+      path << "/#{cli[:fields][:check]}" if cli[:fields][:check]
+      path << "/#{cli[:fields][:id]}" if cli[:fields][:id]
+      path << pagination(cli)
     end
 
     def pagination(cli)

data/lib/sensu-cli/version.rb

@@ -1,3 +1,3 @@
 module SensuCli
-    VERSION = '0.0.10'
+    VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -56,11 +56,14 @@ description: A command line utility for interacting with the Sensu api.
 email: agent462@gmail.com
 executables:
 - sensu
+- sensu-cli
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/sensu
+- bin/sensu-cli
 - lib/sensu-cli/cli.rb
+- lib/sensu-cli/editor.rb
 - lib/sensu-cli/sensu.rb
 - lib/sensu-cli/settings.rb
 - lib/sensu-cli/version.rb