simple_host_monitoring 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8cb8745fb18b771749c088bce363ce79be93d0a0
-  data.tar.gz: 20ada3d565ef78e033e1e61f6368cef5172a8fa9
+SHA256:
+  metadata.gz: ad29af6cc396b701f0466c4f60e1e1417659aafae501d2fa33071b9f4f5f6516
+  data.tar.gz: eb5dcabfbeb19a656c60cd9919040a78ae1e9baebe0f057a77b87fea7ef4dde7
 SHA512:
-  metadata.gz: c8d938ac4ee0341250d0cb86a8fdf9f84599e2721929ac87afe46c76c2deda7714d1f7bc5827a59e2ec63363e5443c7531473001fc20d8ca52e072c8d22d57a1
-  data.tar.gz: b4c5d43d87ad812e2bbf97e9f3fb607b03d70853cee05c3a6d014c82886c44522783b975d112e6596a9d64e24ba167089ae3494e5999a3d7369407d7a0855997
+  metadata.gz: e8ea4284223480c9ea6ac6d76286835cdaaf496456c067a80712ba33fdc4315f1eb433077b2ef92a9139698e30d04c2826232e5b06f50b85258676be70c4bb40
+  data.tar.gz: 1f5ed2593cf5f0ee6f14632d46b7cbc6dc9700af5f36157325f61236a41fbdb8beaca2bae2cd33f34999dcdcc2fcd9f57ac2559ef3b1a33ff268f56dcb7bc65f

data/examples/example01.rb

@@ -1,60 +1,60 @@
-require_relative '../lib/simple_host_monitoring'
-
-# 
-parser = BlackStack::SimpleCommandLineParser.new(
-  :description => 'This command will launch a SimpleHostMonitoring client that will push the status of the host every X seconds.', 
-  :configuration => [{
-    :name=>'log', 
-    :mandatory=>false, 
-    :description=>'Write a logfile with the status of this command.', 
-    :type=>BlackStack::SimpleCommandLineParser::BOOL,
-    :default=>false
-  },
-  {
-    :name=>'log_auto_delete', 
-    :mandatory=>false, 
-    :description=>'Write a logfile with the status of this command.', 
-    :type=>BlackStack::SimpleCommandLineParser::BOOL,
-    :default=>true
-  },
-  {
-    :name=>'poll_seconds', 
-    :mandatory=>false, 
-    :description=>'How many delay seconds between the starting of a poll cycle and the starting of the next one.', 
-    :type=>BlackStack::SimpleCommandLineParser::INT,
-    :default=>10
-  },
-  ]
-)
-
-# 
-logger = BlackStack::LocalLoggerFactory.create('./example01.log')
-
-#
-while (true) 
-  url = "https://127.0.0.1:444/api1.4/shm/update.json"
-  api_key = 'E20CBAE0-A4D4-4161-8812-6D9FE67A2E47'
-
-  logger.logs "Flag start time... "
-  start_time = Time.now
-  logger.done
-  
-  logger.logs "Poll... "
-  host = BlackStack::RemoteHost.new
-  host.poll
-  logger.done
-
-  logger.logs "Flag end time... "
-  end_time = Time.now
-  logger.done
-
-  logger.logs "Push... "
-  host.push(api_key, url) 
-  logger.done
-
-  logger.logs "Sleep... "
-  enlapsed_seconds = end_time - start_time
-  poll_seconds = parser.value('poll_seconds')
-  sleep( poll_seconds - enlapsed_seconds ) if poll_seconds > enlapsed_seconds
-  logger.done
-end
+require_relative '../lib/simple_host_monitoring'
+
+# 
+parser = BlackStack::SimpleCommandLineParser.new(
+  :description => 'This command will launch a SimpleHostMonitoring client that will push the status of the host every X seconds.', 
+  :configuration => [{
+    :name=>'log', 
+    :mandatory=>false, 
+    :description=>'Write a logfile with the status of this command.', 
+    :type=>BlackStack::SimpleCommandLineParser::BOOL,
+    :default=>false
+  },
+  {
+    :name=>'log_auto_delete', 
+    :mandatory=>false, 
+    :description=>'Write a logfile with the status of this command.', 
+    :type=>BlackStack::SimpleCommandLineParser::BOOL,
+    :default=>true
+  },
+  {
+    :name=>'poll_seconds', 
+    :mandatory=>false, 
+    :description=>'How many delay seconds between the starting of a poll cycle and the starting of the next one.', 
+    :type=>BlackStack::SimpleCommandLineParser::INT,
+    :default=>10
+  },
+  ]
+)
+
+# 
+logger = BlackStack::LocalLoggerFactory.create('./example01.log')
+
+#
+while (true) 
+  url = "https://euler.connectionsphere.com/api1.4/shm/update.json"
+  api_key = '290582D4-D00C-4D37-82AF-23043B242647'
+
+  logger.logs "Flag start time... "
+  start_time = Time.now
+  logger.done
+  
+  logger.logs "Poll... "
+  host = BlackStack::RemoteHost.new
+  host.poll
+  logger.done
+
+  logger.logs "Flag end time... "
+  end_time = Time.now
+  logger.done
+
+  logger.logs "Push... "
+  host.push(api_key, url) 
+  logger.done
+
+  logger.logs "Sleep... "
+  enlapsed_seconds = end_time - start_time
+  poll_seconds = parser.value('poll_seconds')
+  sleep( poll_seconds - enlapsed_seconds ) if poll_seconds > enlapsed_seconds
+  logger.done
+end

data/lib/basehost.rb

@@ -1,145 +1,158 @@
-require 'open-uri'
-require 'sys/filesystem'
-require 'sys/cpu'
-require 'pp'
-include Sys
-
-module BlackStack
-
-  module BaseHost
-  
-    # Map the status of this host to the attributes of the class
-    # Returns the hash descriptor of the object
-    def poll()
-      b_total_memory = `wmic ComputerSystem get TotalPhysicalMemory`.delete('^0-9').to_i
-      kb_total_memory = b_total_memory / 1024 
-      mb_total_memory = kb_total_memory / 1024
-      gb_total_memory = mb_total_memory / 1024
-      
-      kb_free_memory = `wmic OS get FreePhysicalMemory`.delete('^0-9').to_i
-      mb_free_memory = kb_free_memory / 1024
-      gb_free_memory = mb_free_memory / 1024
-      
-      # getting disk free space
-      stat = Sys::Filesystem.stat("/")
-      mb_total_disk = stat.block_size * stat.blocks / 1024 / 1024
-      mb_free_disk = stat.block_size * stat.blocks_available / 1024 / 1024
-      
-      # getting public Internet IP
-      #remote_ip = remoteIp()
-      
-      # getting server name
-      hostname = Socket.gethostname
-      
-      # mapping cpu status
-#      self.id = BlackStack::SimpleHostMonitoring::host_id    
-      self.cpu_architecture = CPU.architecture.to_s
-      self.cpu_speed = CPU.freq.to_i
-      self.cpu_load_average = CPU.load_avg.to_i
-      self.cpu_model = CPU.model.to_s
-      self.cpu_type = CPU.cpu_type.to_s
-      self.cpu_number = CPU.num_cpu.to_i
-      
-      # mapping ram status    
-      self.mem_total = mb_total_memory.to_i
-      self.mem_free = mb_free_memory.to_i
-      
-      # mapping disk status
-      self.disk_total = mb_total_disk.to_i
-      self.disk_free = mb_free_disk.to_i
-      
-      # mapping lan attributes
-      self.net_hostname = hostname
-      #self.net_remote_ip = remote_ip.to_s
-      self.net_mac_address = BlackStack::SimpleHostMonitoring.macaddress
-      
-      self.to_hash
-    end
-    
-    # 
-    def to_hash
-      {
-#        :id => self.id,
-        :cpu_architecture => self.cpu_architecture,
-        :cpu_speed => self.cpu_speed,
-        :cpu_load_average => self.cpu_load_average,
-        :cpu_model => self.cpu_model,
-        :cpu_type => self.cpu_type,
-        :cpu_number => self.cpu_number,    
-        :mem_total => self.mem_total,
-        :mem_free => self.mem_free,
-        :disk_total => self.disk_total,
-        :disk_free => self.disk_free,
-        :net_hostname => self.net_hostname,
-        #:net_remote_ip => self.net_remote_ip,
-        :net_mac_address => self.net_mac_address
-      }    
-    end
-  
-    # 
-    def self.valid_descriptor?(h)
-      return false if !h.is_a?(Hash)
-#      return false if !h[:id].to_s.guid?
-      return false if h[:cpu_architecture].to_s.size==0
-      return false if !h[:cpu_speed].to_s.fixnum?
-      return false if !h[:cpu_load_average].to_s.fixnum?
-      return false if h[:cpu_model].to_s.size==0
-      return false if h[:cpu_type].to_s.size==0
-      return false if !h[:cpu_number].to_s.fixnum?
-      return false if !h[:mem_total].to_s.fixnum?
-      return false if !h[:mem_free].to_s.fixnum?
-      return false if !h[:disk_total].to_s.fixnum?
-      return false if !h[:disk_free].to_s.fixnum?
-      return false if h[:net_hostname].to_s.size==0
-      #return false if h[:net_remote_ip].to_s.size==0
-      return false if h[:net_mac_address].to_s.size==0
-      true 
-    end
-  
-    # 
-    def self.descriptor_validation_details(h)
-      s = ''
-      s += 'Wrong descriptor format. ' if !h.is_a?(Hash)
-#      s += 'Invalid id. ' if !h[:id].to_s.guid?
-      s += 'Invalid cpu_architecture. ' if h[:cpu_architecture].to_s.size==0
-      s += 'Invalid cpu_speed. ' if !h[:cpu_speed].to_s.fixnum?
-      s += 'Invalid cpu_load_average. ' if !h[:cpu_load_average].to_s.fixnum?
-      s += 'Invalid cpu_model. ' if h[:cpu_model].to_s.size==0
-      s += 'Invalid cpu_type. ' if h[:cpu_type].to_s.size==0
-      s += 'Invalid cpu_number. ' if !h[:cpu_number].to_s.fixnum?
-      s += 'Invalid mem_total. ' if !h[:mem_total].to_s.fixnum?
-      s += 'Invalid mem_free. ' if !h[:mem_free].to_s.fixnum?
-      s += 'Invalid disk_total. ' if !h[:disk_total].to_s.fixnum?
-      s += 'Invalid disk_free. ' if !h[:disk_free].to_s.fixnum?
-      s += 'Invalid net_hostname. ' if h[:net_hostname].to_s.size==0
-      #s += 'Invalid :net_remote_ip. ' if h[:net_remote_ip].to_s.size==0
-      s += 'Invalid net_mac_address. ' if h[:net_mac_address].to_s.size==0
-      s
-    end
-  
-    # 
-    def parse(h)
-#      self.id = h[:id]
-      self.cpu_architecture = h[:cpu_architecture]
-      self.cpu_speed = h[:cpu_speed]
-      self.cpu_load_average = h[:cpu_load_average]
-      self.cpu_model = h[:cpu_model]
-      self.cpu_type = h[:cpu_type]
-      self.cpu_number = h[:cpu_number]    
-      self.mem_total = h[:mem_total]
-      self.mem_free = h[:mem_free]
-      self.disk_total = h[:disk_total]
-      self.disk_free = h[:disk_free]
-      self.net_hostname = h[:net_hostname]
-      #self.net_remote_ip = h[:net_remote_ip]
-      self.net_mac_address = h[:net_mac_address] 
-    end
-  
-    # 
-    def push(api_key, url)
-      BlackStack::Netting::api_call( url, {:api_key => api_key}.merge(self.to_hash) )
-    end
-  
-  end # module BaseHost
-
-end # module BlackStack
+require 'open-uri'
+require 'sys/filesystem'
+require 'sys/cpu'
+require 'pp'
+include Sys
+
+module BlackStack
+
+  module BaseHost
+
+    # Map the status of this host to the attributes of the class
+    # Returns the hash descriptor of the object
+    def poll()
+      b_total_memory = windows_os? ? `wmic ComputerSystem get TotalPhysicalMemory`.delete('^0-9').to_i : `cat /proc/meminfo | grep MemTotal`.delete('^0-9').to_i*1024
+      kb_total_memory = b_total_memory / 1024
+      mb_total_memory = kb_total_memory / 1024
+      gb_total_memory = mb_total_memory / 1024
+
+      kb_free_memory = windows_os? ? `wmic OS get FreePhysicalMemory`.delete('^0-9').to_i : `cat /proc/meminfo | grep MemFree`.delete('^0-9').to_i
+      mb_free_memory = kb_free_memory / 1024
+      gb_free_memory = mb_free_memory / 1024
+
+      # getting disk free space
+      stat = Sys::Filesystem.stat("/")
+      mb_total_disk = stat.block_size * stat.blocks / 1024 / 1024
+      mb_free_disk = stat.block_size * stat.blocks_available / 1024 / 1024
+
+      # getting public Internet IP
+      #remote_ip = remoteIp()
+
+      # getting server name
+      hostname = Socket.gethostname
+
+      # mapping cpu status
+#      self.id = BlackStack::SimpleHostMonitoring::host_id
+      if windows_os?
+        self.cpu_architecture = CPU.architecture.to_s
+        self.cpu_speed = CPU.freq.to_i
+        self.cpu_load_average = CPU.load_avg.to_i
+        self.cpu_model = CPU.model.to_s
+        self.cpu_type = CPU.cpu_type.to_s
+        self.cpu_number = CPU.num_cpu.to_i
+      else
+        self.cpu_architecture = `lscpu | grep Architecture`.split(':')[1].strip!
+        self.cpu_speed = `lscpu | grep "CPU MHz:"`.split(':')[1].strip!.to_f.round
+        self.cpu_load_average = Sys::CPU.load_avg.to_s.to_i
+        self.cpu_model = `lscpu | grep "Model"`.split(':')[1].strip!
+        self.cpu_type = self.cpu_model.split(' ')[0]
+        self.cpu_number = `lscpu | grep "^CPU(s):"`.split(':')[1].strip!.to_i
+      end
+
+      # mapping ram status
+      self.mem_total = mb_total_memory.to_i
+      self.mem_free = mb_free_memory.to_i
+
+      # mapping disk status
+      self.disk_total = mb_total_disk.to_i
+      self.disk_free = mb_free_disk.to_i
+
+      # mapping lan attributes
+      self.net_hostname = hostname
+      #self.net_remote_ip = remote_ip.to_s
+      self.net_mac_address = BlackStack::SimpleHostMonitoring.macaddress
+
+      self.to_hash
+    end
+
+    #
+    def to_hash
+      {
+#        :id => self.id,
+        :cpu_architecture => self.cpu_architecture,
+        :cpu_speed => self.cpu_speed,
+        :cpu_load_average => self.cpu_load_average,
+        :cpu_model => self.cpu_model,
+        :cpu_type => self.cpu_type,
+        :cpu_number => self.cpu_number,
+        :mem_total => self.mem_total,
+        :mem_free => self.mem_free,
+        :disk_total => self.disk_total,
+        :disk_free => self.disk_free,
+        :net_hostname => self.net_hostname,
+        #:net_remote_ip => self.net_remote_ip,
+        :net_mac_address => self.net_mac_address
+      }
+    end
+
+    #
+    def self.valid_descriptor?(h)
+      return false if !h.is_a?(Hash)
+#      return false if !h[:id].to_s.guid?
+      return false if h[:cpu_architecture].to_s.size==0
+      return false if !h[:cpu_speed].to_s.fixnum?
+      return false if !h[:cpu_load_average].to_s.fixnum?
+      return false if h[:cpu_model].to_s.size==0
+      return false if h[:cpu_type].to_s.size==0
+      return false if !h[:cpu_number].to_s.fixnum?
+      return false if !h[:mem_total].to_s.fixnum?
+      return false if !h[:mem_free].to_s.fixnum?
+      return false if !h[:disk_total].to_s.fixnum?
+      return false if !h[:disk_free].to_s.fixnum?
+      return false if h[:net_hostname].to_s.size==0
+      #return false if h[:net_remote_ip].to_s.size==0
+      return false if h[:net_mac_address].to_s.size==0
+      true
+    end
+
+    #
+    def self.descriptor_validation_details(h)
+      s = ''
+      s += 'Wrong descriptor format. ' if !h.is_a?(Hash)
+#      s += 'Invalid id. ' if !h[:id].to_s.guid?
+      s += 'Invalid cpu_architecture. ' if h[:cpu_architecture].to_s.size==0
+      s += 'Invalid cpu_speed. ' if !h[:cpu_speed].to_s.fixnum?
+      s += 'Invalid cpu_load_average. ' if !h[:cpu_load_average].to_s.fixnum?
+      s += 'Invalid cpu_model. ' if h[:cpu_model].to_s.size==0
+      s += 'Invalid cpu_type. ' if h[:cpu_type].to_s.size==0
+      s += 'Invalid cpu_number. ' if !h[:cpu_number].to_s.fixnum?
+      s += 'Invalid mem_total. ' if !h[:mem_total].to_s.fixnum?
+      s += 'Invalid mem_free. ' if !h[:mem_free].to_s.fixnum?
+      s += 'Invalid disk_total. ' if !h[:disk_total].to_s.fixnum?
+      s += 'Invalid disk_free. ' if !h[:disk_free].to_s.fixnum?
+      s += 'Invalid net_hostname. ' if h[:net_hostname].to_s.size==0
+      #s += 'Invalid :net_remote_ip. ' if h[:net_remote_ip].to_s.size==0
+      s += 'Invalid net_mac_address. ' if h[:net_mac_address].to_s.size==0
+      s
+    end
+
+    #
+    def parse(h)
+#      self.id = h[:id]
+      self.cpu_architecture = h[:cpu_architecture]
+      self.cpu_speed = h[:cpu_speed]
+      self.cpu_load_average = h[:cpu_load_average]
+      self.cpu_model = h[:cpu_model]
+      self.cpu_type = h[:cpu_type]
+      self.cpu_number = h[:cpu_number]
+      self.mem_total = h[:mem_total]
+      self.mem_free = h[:mem_free]
+      self.disk_total = h[:disk_total]
+      self.disk_free = h[:disk_free]
+      self.net_hostname = h[:net_hostname]
+      #self.net_remote_ip = h[:net_remote_ip]
+      self.net_mac_address = h[:net_mac_address]
+    end
+
+    #
+    def push(api_key, url)
+      BlackStack::Netting::api_call( url, {:api_key => api_key}.merge(self.to_hash) )
+    end
+
+    def windows_os?
+      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+    end
+
+  end # module BaseHost
+
+end # module BlackStack

data/lib/localhost.rb

@@ -1,62 +1,62 @@
-require_relative './basehost'
-require_relative './localhosthistory'
-
-module BlackStack
-  
-  class LocalHost < Sequel::Model(:host)
-    include BaseHost
-    LocalHost.dataset = LocalHost.dataset.disable_insert_output
-  
-    # 
-    def parse(h)
-      #self.id = h[:id]
-      self.cpu_architecture = h[:cpu_architecture]
-      self.cpu_speed = h[:cpu_speed]
-      self.cpu_load_average = h[:cpu_load_average]
-      self.cpu_model = h[:cpu_model]
-      self.cpu_type = h[:cpu_type]
-      self.cpu_number = h[:cpu_number]    
-      self.mem_total = h[:mem_total]
-      self.mem_free = h[:mem_free]
-      self.disk_total = h[:disk_total]
-      self.disk_free = h[:disk_free]
-      self.net_hostname = h[:net_hostname]
-      #self.net_remote_ip = h[:net_remote_ip]
-      self.net_mac_address = h[:net_mac_address] 
-    end
-  
-    # 
-    def track
-      h = LocalHostHistory.new
-      h.id = guid()
-      h.id_host = self.id
-      h.create_time = now()
-      h.cpu_architecture = self.cpu_architecture
-      h.cpu_speed = self.cpu_speed
-      h.cpu_load_average = self.cpu_load_average
-      h.cpu_model = self.cpu_model
-      h.cpu_type = self.cpu_type
-      h.cpu_number = self.cpu_number    
-      h.mem_total = self.mem_total
-      h.mem_free = self.mem_free
-      h.disk_total = self.disk_total
-      h.disk_free = self.disk_free
-      h.net_hostname = self.net_hostname
-      h.net_remote_ip = self.net_remote_ip
-      h.net_mac_address = self.net_mac_address 
-      h.save
-    end 
-  
-    # 
-    def mem_load
-      100.to_f*(self.mem_total.to_f - self.mem_free.to_f) / self.mem_total.to_f
-    end
-  
-    # 
-    def disk_load
-      100.to_f*(self.disk_total.to_f - self.disk_free.to_f) / self.disk_total.to_f
-    end
-    
-  end # class LocalHost
-
-end # module BlackStack
+require_relative './basehost'
+require_relative './localhosthistory'
+
+module BlackStack
+  
+  class LocalHost < Sequel::Model(:host)
+    include BaseHost
+    LocalHost.dataset = LocalHost.dataset.disable_insert_output
+  
+    # 
+    def parse(h)
+      #self.id = h[:id]
+      self.cpu_architecture = h[:cpu_architecture]
+      self.cpu_speed = h[:cpu_speed]
+      self.cpu_load_average = h[:cpu_load_average]
+      self.cpu_model = h[:cpu_model]
+      self.cpu_type = h[:cpu_type]
+      self.cpu_number = h[:cpu_number]    
+      self.mem_total = h[:mem_total]
+      self.mem_free = h[:mem_free]
+      self.disk_total = h[:disk_total]
+      self.disk_free = h[:disk_free]
+      self.net_hostname = h[:net_hostname]
+      #self.net_remote_ip = h[:net_remote_ip]
+      self.net_mac_address = h[:net_mac_address] 
+    end
+  
+    # 
+    def track
+      h = LocalHostHistory.new
+      h.id = guid()
+      h.id_host = self.id
+      h.create_time = now()
+      h.cpu_architecture = self.cpu_architecture
+      h.cpu_speed = self.cpu_speed
+      h.cpu_load_average = self.cpu_load_average
+      h.cpu_model = self.cpu_model
+      h.cpu_type = self.cpu_type
+      h.cpu_number = self.cpu_number    
+      h.mem_total = self.mem_total
+      h.mem_free = self.mem_free
+      h.disk_total = self.disk_total
+      h.disk_free = self.disk_free
+      h.net_hostname = self.net_hostname
+      h.net_remote_ip = self.net_remote_ip
+      h.net_mac_address = self.net_mac_address 
+      h.save
+    end 
+  
+    # 
+    def mem_load
+      100.to_f*(self.mem_total.to_f - self.mem_free.to_f) / self.mem_total.to_f
+    end
+  
+    # 
+    def disk_load
+      100.to_f*(self.disk_total.to_f - self.disk_free.to_f) / self.disk_total.to_f
+    end
+    
+  end # class LocalHost
+
+end # module BlackStack

data/lib/localhosthistory.rb

@@ -1,10 +1,10 @@
-require_relative './basehost'
-
-module BlackStack
-  
-  class LocalHostHistory < Sequel::Model(:hosthistory)
-    LocalHostHistory.dataset = LocalHostHistory.dataset.disable_insert_output
-  
-  end # class LocalHostHistory
-
-end # module BlackStack
+require_relative './basehost'
+
+module BlackStack
+  
+  class LocalHostHistory < Sequel::Model(:hosthistory)
+    LocalHostHistory.dataset = LocalHostHistory.dataset.disable_insert_output
+  
+  end # class LocalHostHistory
+
+end # module BlackStack

data/lib/remotehost.rb

@@ -1,10 +1,10 @@
-require_relative './basehost'
-
-module BlackStack
-
-  class RemoteHost
-    attr_accessor :cpu_architecture, :cpu_speed, :cpu_load_average, :cpu_model, :cpu_type, :cpu_number, :mem_total, :mem_free, :disk_total, :disk_free, :net_hostname, :net_remote_ip, :net_mac_address  
-    include BaseHost
-  end # class RemoteHost
-
-end # module BlackStack
+require_relative './basehost'
+
+module BlackStack
+
+  class RemoteHost
+    attr_accessor :cpu_architecture, :cpu_speed, :cpu_load_average, :cpu_model, :cpu_type, :cpu_number, :mem_total, :mem_free, :disk_total, :disk_free, :net_hostname, :net_remote_ip, :net_mac_address  
+    include BaseHost
+  end # class RemoteHost
+
+end # module BlackStack

data/lib/simple_host_monitoring.rb

@@ -1,74 +1,76 @@
-require 'simple_command_line_parser'
-require 'simple_cloud_logging'
-
-require 'socket'
-require 'time'
-require 'uri'
-require 'net/http'
-require 'json'
-require 'openssl'
-require 'tiny_tds'
-require 'sequel'
-
-require_relative './basehost'
-require_relative './remotehost'
-#require_relative './localhost'
-
-module BlackStack
-  
-  module SimpleHostMonitoring
-
-    # get the unique host id from the file ./host_id.data
-    # if the file does not exists, it will ask the API for a GUID and create the file
-    HOST_ID_FILENAME = './host_id.data'
-
-=begin # derepcated
-    @@host_id = nil
-    def self.reset_host_id
-      @@host_id = BlackStack::Pampa::get_guid
-      File.open(HOST_ID_FILENAME, 'w') {|f| f.write(@@host_id) }
-      @@host_id
-    end
-    def self.host_id
-      if @@host_id.nil?
-        if File.file?(HOST_ID_FILENAME)
-          @@host_id = File.read(HOST_ID_FILENAME)
-        else
-          @@host_id = self.reset_host_id
-        end
-      end # !@@host_id.nil?
-      @@host_id = self.reset_host_id if !@@host_id.guid?
-      @@host_id
-    end
-=end
-    # This function works in windows only
-    # TODO: Esta funcion no retorna la mac address completa
-    # TODO: Validar que no se retorne una macaddress virtual, con todos valores en 0
-    def self.macaddress()
-      s = `ipconfig /all`
-      
-      # The standard (IEEE 802) format for printing MAC-48 
-      # => addresses in human-friendly form is six groups 
-      # => of two hexadecimal digits, separated by hyphens 
-      # => - or colons :
-      v = s.scan(/(([A-F0-9]{2}\-){5})([A-F0-9]{2}$)/im)
-      
-      if (v.size>0)
-        return v.first.join.to_s
-      else
-        return nil
-      end
-    end
-
-    #
-    def self.require_db_classes()
-      # You have to load all the Sinatra classes after connect the database.
-      require_relative '../lib/localhost.rb'
-      require_relative '../lib/localhosthistory.rb'
-    end        
-
-  end # module SimpleHostMonitoring
-  
-end # module BlackStack
-
-
+require 'simple_command_line_parser'
+require 'simple_cloud_logging'
+
+require 'socket'
+require 'time'
+require 'uri'
+require 'net/http'
+require 'json'
+require 'openssl'
+require 'tiny_tds'
+require 'sequel'
+
+require_relative './basehost'
+require_relative './remotehost'
+#require_relative './localhost'
+
+module BlackStack
+  
+  module SimpleHostMonitoring
+
+    # get the unique host id from the file ./host_id.data
+    # if the file does not exists, it will ask the API for a GUID and create the file
+    HOST_ID_FILENAME = './host_id.data'
+
+=begin # derepcated
+    @@host_id = nil
+    def self.reset_host_id
+      @@host_id = BlackStack::Pampa::get_guid
+      File.open(HOST_ID_FILENAME, 'w') {|f| f.write(@@host_id) }
+      @@host_id
+    end
+    def self.host_id
+      if @@host_id.nil?
+        if File.file?(HOST_ID_FILENAME)
+          @@host_id = File.read(HOST_ID_FILENAME)
+        else
+          @@host_id = self.reset_host_id
+        end
+      end # !@@host_id.nil?
+      @@host_id = self.reset_host_id if !@@host_id.guid?
+      @@host_id
+    end
+=end
+    # This function works in windows only
+    # TODO: Esta funcion no retorna la mac address completa
+    # TODO: Validar que no se retorne una macaddress virtual, con todos valores en 0
+    def self.macaddress()
+      return `cat /sys/class/net/eth0/address`.upcase.strip.gsub(':', '-') unless BlackStack::RemoteHost.new.windows_os?
+
+      s = `ipconfig /all`
+
+      # The standard (IEEE 802) format for printing MAC-48
+      # => addresses in human-friendly form is six groups
+      # => of two hexadecimal digits, separated by hyphens
+      # => - or colons :
+      v = s.scan(/(([A-F0-9]{2}\-){5})([A-F0-9]{2}$)/im)
+
+      if (v.size>0)
+        return v.first.join.to_s
+      else
+        return nil
+      end
+    end
+
+    #
+    def self.require_db_classes()
+      # You have to load all the Sinatra classes after connect the database.
+      require_relative '../lib/localhost.rb'
+      require_relative '../lib/localhosthistory.rb'
+    end        
+
+  end # module SimpleHostMonitoring
+  
+end # module BlackStack
+
+

metadata

@@ -1,133 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: simple_host_monitoring
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.8
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.8
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: tiny_tds
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.28.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.28.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.28.0
 - !ruby/object:Gem::Dependency
   name: simple_command_line_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: simple_cloud_logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.23
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.23
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.23
 description: 'THIS GEM IS STILL IN DEVELOPMENT STAGE. Find documentation here: https://github.com/leandrosardi/simple_host_monitoring.'
@@ -161,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: THIS GEM IS STILL IN DEVELOPMENT STAGE. Track memory, CPU and disk space