chef-deployment-monitor 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ff8767ea8f743411831646a2307cf00d49394f2f
-  data.tar.gz: 9e83262a06e86e38c2c08057515d8c4275682858
+SHA256:
+  metadata.gz: fc01ed2f5e97ce4442ec89031ac0347a812222e37bf891acc1333a3fbda6ac07
+  data.tar.gz: 16f89af361c11223084a159182648827623d4fb0b473778fa56a0bfcd9c069de
 SHA512:
-  metadata.gz: f0b72880c0f45256e2eed2aac706bf45a376eb8793d6badb712ede7d55917000fa81ba2f5d21ced6dd8b8c8500436598cf5f5c0c28b4c17888b59383412f36ae
-  data.tar.gz: 299f0cf0b52a4fb10c93039c2a60a4d5430e639ace83764fe865b8c05c113996e5182b4dcdbb9787be2ffcc543454446b70533168115b8975019004a4942aff6
+  metadata.gz: '08edcfc1b1cfe4958f8afc40616215dbde1dae0d282b12b89855f98cc2d489a4e9ffd3d5211fbac408cf5192ced9ce8b54d064ae1767c341800b6b8048411662'
+  data.tar.gz: '0829e69664e9754fa38bcf4dc0376b7a476c89150879159ec8e4aa59571f1a7b1898d3b57a680f147efb2f9a5e41929ed9479fcbd63ae7357fb17b32afb8ca27'

data/chef-deployment-monitor.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name              = 'chef-deployment-monitor'
-  s.version           = '1.2.4'
+  s.version           = '1.3.0'
   s.platform          = Gem::Platform::RUBY
   s.has_rdoc          = false
   s.extra_rdoc_files  = ['LICENSE']
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'daemons', '>= 1.1.9'
   s.add_dependency 'mixlib-config'
   s.add_dependency 'json'
-  s.add_dependency 'chef-api', '>= 0.7.1'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rubocop'

data/lib/chef_deployment_monitor/logmon.rb

@@ -78,6 +78,22 @@ class Chef
           Monitor::Config[:blacklisted?].call(data)
         end
 
+        def extract_query_string(url)
+          return unless url
+
+          query_string = url.split('?', 2)[1]
+          return unless query_string
+
+          result = {}
+          query_string.split('&').each do |value|
+            segments = value.split('=', 2)
+            next if segments[0].nil? || segments[0].empty?
+
+            result[segments[0]] = segments[1]
+          end
+          result
+        end
+
         def scan(line)
           @regex = /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - (.{0})- \[([^\]]+?)\]  "(\w+) ([^\s]+?) (HTTP\/1\.1)" (\d+) "(.*)" (\d+) "-" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)"/
           if line =~ @regex
@@ -89,6 +105,7 @@ class Chef
             data['org']     = Regexp.last_match(5).split('/')[2] unless Regexp.last_match(5).split('/')[2].nil?
             data['object']  = Regexp.last_match(5).split('/')[3] unless Regexp.last_match(5).split('/')[3].nil?
             data['name']    = Regexp.last_match(5).split('/')[4] unless Regexp.last_match(5).split('/')[4].nil?
+            data['query']   = extract_query_string(Regexp.last_match(5))
             if Regexp.last_match(5).split('/')[3] == 'policy_groups'
               data['subobject'] = Regexp.last_match(5).split('/')[5] unless Regexp.last_match(5).split('/')[5].nil?
               data['subname']   = Regexp.last_match(5).split('/')[6] unless Regexp.last_match(5).split('/')[6].nil?

data/lib/chef_logmon.rb

@@ -19,5 +19,3 @@ require 'chef_deployment_monitor/log'
 require 'chef_deployment_monitor/config'
 require 'chef_deployment_monitor/sinks'
 require 'chef_deployment_monitor/logmon'
-
-require 'chef_api_monkey_patch'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-deployment-monitor
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Sander Botman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file-tail
@@ -67,20 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: chef-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +112,6 @@ files:
 - Rakefile
 - bin/chef-logmon
 - chef-deployment-monitor.gemspec
-- lib/chef_api_monkey_patch.rb
 - lib/chef_deployment_monitor/config.rb
 - lib/chef_deployment_monitor/log.rb
 - lib/chef_deployment_monitor/logmon.rb
@@ -151,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Chef Monitoring tool to monitor all changes made

data/lib/chef_api_monkey_patch.rb

@@ -1,22 +0,0 @@
-require 'chef-api'
-# TODO: remove when https://github.com/sethvargo/chef-api/pull/56 merged
-module ChefAPI
-  class Resource::Node
-    collection_path '/nodes'
-
-    schema do
-      attribute :name,         type: String, primary: true, required: true
-      attribute :automatic,    type: Hash,   default: {}
-      attribute :default,      type: Hash,   default: {}
-      attribute :normal,       type: Hash,   default: {}
-      attribute :override,     type: Hash,   default: {}
-      attribute :run_list,     type: Array,  default: []
-      attribute :policy_name,  type: String
-      attribute :policy_group, type: String
-
-      # Enterprise Chef attributes
-      attribute :chef_environment, type: String, default: '_default'
-    end
-  end
-end
-Logify.level = :error # ignore the stupid ssl_verify warnings in chef-api