simple_host_monitoring 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cb8745fb18b771749c088bce363ce79be93d0a0
-  data.tar.gz: 20ada3d565ef78e033e1e61f6368cef5172a8fa9
+  metadata.gz: e473f9c33841dfd3b489c434bae1751a587fec16
+  data.tar.gz: 370acdef2777fd6865d3f8f5592a51c0a6d6fa16
 SHA512:
-  metadata.gz: c8d938ac4ee0341250d0cb86a8fdf9f84599e2721929ac87afe46c76c2deda7714d1f7bc5827a59e2ec63363e5443c7531473001fc20d8ca52e072c8d22d57a1
-  data.tar.gz: b4c5d43d87ad812e2bbf97e9f3fb607b03d70853cee05c3a6d014c82886c44522783b975d112e6596a9d64e24ba167089ae3494e5999a3d7369407d7a0855997
+  metadata.gz: ae38a1728b7f93b15d413a3f7759758ac41bb2e28f4487cbdefc1040626cd4e087a5fcb136028ca6c92ec522254ca450a7e15260e448febb45c69e5a763aefe5
+  data.tar.gz: 20690ba33e9af2a95951c5269a3552db505f3041329e156915be7913b4c0464b8e450fa85c572287747d6acb31f05ebdcb9fc94d715df02475a4cd1713a3802c

data/examples/example01.rb

@@ -32,8 +32,8 @@ 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'
+  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

data/lib/basehost.rb

@@ -7,56 +7,65 @@ 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 
+      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 = `wmic OS get FreePhysicalMemory`.delete('^0-9').to_i
+
+      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    
-      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.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,
@@ -65,7 +74,7 @@ module BlackStack
         :cpu_load_average => self.cpu_load_average,
         :cpu_model => self.cpu_model,
         :cpu_type => self.cpu_type,
-        :cpu_number => self.cpu_number,    
+        :cpu_number => self.cpu_number,
         :mem_total => self.mem_total,
         :mem_free => self.mem_free,
         :disk_total => self.disk_total,
@@ -73,10 +82,10 @@ module BlackStack
         :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?
@@ -93,10 +102,10 @@ module BlackStack
       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 
+      true
     end
-  
-    # 
+
+    #
     def self.descriptor_validation_details(h)
       s = ''
       s += 'Wrong descriptor format. ' if !h.is_a?(Hash)
@@ -116,8 +125,8 @@ module BlackStack
       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]
@@ -125,21 +134,25 @@ module BlackStack
       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.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] 
+      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
+end # module BlackStack

data/lib/simple_host_monitoring.rb

@@ -45,14 +45,16 @@ module BlackStack
     # 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 
+
+      # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_host_monitoring
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.6
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -54,20 +54,14 @@ dependencies:
   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
   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
 - !ruby/object:Gem::Dependency