garrison-api 1.0.8 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c2ae0db74546c3f6fff75275830323d4697a3a163a2d75afce2e271f099a1b29
-  data.tar.gz: dc0b7aa60d8507c4082c16173526f874fc30c29c6e511dae841bf89ed370ea57
+SHA1:
+  metadata.gz: 9d245029755f99b9f52a4e33f9e34cc4f6e68c42
+  data.tar.gz: f07cd2df5281a3517ff382fc80c81e4b29a703ca
 SHA512:
-  metadata.gz: 1c73f7832214609e5b83523c8a908da55eb91c35526232f614fd57f705988c34cc48c869a38fc128172f4c44f3d3b6e9478a9ee3175ad22f7b25e2e3dc0d74aa
-  data.tar.gz: c9a020c92477986897e5d08d2bee3047206e044a519b84cf36cb5aaaff946019bdb10cb84a4d280612ef1739cfec70cb58e6ab18cf97a9d4d434cb0502afeff7
+  metadata.gz: b8be2d213ca909a094e9a3b2b773063832fcea90401c09b4351f565cc147e4e966b64e4854faf9890985fd69e4537a6b6330fb9e5d341ec143173bf6e75525c4
+  data.tar.gz: 2876270db89b10a954f181aee69354a30afbfd2d6bda4b8f9c192e10942c9aca35e9153f0665603d127a6701faf22754ef883f90cc506a9cc958bfe185c5c927

data/Gemfile.lock

@@ -1,24 +1,28 @@
 PATH
   remote: .
   specs:
-    garrison-api (1.0.0)
-      httparty (~> 0.16.2)
+    garrison-api (2.0.0)
+      httparty (>= 0.16.2, < 0.18.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    httparty (0.16.2)
+    httparty (0.17.0)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
     multi_xml (0.6.0)
-    rake (10.5.0)
+    rake (12.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   garrison-api!
-  rake (~> 10.0)
+  rake (~> 12.3)
 
 BUNDLED WITH
-   1.16.1
+   2.0.2

data/garrison-api.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'httparty', '~> 0.16.2'
+  spec.add_dependency 'httparty', '>= 0.16.2', '< 0.18.0'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 12.3"
 end

data/lib/garrison/agents/check.rb

@@ -8,6 +8,8 @@ module Garrison
       attr_accessor :family
       attr_accessor :departments
       attr_accessor :options
+      attr_accessor :run_uuid
+      attr_accessor :state
 
       def initialize(options = {})
         @source      = ENV['GARRISON_ALERT_SOURCE']
@@ -16,10 +18,12 @@ module Garrison
         @family      = ENV['GARRISON_ALERT_FAMILY']
         @departments = ENV['GARRISON_ALERT_DEPARTMENTS'] ? ENV['GARRISON_ALERT_DEPARTMENTS'].split(',') : []
         @options     = options
+        @state       = :initial
 
+        Logging.logger.progname = Api.configuration.uuid
         Logging.info "Starting... #{self.class.name}"
         inherit_settings
-        Logging.info "Agent Settings (source=#{self.source} severity=#{self.severity || 'dynamic'} type=#{self.type} family=#{self.family} departments=#{self.departments.join(',')})"
+        Logging.info "Agent Settings (uuid=#{Api.configuration.uuid} source=#{self.source} severity=#{self.severity || 'dynamic'} type=#{self.type} family=#{self.family} departments=#{self.departments.join(',')})"
 
         options_log = options.map do |key, value|
           value = value.is_a?(Array) ? value.join(',') : value
@@ -28,10 +32,31 @@ module Garrison
         Logging.info "Check Settings (#{options_log.join(' ')})" if options.any?
       end
 
+      def run
+        before_perform
+        begin
+          perform
+        rescue Exception => e
+          Logging.fatal "#{e} - #{e.message}"
+          self.state = :failed
+        end
+        after_perform
+      end
+
       def perform
         raise 'You must provide a perform method in your check class'
       end
 
+      def before_perform
+        self.run_uuid = Api::Run.create(self)
+      end
+
+      def after_perform
+        self.state = :complete
+        Api::Run.update(self)
+        Api::Alert.obsolete_previous_runs(self) if ENV["GARRISON_AUTO_OBSOLETE"]
+      end
+
       def key_values
         []
       end
@@ -41,6 +66,7 @@ module Garrison
         utc_time_now = Time.now.utc
 
         alert = Api::Alert.new
+        alert.run_uuid = self.run_uuid
         alert.type = type
         alert.family = family
         alert.source = source

data/lib/garrison/api.rb

@@ -1,7 +1,8 @@
 require 'httparty'
-require 'garrison/api/version'
-require 'garrison/api/alert'
 require 'garrison/agents/check'
+require 'garrison/api/alert'
+require 'garrison/api/run'
+require 'garrison/api/version'
 require 'garrison/helpers/logger'
 
 module Garrison
@@ -18,11 +19,9 @@ module Garrison
     class Configuration
       attr_accessor :url
       attr_accessor :uuid
-      attr_accessor :run_uuid
 
       def initialize
-        @uuid     = SecureRandom.uuid
-        @run_uuid = SecureRandom.uuid
+        @uuid = SecureRandom.uuid
       end
     end
   end

data/lib/garrison/api/alert.rb

@@ -3,21 +3,33 @@ module Garrison
     class Alert
 
       class << self
-        def obsolete_previous_runs(source)
-          raise ArgumentError, "No source defined" unless source
+        def obsolete_previous_runs(check)
+          raise ArgumentError, "No source defined" unless check.source
           url = File.join(Api.configuration.url, 'api', 'v1', 'alerts', 'obsolete')
-          HTTParty.post(
-            url,
+
+          party_params = {
             body: {
-              source: source,
-              agent_uuid: Api.configuration.uuid,
-              agent_run_uuid: Api.configuration.run_uuid,
+              source: check.source,
+              agent_id: Api.configuration.uuid,
+              run_id: check.run_uuid,
             }.to_json,
-            headers: { 'Content-Type' => 'application/json' }
-          )
+            headers: { 'Content-Type' => 'application/json' },
+            logger: Logging.logger,
+            log_level: :debug,
+            raise_on: (400..599).to_a
+          }
+
+          Logging.debug "Alert::obsolete_previous_runs - #{party_params[:body]}"
+          HTTParty.post(url, party_params)
+
+        rescue Errno::ECONNREFUSED => e
+          Logging.error "#{e.class} to the Garrison API during Alert::obsolete_previous_runs - #{e.message}"
+        rescue HTTParty::ResponseError => e
+          Logging.error "#{e.class} #{e.message.split(" - ")[0]} - When calling the Garrison API during Alert::obsolete_previous_runs"
         end
       end
 
+      attr_accessor :run_uuid
       attr_accessor :type
       attr_accessor :family
       attr_accessor :source
@@ -39,8 +51,8 @@ module Garrison
 
       def save
         url = File.join(Api.configuration.url, 'api', 'v1', 'alerts')
-        HTTParty.post(
-          url,
+
+        party_params = {
           body: {
             name: name,
             target: target,
@@ -58,11 +70,22 @@ module Garrison
             departments: departments,
             no_repeat: no_repeat,
             count: count,
-            agent_uuid: Api.configuration.uuid,
-            agent_run_uuid: Api.configuration.run_uuid,
+            agent_id: Api.configuration.uuid,
+            run_id: run_uuid,
           }.to_json,
-          headers: { 'Content-Type' => 'application/json' }
-        )
+          headers: { 'Content-Type' => 'application/json' },
+          logger: Logging.logger,
+          log_level: :debug,
+          raise_on: (400..599).to_a
+        }
+
+        Logging.debug "Alert::save - #{party_params[:body]}"
+        HTTParty.post(url, party_params)
+
+      rescue Errno::ECONNREFUSED => e
+        Logging.error "#{e.class} to the Garrison API during Alert::save - #{e.message}"
+      rescue HTTParty::ResponseError => e
+        Logging.error "#{e.class} #{e.message.split(" - ")[0]} - When calling the Garrison API during Alert::save"
       end
     end
   end

data/lib/garrison/api/run.rb

@@ -0,0 +1,62 @@
+module Garrison
+  module Api
+    class Run
+
+      class << self
+        def create(check)
+          url = File.join(Api.configuration.url, 'api', 'v1', 'runs')
+          party_params = {
+            body: {
+              run: {
+                agent_id: Api.configuration.uuid,
+                started_at: Time.now.utc,
+                state: check.state
+              }
+            }.to_json,
+            headers: { 'Content-Type' => 'application/json' },
+            logger: Logging.logger,
+            log_level: :debug,
+            raise_on: (400..599).to_a
+          }
+
+          Logging.debug "Run::create - #{party_params[:body]}"
+          response = HTTParty.post(url, party_params)
+
+          Logging.logger.progname = [Api.configuration.uuid, response["id"]].join(",")
+          Logging.info "Agent Run Created (uuid=#{response["id"]})"
+          response["id"]
+
+        rescue Errno::ECONNREFUSED => e
+          Logging.error "#{e.class} to the Garrison API during Run::create - #{e.message}"
+        rescue HTTParty::ResponseError => e
+          Logging.error "#{e.class} #{e.message.split(" - ")[0]} - When calling the Garrison API during Run::create"
+        end
+
+        def update(check)
+          url = File.join(Api.configuration.url, 'api', 'v1', 'runs', check.run_uuid)
+          party_params = {
+            body: {
+              run: {
+                state: check.state,
+                ended_at: Time.now.utc
+              }
+            }.to_json,
+            headers: { 'Content-Type' => 'application/json' },
+            logger: Logging.logger,
+            log_level: :debug,
+            raise_on: (400..599).to_a
+          }
+
+          Logging.debug "Run::update - #{party_params[:body]}"
+          HTTParty.patch(url, party_params)
+
+        rescue Errno::ECONNREFUSED => e
+          Logging.error "#{e.class} to the Garrison API during Run::update - #{e.message}"
+        rescue HTTParty::ResponseError => e
+          Logging.error "#{e.class} #{e.message.split(" - ")[0]} - When calling the Garrison API during Run::update"
+        end
+      end
+
+    end
+  end
+end

data/lib/garrison/api/version.rb

@@ -1,5 +1,5 @@
 module Garrison
   module Api
-    VERSION = "1.0.8"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: garrison-api
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Forward3D Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 description: RubyGem to talk to the Garrison API
 email:
 - developers@forward3d.com
@@ -72,6 +78,7 @@ files:
 - lib/garrison/agents/check.rb
 - lib/garrison/api.rb
 - lib/garrison/api/alert.rb
+- lib/garrison/api/run.rb
 - lib/garrison/api/version.rb
 - lib/garrison/helpers/logger.rb
 homepage: https://github.com/forward3d/garrison
@@ -94,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: RubyGem to talk to the Garrison API