smart_proxy_pulp 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 122c90c7a6e896cc2e3ebc15ac974f289047c1e3
-  data.tar.gz: 62d073204449a0dfa2846c67832a0d4eeb72aeb7
+  metadata.gz: 449eb101bce06ca7d526b94e2d5f1ac5c494cfcd
+  data.tar.gz: e572ad1882b60f02d023a6fcabe7ec8500cedb0b
 SHA512:
-  metadata.gz: 9c51b3ffc313b5e083664ae9d0f3852ccbbf26ab72db0daea8dd5161f0a095c7fd0e8c6d736059ab4f758dd6c310d37242f46e1b538938a6595ba0a3f39ec111
-  data.tar.gz: c739d6ee6f3acae5554f9005537215202ecf3c1678e40014cc0e87d7795370b1468f608a625bf24faf56807413b083515cedd12bf40d20ff3481d5d012d1efa6
+  metadata.gz: a5dd127eb6ea63480e5ff35121f7a56159eb321db7ae55ce1cf2f50b0a42642d6adbced81e65285adb781a2065e1fddfa4c7620674ac8ba1673bda8feb2de4ad
+  data.tar.gz: b8d31112946962ef098b5b899002b7200e5d6326d19137b2448624896e3f5baa4a606171fb3f3820635471ccfdf7ff892488fe94bfc7718474b57a1891afb597

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'smart_proxy', :git => "https://github.com/theforeman/smart-proxy"
+  gem 'smart_proxy', :git => 'https://github.com/theforeman/smart-proxy', :branch => 'develop'
 end

data/lib/smart_proxy_pulp_plugin/disk_usage.rb

@@ -0,0 +1,81 @@
+module PulpProxy
+  class DiskUsage
+    include ::Proxy::Util
+    include ::Proxy::Log
+    SIZE = { :kilobyte => 1_024, :megabyte => 1_048_576, :gigabyte => 1_073_741_824, :terabyte => 1_099_511_627_776 }
+
+    attr_reader :path, :stat, :size
+
+    def initialize(opts ={})
+      raise(::Proxy::Error::ConfigurationError, 'Unable to continue - must provide a path.') if opts[:path].nil?
+      @paths_hash = validate_path(path_hash(opts[:path]))
+      @path = @paths_hash.values
+      @size = SIZE[opts[:size]] || SIZE[:kilobyte]
+      @stat = {}
+      find_df
+      get_stat
+    end
+
+    def to_json
+      stat.to_json
+    end
+
+    private
+
+    attr_reader :command_path
+
+    def find_df
+      @command_path = which('df') || raise(::Proxy::Error::ConfigurationError, 'df command was not found unable to retrieve usage information.')
+    end
+
+    def command
+      [command_path, "-B", "#{size}", *path]
+    end
+
+    def get_stat
+      raw = Open3::popen3({"LC_ALL" => "C"}, *command) do |stdin, stdout, stderr, thread|
+        unless stderr.read.empty?
+          error_line = stderr.read
+          logger.error "[#{command_path}] #{error_line}"
+          raise(::Proxy::Error::ConfigurationError, "#{command_path} raised an error: #{error_line}")
+        end
+        stdout.read.split("\n")
+      end
+      logger.debug "[#{command_path}] #{raw.to_s}"
+
+      titles = normalize_titles(raw)
+      raw.each_with_index do |line, index|
+        mount_path = path[index]
+        values = normalize_values(line.split)
+        @stat[@paths_hash.key(mount_path)] = Hash[titles.zip(values)].merge({:path => mount_path, :size => SIZE.key(size)})
+      end
+    end
+
+    def path_hash(path)
+      path.is_a?(Hash) ? path : Hash[path, path]
+    end
+
+    def normalize_titles(raw)
+      replacers = {"mounted on" => :mounted, "use%" => :percent}
+      raw.shift.downcase.gsub(/(use%|mounted on)/) { |m| replacers.fetch(m,m)}.split.map(&:to_sym)
+    end
+
+    def normalize_values(values)
+      values.each_with_index do |value, index|
+        is_int = Integer(value) rescue false
+        values[index] = is_int if is_int
+      end
+      values
+    end
+
+    def validate_path(path_hash)
+      path_hash.each do |key, value|
+        unless File.readable?(value)
+          logger.warn "File at #{value} defined in #{key} parameter doesn't exist or is unreadable"
+          path_hash.delete(key)
+        end
+      end
+      path_hash
+    end
+  end
+end

data/lib/smart_proxy_pulp_plugin/pulp_api.rb

@@ -1,5 +1,6 @@
 require 'sinatra'
 require 'smart_proxy_pulp_plugin/pulp_client'
+require 'smart_proxy_pulp_plugin/disk_usage'
 
 module PulpProxy
   class Api < Sinatra::Base
@@ -17,5 +18,17 @@ module PulpProxy
         log_halt 503, "Pulp server '#{URI.parse(::PulpProxy::Plugin.settings.pulp_url.to_s).host}' is unknown"
       end
     end
+
+    get '/status/disk_usage' do
+      size = (params[:size] && DiskUsage::SIZE.keys.include?(params[:size].to_sym)) ? params[:size].to_sym : :kilobyte
+      monitor_dirs = ::PulpProxy::Plugin.settings.to_h.select { |key, _| key == :pulp_dir || key == :pulp_content_dir || key == :mongodb_dir }
+      begin
+        pulp_disk = DiskUsage.new({:path => monitor_dirs, :size => size})
+        pulp_disk.to_json
+      rescue ::Proxy::Error::ConfigurationError
+        log_halt 500, 'Could not find df command to evaluate disk space'
+      end
+
+    end
   end
 end

data/lib/smart_proxy_pulp_plugin/pulp_node_plugin.rb

@@ -1,7 +1,10 @@
 module PulpMasterProxy
   class Plugin < ::Proxy::Plugin
     plugin "pulpnode", ::PulpProxy::VERSION
-    default_settings :pulp_url => 'https://localhost/pulp'
+    default_settings :pulp_url => 'https://localhost/pulp',
+                     :pulp_dir => '/var/lib/pulp',
+                     :pulp_content_dir => '/var/lib/pulp/content',
+                     :mongodb_dir => '/var/lib/mongodb'
 
     http_rackup_path File.expand_path("pulp_node_http_config.ru", File.expand_path("../", __FILE__))
     https_rackup_path File.expand_path("pulp_node_http_config.ru", File.expand_path("../", __FILE__))

data/lib/smart_proxy_pulp_plugin/pulp_plugin.rb

@@ -1,9 +1,12 @@
 module PulpProxy
   class Plugin < ::Proxy::Plugin
     plugin "pulp", ::PulpProxy::VERSION
-    default_settings :pulp_url => 'https://localhost/pulp'
+    default_settings :pulp_url => 'https://localhost/pulp',
+                     :pulp_dir => '/var/lib/pulp',
+                     :pulp_content_dir => '/var/lib/pulp/content',
+                     :mongodb_dir => '/var/lib/mongodb'
 
     http_rackup_path File.expand_path("pulp_http_config.ru", File.expand_path("../", __FILE__))
     https_rackup_path File.expand_path("pulp_http_config.ru", File.expand_path("../", __FILE__))
   end
-end
+end

data/lib/smart_proxy_pulp_plugin/version.rb

@@ -1,3 +1,3 @@
 module PulpProxy
-  VERSION = "1.0.1"
+  VERSION = "1.2.0"
 end

data/settings.d/pulp.yml.example

@@ -1,3 +1,7 @@
 ---
 :enabled: true
-#:pulp_url: https://localhost/pulp
+#:pulp_url: https://localhost/pulp
+# Path to pulp, pulp content and mongodb directories
+#:pulp_dir: /var/lib/pulp
+#:pulp_content_dir: /var/lib/pulp/content
+#:mongodb_dir: /var/lib/mongodb

data/settings.d/pulpnode.yml.example

@@ -1,3 +1,7 @@
 ---
 :enabled: true
-#:pulp_url: https://localhost/pulp
+#:pulp_url: https://localhost/pulp
+# Path to pulp, pulp content and mongodb directories
+#:pulp_dir: /var/lib/pulp
+#:pulp_content_dir: /var/lib/pulp/content
+#:mongodb_dir: /var/lib/mongodb

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_pulp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Dmitri Dolguikh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rack-test
   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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 description: |2
@@ -92,6 +92,7 @@ files:
 - LICENSE
 - bundler.d/pulp.rb
 - lib/smart_proxy_pulp.rb
+- lib/smart_proxy_pulp_plugin/disk_usage.rb
 - lib/smart_proxy_pulp_plugin/pulp_api.rb
 - lib/smart_proxy_pulp_plugin/pulp_client.rb
 - lib/smart_proxy_pulp_plugin/pulp_http_config.ru
@@ -111,17 +112,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.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Basic Pulp support for Foreman Smart-Proxy