diskmon 0.0.1 → 0.0.2

data/diskmon.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Gem for collect statistic from disks}
   gem.homepage      = ""
 
-  gem.files         = ["Gemfile", "LICENSE", "README.md", "Rakefile", "bin/diskmon", "diskmon.gemspec", "lib/diskmon.rb", "lib/diskmon/client/collector.rb", "lib/diskmon/client/config.rb", "lib/diskmon/client/harddisk.rb", "lib/diskmon/client/raidcontroller.rb", "lib/diskmon/client/solarismapdev.rb", "lib/diskmon/client/zpoolstree.rb", "lib/diskmon/server/harddisk.rb", "lib/diskmon/server/harddiskreport.rb", "lib/diskmon/version.rb"]
+  gem.files         = ["Gemfile", "LICENSE", "README.md", "Rakefile", "bin/diskmon", "diskmon.gemspec", "lib/diskmon.rb", "lib/diskmon/client/collector.rb", "lib/diskmon/client/config.rb", "lib/diskmon/client/harddisk.rb", "lib/diskmon/client/raidcontroller.rb", "lib/diskmon/client/solarismapdev.rb", "lib/diskmon/client/zpoolstree.rb", "lib/diskmon/server/harddisk.rb", "lib/diskmon/server/serverapp.rb", "lib/diskmon/server/harddiskreport.rb", "lib/diskmon/version.rb"]
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "diskmon"
@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Diskmon::VERSION
   gem.add_runtime_dependency 'data_mapper'
   gem.add_runtime_dependency 'sinatra'
-  gem.add_runtime_dependency 'thin'
+#  gem.add_runtime_dependency 'thin'
+gem.add_runtime_dependency 'dm-sqlite-adapter'
 end

data/lib/diskmon.rb

@@ -9,6 +9,7 @@ require 'data_mapper'
 require 'dm-validations'
 require 'pp'
 require "diskmon/server/harddiskreport"
+require "diskmon/server/serverapp"
 
 module Diskmon
 
@@ -50,24 +51,7 @@ module Diskmon
 
       Diskmon::HardDiskReport.auto_upgrade!
 
-      post '/report/new' do
-        data = request.body.read
-
-        Kernel.puts "// Report from #{request.env['REMOTE_ADDR']}" if $DEBUG
-
-        @m = Marshal.load(data)
-
-        @m.each do |disk|
-          report = Diskmon::HardDiskReport.create(disk.to_hash)
-          report.checksum = disk.checksum
-
-          report.print if $DEBUG
-
-          report.save
-        end
-
-        "OK"
-      end
+      Diskmon::ServerApp.run!
     end
   end
 end

data/lib/diskmon/client/zpoolstree.rb

@@ -36,10 +36,12 @@ module Diskmon
 
           when /c[0-9]t/
             disk_name = l.split[0]
+            if disk_name =~ /s0/
+              disk_name = disk_name.slice(0,6) # dirty hack for rpool disks(with slice)
+            end
 
             @disks[disk_name] = {}
             @disks[disk_name]["zpool"]           = pool_name
-
             @disks[disk_name]["read_errors"]     = l.split[2] 
             @disks[disk_name]["write_errors"]    = l.split[3]
             @disks[disk_name]["checksum_errors"] = l.split[4]
@@ -55,19 +57,35 @@ module Diskmon
     end
 
     def which_pool(device)
-      @disks[device]["zpool"]
+      if @disks.include? device
+        @disks[device]["zpool"]
+      else 
+        nil  
+      end
     end
 
     def read_errors(device)
-      @disks[device]["read_errors"]
+      if @disks.include? device
+        @disks[device]["read_errors"]
+      else
+        nil
+      end
     end
 
     def write_errors(device)
-      @disks[device]["write_errors"]
+      if @disks.include? device
+        @disks[device]["write_errors"]
+      else
+        nil
+      end
     end
 
     def checksum_errors(device)
-      @disks[device]["checksum_errors"]
+      if @disks.include? device
+        @disks[device]["checksum_errors"]
+      else
+        nil
+      end
     end
 
     # free_space
@@ -75,7 +93,11 @@ module Diskmon
     # last_command
     # health
     def get_pool_param(pool, param)
-      @pools[pool][param]
+      if @pools.include? pool
+        @pools[pool][param]
+      else
+        nil
+      end
     end
 
   end

data/lib/diskmon/server/serverapp.rb

@@ -0,0 +1,28 @@
+require "sinatra/base"
+require "diskmon/server/harddisk"
+
+module Diskmon
+  class ServerApp < Sinatra::Base
+
+    set :port, 7777
+
+    post '/report/new' do
+      data = request.body.read
+
+      Kernel.puts "// Report from #{request.env['REMOTE_ADDR']}" if $DEBUG
+
+      @m = Marshal.load(data)
+
+      @m.each do |disk|
+        report = Diskmon::HardDiskReport.create(disk.to_hash)
+        report.checksum = disk.checksum
+
+        report.print if $DEBUG
+
+        report.save
+      end
+
+      "OK"
+    end
+  end
+end

data/lib/diskmon/version.rb

@@ -1,3 +1,3 @@
 module Diskmon
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diskmon
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: dm-sqlite-adapter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -81,6 +81,7 @@ files:
 - lib/diskmon/client/solarismapdev.rb
 - lib/diskmon/client/zpoolstree.rb
 - lib/diskmon/server/harddisk.rb
+- lib/diskmon/server/serverapp.rb
 - lib/diskmon/server/harddiskreport.rb
 - lib/diskmon/version.rb
 homepage: ''