diskmon 0.0.2 → 0.0.3

data/bin/diskmon

@@ -1,16 +1,6 @@
 #!/usr/bin/env ruby
 require "rubygems"
 require "diskmon"
-require "optparse"
 
-OptionParser.new do |opt|
-  opt.separator ""
-  opt.separator "Options:"
-  opt.separator "-------------"
-  opt.on('-a', '--agent', 'Agent mode') { Diskmon::Runner.agent }
-  opt.on('-s', '--server', 'Server mode') { Diskmon::Runner.server }
-  opt.separator ""
-  opt.on_tail('-h', '--help')           { puts opt; exit }
+Diskmon::Runner.agent
 
-  opt.parse!
-  end

data/diskmon.gemspec

@@ -8,14 +8,11 @@ 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/serverapp.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/collector.rb", "lib/diskmon/config.rb", "lib/diskmon/harddisk.rb", "lib/diskmon/raidcontroller.rb", "lib/diskmon/solarismapdev.rb", "lib/diskmon/zpoolstree.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"
   gem.require_paths = ["lib"]
   gem.version       = Diskmon::VERSION
-  gem.add_runtime_dependency 'data_mapper'
-  gem.add_runtime_dependency 'sinatra'
-#  gem.add_runtime_dependency 'thin'
-gem.add_runtime_dependency 'dm-sqlite-adapter'
+
 end

data/lib/diskmon.rb

@@ -1,15 +1,7 @@
 require "diskmon/version"
-require "diskmon/client/config"
-require "diskmon/client/raidcontroller"
-require "diskmon/client/collector"
-
-require 'sinatra'
-require "thin"
-require 'data_mapper'
-require 'dm-validations'
-require 'pp'
-require "diskmon/server/harddiskreport"
-require "diskmon/server/serverapp"
+require "diskmon/config"
+require "diskmon/raidcontroller"
+require "diskmon/collector"
 
 module Diskmon
 
@@ -34,24 +26,5 @@ module Diskmon
       send_result = coll.send_report(cfg.collector_url, cfg.collector_login, cfg.collector_password, m)
       p send_result
     end
-
-################################################################################
-# Server mode
-################################################################################
-
-    def self.server
-      set :port, 7777
-
-      DataMapper::Logger.new($stdout, :debug)
-      DataMapper::setup(:default, "sqlite3://#{Dir.pwd}/reports.db")
-
-      $DEBUG = true
-
-      DataMapper.finalize
-
-      Diskmon::HardDiskReport.auto_upgrade!
-
-      Diskmon::ServerApp.run!
-    end
   end
 end

data/lib/diskmon/{client/harddisk.rb → harddisk.rb}

@@ -12,7 +12,7 @@ module Diskmon
     attr_accessor :port
     attr_accessor :status
     attr_accessor :unit
-    attr_accessor :type             # sata or sas
+    attr_accessor :type             # sata or sas or jbod
     attr_accessor :vendor_model
     attr_accessor :smart_status_raw # array of hex numbers
     attr_accessor :smart_status

data/lib/diskmon/{client/raidcontroller.rb → raidcontroller.rb}

@@ -1,6 +1,6 @@
-require "diskmon/client/solarismapdev"
-require "diskmon/client/harddisk"
-require "diskmon/client/zpoolstree"
+require "diskmon/solarismapdev"
+require "diskmon/harddisk"
+require "diskmon/zpoolstree"
 
 module Diskmon
 
@@ -12,7 +12,7 @@ module Diskmon
     end
 
     def get_vendor
-      v = `scanpci | grep -i raid`
+      v = `scanpci | egrep -i '(Adaptec|3ware)'`
 
       case v.downcase
       when /3ware/   then return :threeware
@@ -66,21 +66,6 @@ module Diskmon
 
             d.dri = "disk://" + Diskmon::Server.get_id + "/" + d.ctl_id + "/" + d.port
 
-            # IO.popen("tw_cli /#{ctl_id}/#{d.port} show smart") do |tw_cli_show_smart_io|
-
-            #   d.smart_status_raw = []
-
-            #   tw_cli_show_smart_io.each_line do |l|
-            #     s = l.split
-            #     d.smart_status_raw.push(s) if l[0,1] =~ /[0-9]/ and not s.empty?
-            #   end
-
-            #   d.smart_status = parse_smart_status(d.smart_status_raw.flatten!)
-              
-            # end # show smart
-         
-            # full stats
-            #
             IO.popen("tw_cli /c#{d.ctl_id}/p#{d.port} show all | grep '^/c#{d.ctl_id}/p#{d.port}'") do |tw_cli_show_all_io|
 
               tw_cli_show_all_io.each_line do |l|
@@ -98,7 +83,7 @@ module Diskmon
 
             end # show all
 
-            d.system_device   = "c#{d.ctl_id}t#{d.unit}d0"
+            d.system_device   = "c#{d.ctl_id}t#{d.port}d0"
             d.short_device    = mapdev.to_short(d.system_device)
             
             yield d
@@ -106,7 +91,54 @@ module Diskmon
         end
 
       when :adaptec
+        mapdev = Diskmon::SolarisMapDev.new
+
+        # disks overview
+        #
+        arcconf_num_drives = `arcconf getconfig #{ctl_id} | grep 'Device #' | wc -l`.chomp.to_i
+
+        0.upto(arcconf_num_drives - 2) do |num|
+          disk = get_hash_of_disk(ctl_id, num) 
+
+          d = Diskmon::HardDisk.new
+
+          d.ctl_id       = ctl_id
+          d.port         = disk["ReportedLocation"].split("Slot")[1]
+          d.status       = disk["State"]
+          d.size         = disk["Size"]
+          d.type         = disk["TransferSpeed"]
+          d.vendor_model = disk["Model"]
+          d.serial       = disk["Serialnumber"]
+
+          d.dri = "disk://" + Diskmon::Server.get_id + "/" + d.ctl_id + "/" + d.port
+
+          # TODO smart status
+          if `iostat -En | ggrep #{d.serial} -B1`.split[0]
+            d.system_device = `iostat -En | ggrep #{d.serial} -B1`.split[0]
+          else 
+            d.system_device = "c0t#{d.port}d0"
+          end
+
+          d.short_device = mapdev.to_short(d.system_device)
+          
+          yield d
+        end
+      end
+    end
+
+    def get_hash_of_disk(ctl_id, num)
+      disk_info = []
+      d = []
+      get_config = `arcconf getconfig #{ctl_id} | ggrep -m 1 'Device ##{num}' -A 22`
+      get_config.split(/\n/).each do |e|
+        disk_info << e.split(' :')
+      end
+      disk_info.slice!(0,2)
+      disk_info.flatten!
+      disk_info.each do |e|
+        d << e.split(" ").join
       end
+      disk_hash = Hash[*d] 
     end
 
     def get_all_stats

data/lib/diskmon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diskmon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: data_mapper
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2012-07-25 00:00:00.000000000 Z
+dependencies: []
 description: Gem for collect statistic from disks
 email:
 - morion.estariol@gmail.com
@@ -74,15 +26,12 @@ files:
 - 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/collector.rb
+- lib/diskmon/config.rb
+- lib/diskmon/harddisk.rb
+- lib/diskmon/raidcontroller.rb
+- lib/diskmon/solarismapdev.rb
+- lib/diskmon/zpoolstree.rb
 - lib/diskmon/version.rb
 homepage: ''
 licenses: []

data/lib/diskmon/server/harddisk.rb

@@ -1,19 +0,0 @@
-require 'digest'
-
-module Diskmon
-  
-  class HardDisk
-
-    # credit: http://stackoverflow.com/a/5031637
-    def to_hash
-      Hash[instance_variables.map { |var| [var[1..-1].to_sym, instance_variable_get(var)] }]
-    end
-
-    def checksum
-      as_str = ''
-      instance_variables.sort.map { |k| as_str << "#{k}=#{instance_variable_get(k)};" }
-      p as_str if $DEBUG
-      Digest::MD5.hexdigest(as_str)
-    end
-  end
-end

data/lib/diskmon/server/harddiskreport.rb

@@ -1,50 +0,0 @@
-require "data_mapper"
-
-module Diskmon
-    
-  class HardDiskReport
-    include DataMapper::Resource
-
-    property :dri                 , String
-    property :ctl_id              , String
-    property :port                , String
-    property :status              , String
-    property :unit                , String
-    property :type                , String
-    property :vendor_model        , String
-    property :smart_status_raw    , String
-    property :smart_status        , String
-    property :size                , String
-    property :reallocs            , String
-    property :age_hours           , String
-    property :temperature         , String
-    property :serial              , String
-    property :spindle_speed       , String
-    property :error_events        , String
-    property :member_of_zpool     , String
-    property :disk_space_used     , String
-
-    property :error_events        , String
-                                     
-    property :member_of_zpool     , String
-    property :read_errors         , String
-    property :write_errors        , String
-    property :checksum_errors     , String
-                                     
-    property :zpool_health        , String
-    property :zpool_last_command  , String
-    property :zpool_total_space   , String
-    property :zpool_free_space    , String
-                                     
-    property :system_device       , String
-    property :short_device        , String
-
-    property :created_at          , EpochTime
-    property :checksum            , String, :key => true, :unique => true
-
-    def print
-      instance_variables.sort.map { |k| printf( "%-20s => %s\n", k, instance_variable_get(k) ) }    
-    end
-
-  end
-end

data/lib/diskmon/server/serverapp.rb

@@ -1,28 +0,0 @@
-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