one2influx 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de061eb5b3f384bc94806b890ebbffbe56a8e9aa
-  data.tar.gz: 48b8af535409c35f0125a2d210ec1d72bd1fa38e
+  metadata.gz: 6353b4846f2c96cbc78ea02b0a811f790eba52c5
+  data.tar.gz: 3f70ee245cc8f705ada540f0c9278695884e95d3
 SHA512:
-  metadata.gz: 2197a320a2cf5c36f9817e3223c81d07977c2cd243653aabb52eae6f1d0799f56c744abbc2dfe9855b80111fe239921ca903e2a092798935ffcc3aac7deefa95
-  data.tar.gz: 8088190af25852639289226a1d6e2ccc11896dcc73428afef171b4ed0816a9f0a64e5b366d8d0def4410aa5b24ee6d80e448e39656d15bdf6f309e4edc5aca51
+  metadata.gz: 92362846a7b6bbda1c22208fab6bdc80029155a84120829c1a6c48eae2095ae9cff2466268525e5b021d7cd128b47c8b260eeaa346eaa84f7381d3c348a66733
+  data.tar.gz: b3245161ecf2eb9d4f1c675dd2f4834f4dfac6607dc8396c1835d3b2fb31ac22b862de6df9938043930889b9811ca12f1a5bd26f4754f5891a0e37e03c770e13

data/bin/one2influx

@@ -4,6 +4,7 @@ begin
   require 'rubygems'
 rescue Exception
   $stderr.puts 'Failed to load rubygems!'
+  exit 1
 end
 
 # add local dirs to load path if necessary

data/bin/one2influx.log

@@ -0,0 +1,83 @@
+# Logfile created on 2015-05-17 16:56:57 +0200 by logger.rb/47272
+I, [2015-05-17T16:56:57.070366 #7964]  INFO -- : Connection with ONE verified.
+I, [2015-05-17T16:56:57.084159 #7964]  INFO -- : Connection to InfluxDB database 'test' with retention policy 'ten_hours' verified.
+E, [2015-05-17T16:56:57.130222 #7964] ERROR -- : Unable to get metric 'HOST_MEM_ALOC'. MAX_MEM is 0.
+E, [2015-05-17T16:56:57.130323 #7964] ERROR -- : Unable to get metric 'HOST_MEM_LOAD'. MAX_MEM is 0.
+E, [2015-05-17T16:56:57.130367 #7964] ERROR -- : Unable to get metric 'HOST_MEM_WASTE'. HOST_MEM_ALOC is missing.
+E, [2015-05-17T16:56:57.130404 #7964] ERROR -- : Unable to get metric 'HOST_CPU_ALOC'. MAX_CPU is 0.
+E, [2015-05-17T16:56:57.130439 #7964] ERROR -- : Unable to get metric 'HOST_CPU_LOAD'. MAX_CPU is 0.
+E, [2015-05-17T16:56:57.130474 #7964] ERROR -- : Unable to get metric 'HOST_CPU_WASTE'. HOST_CPU_ALOC is missing.
+I, [2015-05-17T16:56:57.146043 #7964]  INFO -- : Fetched data for 3 VMs, 2 hosts, 4 datastores and 1 clusters.
+I, [2015-05-17T16:56:57.146134 #7964]  INFO -- : Successfully fetched data from ONE.
+I, [2015-05-17T16:56:57.320825 #7964]  INFO -- : Successfully stored 75 data points.
+I, [2015-05-17T16:56:57.321001 #7964]  INFO -- : Successfully stored 75 data points.
+E, [2015-05-17T16:57:12.370386 #7964] ERROR -- : Unable to get metric 'HOST_MEM_ALOC'. MAX_MEM is 0.
+E, [2015-05-17T16:57:12.370507 #7964] ERROR -- : Unable to get metric 'HOST_MEM_LOAD'. MAX_MEM is 0.
+E, [2015-05-17T16:57:12.370574 #7964] ERROR -- : Unable to get metric 'HOST_MEM_WASTE'. HOST_MEM_ALOC is missing.
+E, [2015-05-17T16:57:12.370630 #7964] ERROR -- : Unable to get metric 'HOST_CPU_ALOC'. MAX_CPU is 0.
+E, [2015-05-17T16:57:12.370711 #7964] ERROR -- : Unable to get metric 'HOST_CPU_LOAD'. MAX_CPU is 0.
+E, [2015-05-17T16:57:12.370765 #7964] ERROR -- : Unable to get metric 'HOST_CPU_WASTE'. HOST_CPU_ALOC is missing.
+I, [2015-05-17T16:57:12.385202 #7964]  INFO -- : Fetched data for 3 VMs, 2 hosts, 4 datastores and 1 clusters.
+I, [2015-05-17T16:57:12.385300 #7964]  INFO -- : Successfully fetched data from ONE.
+I, [2015-05-17T16:57:12.412689 #7964]  INFO -- : Successfully stored 75 data points.
+I, [2015-05-17T16:57:12.412788 #7964]  INFO -- : Successfully stored 75 data points.
+E, [2015-05-17T16:57:27.461425 #7964] ERROR -- : Unable to get metric 'HOST_MEM_ALOC'. MAX_MEM is 0.
+E, [2015-05-17T16:57:27.461550 #7964] ERROR -- : Unable to get metric 'HOST_MEM_LOAD'. MAX_MEM is 0.
+E, [2015-05-17T16:57:27.461623 #7964] ERROR -- : Unable to get metric 'HOST_MEM_WASTE'. HOST_MEM_ALOC is missing.
+E, [2015-05-17T16:57:27.461684 #7964] ERROR -- : Unable to get metric 'HOST_CPU_ALOC'. MAX_CPU is 0.
+E, [2015-05-17T16:57:27.461760 #7964] ERROR -- : Unable to get metric 'HOST_CPU_LOAD'. MAX_CPU is 0.
+E, [2015-05-17T16:57:27.461833 #7964] ERROR -- : Unable to get metric 'HOST_CPU_WASTE'. HOST_CPU_ALOC is missing.
+I, [2015-05-17T16:57:27.477837 #7964]  INFO -- : Fetched data for 3 VMs, 2 hosts, 4 datastores and 1 clusters.
+I, [2015-05-17T16:57:27.477929 #7964]  INFO -- : Successfully fetched data from ONE.
+I, [2015-05-17T16:57:27.505904 #7964]  INFO -- : Successfully stored 75 data points.
+I, [2015-05-17T16:57:27.506016 #7964]  INFO -- : Successfully stored 75 data points.
+E, [2015-05-17T16:57:43.226372 #7964] ERROR -- : Unable to get metric 'HOST_MEM_ALOC'. MAX_MEM is 0.
+E, [2015-05-17T16:57:43.226558 #7964] ERROR -- : Unable to get metric 'HOST_MEM_LOAD'. MAX_MEM is 0.
+E, [2015-05-17T16:57:43.226812 #7964] ERROR -- : Unable to get metric 'HOST_MEM_WASTE'. HOST_MEM_ALOC is missing.
+E, [2015-05-17T16:57:43.226968 #7964] ERROR -- : Unable to get metric 'HOST_CPU_ALOC'. MAX_CPU is 0.
+E, [2015-05-17T16:57:43.227776 #7964] ERROR -- : Unable to get metric 'HOST_CPU_LOAD'. MAX_CPU is 0.
+E, [2015-05-17T16:57:43.228383 #7964] ERROR -- : Unable to get metric 'HOST_CPU_WASTE'. HOST_CPU_ALOC is missing.
+I, [2015-05-17T16:57:43.251970 #7964]  INFO -- : Fetched data for 3 VMs, 2 hosts, 4 datastores and 1 clusters.
+I, [2015-05-17T16:57:43.252067 #7964]  INFO -- : Successfully fetched data from ONE.
+I, [2015-05-17T16:57:43.278282 #7964]  INFO -- : Successfully stored 75 data points.
+I, [2015-05-17T16:57:43.278375 #7964]  INFO -- : Successfully stored 75 data points.
+E, [2015-05-17T16:57:58.340411 #7964] ERROR -- : Unable to get metric 'HOST_MEM_ALOC'. MAX_MEM is 0.
+E, [2015-05-17T16:57:58.340546 #7964] ERROR -- : Unable to get metric 'HOST_MEM_LOAD'. MAX_MEM is 0.
+E, [2015-05-17T16:57:58.340606 #7964] ERROR -- : Unable to get metric 'HOST_MEM_WASTE'. HOST_MEM_ALOC is missing.
+E, [2015-05-17T16:57:58.340807 #7964] ERROR -- : Unable to get metric 'HOST_CPU_ALOC'. MAX_CPU is 0.
+E, [2015-05-17T16:57:58.340855 #7964] ERROR -- : Unable to get metric 'HOST_CPU_LOAD'. MAX_CPU is 0.
+E, [2015-05-17T16:57:58.340899 #7964] ERROR -- : Unable to get metric 'HOST_CPU_WASTE'. HOST_CPU_ALOC is missing.
+I, [2015-05-17T16:57:58.355678 #7964]  INFO -- : Fetched data for 3 VMs, 2 hosts, 4 datastores and 1 clusters.
+I, [2015-05-17T16:57:58.355776 #7964]  INFO -- : Successfully fetched data from ONE.
+I, [2015-05-17T16:57:58.377838 #7964]  INFO -- : Successfully stored 75 data points.
+I, [2015-05-17T16:57:58.377966 #7964]  INFO -- : Successfully stored 75 data points.
+E, [2015-05-17T16:58:13.453706 #7964] ERROR -- : Unable to get metric 'HOST_MEM_ALOC'. MAX_MEM is 0.
+E, [2015-05-17T16:58:13.453885 #7964] ERROR -- : Unable to get metric 'HOST_MEM_LOAD'. MAX_MEM is 0.
+E, [2015-05-17T16:58:13.453980 #7964] ERROR -- : Unable to get metric 'HOST_MEM_WASTE'. HOST_MEM_ALOC is missing.
+E, [2015-05-17T16:58:13.454058 #7964] ERROR -- : Unable to get metric 'HOST_CPU_ALOC'. MAX_CPU is 0.
+E, [2015-05-17T16:58:13.454151 #7964] ERROR -- : Unable to get metric 'HOST_CPU_LOAD'. MAX_CPU is 0.
+E, [2015-05-17T16:58:13.454203 #7964] ERROR -- : Unable to get metric 'HOST_CPU_WASTE'. HOST_CPU_ALOC is missing.
+I, [2015-05-17T16:58:13.474496 #7964]  INFO -- : Fetched data for 3 VMs, 2 hosts, 4 datastores and 1 clusters.
+I, [2015-05-17T16:58:13.474604 #7964]  INFO -- : Successfully fetched data from ONE.
+I, [2015-05-17T16:58:13.497888 #7964]  INFO -- : Successfully stored 75 data points.
+I, [2015-05-17T16:58:13.498017 #7964]  INFO -- : Successfully stored 75 data points.
+E, [2015-05-17T16:58:28.554575 #7964] ERROR -- : Unable to get metric 'HOST_MEM_ALOC'. MAX_MEM is 0.
+E, [2015-05-17T16:58:28.554771 #7964] ERROR -- : Unable to get metric 'HOST_MEM_LOAD'. MAX_MEM is 0.
+E, [2015-05-17T16:58:28.554848 #7964] ERROR -- : Unable to get metric 'HOST_MEM_WASTE'. HOST_MEM_ALOC is missing.
+E, [2015-05-17T16:58:28.554898 #7964] ERROR -- : Unable to get metric 'HOST_CPU_ALOC'. MAX_CPU is 0.
+E, [2015-05-17T16:58:28.555085 #7964] ERROR -- : Unable to get metric 'HOST_CPU_LOAD'. MAX_CPU is 0.
+E, [2015-05-17T16:58:28.555137 #7964] ERROR -- : Unable to get metric 'HOST_CPU_WASTE'. HOST_CPU_ALOC is missing.
+I, [2015-05-17T16:58:28.570603 #7964]  INFO -- : Fetched data for 3 VMs, 2 hosts, 4 datastores and 1 clusters.
+I, [2015-05-17T16:58:28.570708 #7964]  INFO -- : Successfully fetched data from ONE.
+I, [2015-05-17T16:58:28.595736 #7964]  INFO -- : Successfully stored 75 data points.
+I, [2015-05-17T16:58:28.595837 #7964]  INFO -- : Successfully stored 75 data points.
+E, [2015-05-17T16:58:43.651964 #7964] ERROR -- : Unable to get metric 'HOST_MEM_ALOC'. MAX_MEM is 0.
+E, [2015-05-17T16:58:43.652090 #7964] ERROR -- : Unable to get metric 'HOST_MEM_LOAD'. MAX_MEM is 0.
+E, [2015-05-17T16:58:43.652144 #7964] ERROR -- : Unable to get metric 'HOST_MEM_WASTE'. HOST_MEM_ALOC is missing.
+E, [2015-05-17T16:58:43.652197 #7964] ERROR -- : Unable to get metric 'HOST_CPU_ALOC'. MAX_CPU is 0.
+E, [2015-05-17T16:58:43.652238 #7964] ERROR -- : Unable to get metric 'HOST_CPU_LOAD'. MAX_CPU is 0.
+E, [2015-05-17T16:58:43.652317 #7964] ERROR -- : Unable to get metric 'HOST_CPU_WASTE'. HOST_CPU_ALOC is missing.
+I, [2015-05-17T16:58:43.670538 #7964]  INFO -- : Fetched data for 3 VMs, 2 hosts, 4 datastores and 1 clusters.
+I, [2015-05-17T16:58:43.670634 #7964]  INFO -- : Successfully fetched data from ONE.
+I, [2015-05-17T16:58:43.692999 #7964]  INFO -- : Successfully stored 75 data points.
+I, [2015-05-17T16:58:43.693108 #7964]  INFO -- : Successfully stored 75 data points.

data/lib/one2influx/config.rb

@@ -6,7 +6,7 @@ class One2Influx::Config
   ## EDIT THIS PART IF NECESSARY                                              ##
   ##############################################################################
 
-  # Allowed values are number of seconds, minutes, hours
+  # Data fetch interval. Allowed values are number of seconds, minutes, hours
   #  separated by space
   @@fetch_interval = '30 seconds'
 
@@ -14,7 +14,7 @@ class One2Influx::Config
   #####################################
   @@one = {
       # Login credentials separated by semicolon
-      credentials: 'user:password',
+      credentials: 'oneadmin:opennebula',
 
       # XML_RPC endpoint where OpenNebula is listening
       endpoint: 'http://localhost:2633/RPC2'
@@ -36,8 +36,6 @@ class One2Influx::Config
       database: 'test',
 
       # Retention policy for records with the smallest granularity
-      # you have to create retention policy manually if you want to change
-      # this one
       policy: 'ten_hours'
   }
 
@@ -47,7 +45,8 @@ class One2Influx::Config
       # Level to use. Logger::INFO, Logger::WARN, Logger::ERROR are supported
       level: Logger::INFO,
 
-      # Path to log file
+      # Path to log file, when empty, one2influx.log is written into directory
+      # where the binary is run from
       path: ''
   }
 
@@ -62,22 +61,33 @@ class One2Influx::Config
               HOST_NAME: 'NAME',
               CLUSTER_ID: 'CLUSTER_ID',
               CLUSTER_NAME: 'CLUSTER',
+              #HOST_STATE: 'STATE', # [int] host state
+              #IM_MAD: 'IM_MAD',    # [string] monitoring manager driver
+              #VM_MAD: 'VM_MAD',    # [string] virtualization manager driver
+              #VN_MAD: 'VN_MAD',    # [string] virtual network manager driver
               DSS_IDS: ''  # [string] IDs of datastores that this host uses
                            #  encoded in form ,,ID_1,,ID_2...,,
           },
           metrics: [
               'MEM_USAGE', # [kB] memory requested by VMs
               'MAX_MEM',   # [kB] total memory available in host
-              'FREE_MEM',  # [kB] free memory returned by probes
-              'USED_MEM',  # [kB] memory used by all host processes over MAX_MEM
-              'CPU_USAGE', # [%] usage of CPU calculated by ONE as the summatory
+              'FREE_MEM',  # [kB] free memory in host, MAX_MEM - USED_MEM
+              'USED_MEM',  # [kB] used memory in host -(buffers+cache)
+              'CPU_USAGE', # [%] usage of CPU calculated by ONE as the sum of
                            #     CPU requested by all VMs running in the host
               'MAX_CPU',   # [%] total CPU in the host (number of cores * 100)
               'FREE_CPU',  # [%] free CPU as returned by the probes
               'USED_CPU'   # [%] CPU used by all host processes over a total
                            #     of # cores * 100
           ],
-          cust_metrics: []
+          cust_metrics: [
+              #'HOST_MEM_ALOC',  # [%] MEM_USAGE / MAX_MEM
+              #'HOST_MEM_LOAD',  # [%] USED_MEM / MAX_MEM
+              #'HOST_MEM_WASTE', # [] HOST_MEM_ALOC / HOST_MEM_LOAD
+              #'HOST_CPU_ALOC',  # [%] CPU_USAGE / MAX_CPU
+              #'HOST_CPU_LOAD',  # [%] USED_CPU / MAX_CPU
+              #'HOST_CPU_WASTE', # [] HOST_CPU_ALOC / HOST_CPU_LOAD
+          ]
       },
       # Virtual machine
       vm:   {
@@ -87,10 +97,12 @@ class One2Influx::Config
               HOST_ID: 'HOST_ID',
               HOST_NAME: 'HOST_NAME',
               VM_NAME: 'NAME',
-              UID: 'UID',       # [int] user's ID
-              GID: 'GID',       # [int] group's ID
-              UNAME: 'UNAME',   # [string] user's name
-              GNAME: 'GNAME'    # [string] group's name
+              UID: 'UID',            # [int] user's ID
+              GID: 'GID',            # [int] group's ID
+              UNAME: 'UNAME',        # [string] user's name
+              GNAME: 'GNAME',        # [string] group's name
+              #VM_STATE: 'STATE',     # [int] virtual machine state
+              #LCM_STATE: 'LCM_STATE' # [int] substates for ACTIVE state
           },
           metrics: [
               'MEMORY', # [kB] memory consumption
@@ -124,7 +136,9 @@ class One2Influx::Config
               'FREE_MB',  # [MB] free space
               'USED_MB'   # [MB] used space
           ],
-          cust_metrics: []
+          cust_metrics: [
+              #'DS_LOAD'   # [%] USED_MB / TOTAL_MB
+          ]
       },
       # Cluster
       cluster: {
@@ -132,22 +146,23 @@ class One2Influx::Config
               CLUSTER_NAME: 'NAME'
           },
           metrics: [
-              'CLUSTER_MEM_USAGE', # [kB] memory requested by all VMs in cluster
-              'CLUSTER_MAX_MEM',   # [kB] total memory available in all hosts
-              'CLUSTER_FREE_MEM',  # [kB] free memory of all hosts returned
-                                   #  by probes
-              'CLUSTER_USED_MEM',  # [kB] memory used by all processes of all
-                                   #  hosts over MAX_MEM
-              'CLUSTER_CPU_USAGE', # [%] usage of CPU calculated by ONE as the
-                                   #  sum of CPU requested by all VMs running
-                                   #  in the cluster
-              'CLUSTER_MAX_CPU',   # [%] total CPU in the cluster
-                                   #  (number of cores * 100)
-              'CLUSTER_FREE_CPU',  # [%] free CPU as returned by the probes
-              'CLUSTER_USED_CPU'   # [%] CPU used by all processes of all hosts
-                                   #  over a total of # cores * 100
+              'CLUSTER_MEM_USAGE', # [kB] sum of MEM_USAGE for whole cluster
+              'CLUSTER_MAX_MEM',   # [kB] sum of MAX_MEM for whole cluster
+              'CLUSTER_FREE_MEM',  # [kB] sum of FREE_MEM for whole cluster
+              'CLUSTER_USED_MEM',  # [kB] sum of USED_MEM for whole cluster
+              'CLUSTER_CPU_USAGE', # [%] sum of CPU_USAGE for whole cluster
+              'CLUSTER_MAX_CPU',   # [%] sum of MAX_CPU for whole cluster
+              'CLUSTER_FREE_CPU',  # [%] sum of FREE_CPU for whole cluster
+              'CLUSTER_USED_CPU'   # [%] sum of USED_CPU for whole cluster
           ],
-          cust_metrics: []
+          cust_metrics: [
+              #'CLUSTER_MEM_ALOC',  # [%] CLUSTER_MEM_USAGE / CLUSTER_MAX_MEM
+              #'CLUSTER_MEM_LOAD',  # [%]CLUSTER_USED_MEM / CLUSTER_MAX_MEM
+              #'CLUSTER_MEM_WASTE', # [] CLUSTER_MEM_ALOC / CLUSTER_MEM_LOAD
+              #'CLUSTER_CPU_ALOC',  # [%] CLUSTER_CPU_USAGE / CLUSTER_MAX_CPU
+              #'CLUSTER_CPU_LOAD',  # [%] CLUSTER_USED_CPU / CLUSTER_MAX_CPU
+              #'CLUSTER_CPU_WASTE', # [] CLUSTER_CPU_ALOC / CLUSTER_CPU_LOAD
+          ]
       }
   }
 

data/lib/one2influx/data.rb

@@ -17,8 +17,8 @@ class One2Influx::Data
     raise rc.message if OpenNebula.is_error?(rc)
 
     # Get data from all hosts in the pool
-    hosts_xml = {} # XML of all hosts, passed to theirs cluster
-    oo_hosts = []  # array of all instances of OneObject::Host
+    oo_hosts = {}  # hash of all instances of OneObject::Host
+                   #   in form {ID => host}
     host_pool.each do |one_host|
       host = ::One2Influx::Host.new(one_host.to_xml, @client)
       # Get data from all VMs belonging to current host
@@ -31,8 +31,7 @@ class One2Influx::Data
         @points += vm.serialize_as_points
         counter[:vms] += 1
       end
-      hosts_xml[host.tags[:HOST_ID]] = one_host.to_xml
-      oo_hosts << host
+      oo_hosts[host.tags[:HOST_ID].to_sym] = host
       @points += host.serialize_as_points
       counter[:hosts] += 1
     end
@@ -41,10 +40,10 @@ class One2Influx::Data
     cluster_pool = OpenNebula::ClusterPool.new(@client)
     rc = cluster_pool.info
     raise rc.message if OpenNebula.is_error?(rc)
-#
+
     # Get data from all clusters in the pool
     cluster_pool.each do |one_cluster|
-      cluster = ::One2Influx::Cluster.new(one_cluster.to_xml, @client,hosts_xml)
+      cluster = ::One2Influx::Cluster.new(one_cluster.to_xml, @client, oo_hosts)
       @points += cluster.serialize_as_points
       counter[:clusters] += 1
     end
@@ -58,7 +57,7 @@ class One2Influx::Data
     # It has form {DS_ID_1: [HOST_ID_1, HOST_ID_2, ...], ...}
     ds_has_hosts = {}
     if $CFG.storage[:ds][:tags].has_key? :HOSTS_IDS
-      oo_hosts.each do |host|
+      oo_hosts.each do |id, host|
         host.datastores.each do |ds|
           ds_has_hosts[ds] ||= []
           ds_has_hosts[ds] << host.tags[:HOST_ID]

data/lib/one2influx/influx.rb

@@ -43,7 +43,7 @@ class One2Influx::Influx
       req.body = payload.to_json
       response = make_request(req)
 
-      if (not response.nil?) && (response.code != '200')
+      if (not response.nil?) && (response.code != '204')
         raise 'Failed to store data to InfluxDB. Received HTTP code ' +
                   "#{response.code}, body: #{response.body}"
       end

data/lib/one2influx/one_object/cluster.rb

@@ -4,19 +4,29 @@ class One2Influx::Cluster < ::One2Influx::OneObject
   #
   # @param [string] xml representation of cluster
   # @param [OpenNebula::Client] client connection link to ONE API
-  # @param [hash] hosts_xml xml representations of hosts in this cluster,
-  #   in hash form {HOST_ID : XML_STRING}
-  def initialize(xml, client, hosts_xml)
+  # @param [hash] oo_hosts hash in form {ID => OneObject::Host} of all hosts
+  def initialize(xml, client, oo_hosts)
     # Load configuration
     @tag_names = $CFG.storage[:cluster][:tags]
     @metric_names = $CFG.storage[:cluster][:metrics]
     @custom_metric_names = $CFG.storage[:cluster][:cust_metrics]
-    @hosts_xml = hosts_xml
+    @hosts = oo_hosts
 
     super(xml, client)
   end
 
-  protected
+  private
+
+  # @param [OneObject::Host] host host to fetch metric from
+  # @param [string] metric metric to fetch
+  # @raise [Exception] fetch error
+  # @return metric from host
+  def fetch_host_metric(host, metric)
+      ni_element = host.doc.css(metric).first
+      raise if ni_element.nil?
+
+      ni_element.content.to_i
+  end
 
   # Overrides OneObject init_metrics because cluster itself doesn't
   # have any own metrics, so they are gathered as sum of metrics of
@@ -28,26 +38,95 @@ class One2Influx::Cluster < ::One2Influx::OneObject
 
     host_ids = @doc.xpath('//HOSTS/ID').map { |node| node.content }
     host_ids.each do |id|
-      host_doc = Nokogiri::XML(@hosts_xml[id])
+      host = @hosts[id.to_sym]
+
       @metric_names.each do |metric|
+        @metrics[metric.to_sym] ||= 0
         host_metric = metric.split('CLUSTER_')[1]
-        unless host_metric.nil?
-          ni_element = host_doc.css(host_metric).first
+        next if host_metric.nil?
+
+        if host.metrics.has_key? host_metric.to_sym
+          @metrics[metric.to_sym] += host.metrics[host_metric.to_sym].to_i
+        else
+          ni_element = host.doc.css(host_metric).first
           if ni_element.nil?
-            $LOG.error "Unable to get metric '#{metric}' in #{self.class}."
-          else
-            @metrics[metric.to_s] += ni_element.content.to_i
+            # Calculation of this metric would be misleading without this
+            #   value, so I rather remove whole metric and log failure
+            @metric_names = @metric_names.delete(metric)
+            @metrics = @metrics.delete(metric.to_sym)
+            $LOG.error "Unable to get metric '#{metric}' in #{self.class}." +
+                           "XML parsing error in host ID=#{id}."
+            next
           end
+
+          @metrics[metric.to_sym] += ni_element.content.to_i
         end
       end
     end
+  end
 
-    # Get real percentage for cluster
-    hosts_count = host_ids.length == 0 ? 1 : host_ids.length
-    @metrics.each do |metric, value|
-      if metric.to_s.include? 'CPU'
-        @metrics[metric] = value / hosts_count
-      end
+  # @raise [Exception] calculation error
+  # @return [float] CLUSTER_MEM_USAGE / CLUSTER_MAX_MEM
+  def get_CLUSTER_MEM_ALOC
+    raise 'CLUSTER_MEM_USAGE is missing.' unless @metrics.has_key? :CLUSTER_MEM_USAGE
+    raise 'CLUSTER_MAX_MEM is missing.' unless @metrics.has_key? :CLUSTER_MAX_MEM
+    raise 'CLUSTER_MAX_MEM is 0.' if @metrics[:CLUSTER_MAX_MEM] == '0'
+
+    (@metrics[:CLUSTER_MEM_USAGE].to_f / @metrics[:CLUSTER_MAX_MEM].to_f).round(4)*100
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] CLUSTER_USED_MEM / CLUSTER_MAX_MEM
+  def get_CLUSTER_MEM_LOAD
+    raise 'CLUSTER_USED_MEM is missing.' unless @metrics.has_key? :CLUSTER_USED_MEM
+    raise 'CLUSTER_MAX_MEM is missing.' unless @metrics.has_key? :CLUSTER_MAX_MEM
+    raise 'CLUSTER_MAX_MEM is 0.' if @metrics[:CLUSTER_MAX_MEM] == '0'
+
+    (@metrics[:CLUSTER_USED_MEM].to_f / @metrics[:CLUSTER_MAX_MEM].to_f).round(4)*100
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] CLUSTER_MEM_ALOC / CLUSTER_MEM_LOAD
+  def get_CLUSTER_MEM_WASTE
+    raise 'CLUSTER_MEM_ALOC is missing.' unless @metrics.has_key? :CLUSTER_MEM_ALOC
+    raise 'CLUSTER_MEM_LOAD is missing.' unless @metrics.has_key? :CLUSTER_MEM_LOAD
+
+    mem_load = @metrics[:CLUSTER_MEM_LOAD] == 0 ? 0.001 : @metrics[:CLUSTER_MEM_LOAD]
+
+    (@metrics[:CLUSTER_MEM_ALOC] / mem_load).round(2)
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] CLUSTER_CPU_USAGE / CLUSTER_MAX_CPU
+  def get_CLUSTER_CPU_ALOC
+    raise 'CLUSTER_CPU_USAGE is missing.' unless @metrics.has_key? :CLUSTER_CPU_USAGE
+    raise 'CLUSTER_MAX_CPU is missing.' unless @metrics.has_key? :CLUSTER_MAX_CPU
+    raise 'CLUSTER_MAX_CPU is 0.' if @metrics[:CLUSTER_MAX_CPU] == '0'
+
+    (@metrics[:CLUSTER_CPU_USAGE].to_f / @metrics[:CLUSTER_MAX_CPU].to_f).round(4)*100
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] CLUSTER_USED_CPU / CLUSTER_MAX_CPU
+  def get_CLUSTER_CPU_LOAD
+    raise 'CLUSTER_USED_CPU is missing.' unless @metrics.has_key? :CLUSTER_USED_CPU
+    raise 'CLUSTER_MAX_CPU is missing.' unless @metrics.has_key? :CLUSTER_MAX_CPU
+    raise 'CLUSTER_MAX_CPU is 0.' if @metrics[:CLUSTER_MAX_CPU] == '0'
+
+    (@metrics[:CLUSTER_USED_CPU].to_f / @metrics[:CLUSTER_MAX_CPU].to_f).round(4)*100
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] CLUSTER_CPU_ALOC / CLUSTER_CPU_LOAD
+  def get_CLUSTER_CPU_WASTE
+    raise 'CLUSTER_CPU_ALOC is missing.' unless @metrics.has_key? :CLUSTER_CPU_ALOC
+    raise 'CLUSTER_CPU_LOAD is missing.' unless @metrics.has_key? :CLUSTER_CPU_LOAD
+
+    cpu_load = @metrics[:CLUSTER_CPU_LOAD]
+    if @metrics[:CLUSTER_CPU_LOAD] == 0
+      cpu_load = 0.001
     end
+
+    (@metrics[:CLUSTER_CPU_ALOC] / cpu_load).round(2)
   end
 end

data/lib/one2influx/one_object/datastore.rb

@@ -27,4 +27,17 @@ class One2Influx::Datastore < ::One2Influx::OneObject
       @tags[:HOSTS_IDS] = ',,' + hosts.join(',,') + ',,'
     end
   end
+
+  private
+
+  # @raise [Exception] calculation error
+  # @return [float] USED_MB / TOTAL_MB
+  def get_DS_LOAD
+    raise 'USED_MB is missing.' unless @metrics.has_key? :USED_MB
+    raise 'TOTAL_MB is missing.' unless @metrics.has_key? :TOTAL_MB
+    raise 'TOTAL_MB is 0.' if @metrics[:TOTAL_MB] == '0'
+
+    (@metrics[:USED_MB].to_f / @metrics[:TOTAL_MB].to_f).round(2)
+  end
+
 end

data/lib/one2influx/one_object/host.rb

@@ -44,4 +44,69 @@ class One2Influx::Host < ::One2Influx::OneObject
       @datastores << ds.content
     end
   end
+
+  # @raise [Exception] calculation error
+  # @return [float] MEM_USAGE / MAX_MEM
+  def get_HOST_MEM_ALOC
+    raise 'MEM_USAGE is missing.' unless @metrics.has_key? :MEM_USAGE
+    raise 'MAX_MEM is missing.' unless @metrics.has_key? :MAX_MEM
+    raise 'MAX_MEM is 0.' if @metrics[:MAX_MEM] == '0'
+
+    (@metrics[:MEM_USAGE].to_f / @metrics[:MAX_MEM].to_f).round(4)*100
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] USED_MEM / MAX_MEM
+  def get_HOST_MEM_LOAD
+    raise 'USED_MEM is missing.' unless @metrics.has_key? :USED_MEM
+    raise 'MAX_MEM is missing.' unless @metrics.has_key? :MAX_MEM
+    raise 'MAX_MEM is 0.' if @metrics[:MAX_MEM] == '0'
+
+    (@metrics[:USED_MEM].to_f / @metrics[:MAX_MEM].to_f).round(4)*100
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] HOST_MEM_ALOC / HOST_MEM_LOAD
+  def get_HOST_MEM_WASTE
+    raise 'HOST_MEM_ALOC is missing.' unless @metrics.has_key? :HOST_MEM_ALOC
+    raise 'HOST_MEM_LOAD is missing.' unless @metrics.has_key? :HOST_MEM_LOAD
+
+    mem_load = @metrics[:HOST_MEM_LOAD] == 0 ? 0.001 : @metrics[:HOST_MEM_LOAD]
+
+    (@metrics[:HOST_MEM_ALOC] / mem_load).round(4)*100
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] CPU_USAGE / MAX_CPU
+  def get_HOST_CPU_ALOC
+    raise 'CPU_USAGE is missing.' unless @metrics.has_key? :CPU_USAGE
+    raise 'MAX_CPU is missing.' unless @metrics.has_key? :MAX_CPU
+    raise 'MAX_CPU is 0.' if @metrics[:MAX_CPU] == '0'
+
+    (@metrics[:CPU_USAGE].to_f / @metrics[:MAX_CPU].to_f).round(4)*100
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] USED_CPU / MAX_CPU
+  def get_HOST_CPU_LOAD
+    raise 'USED_CPU is missing.' unless @metrics.has_key? :USED_CPU
+    raise 'MAX_CPU is missing.' unless @metrics.has_key? :MAX_CPU
+    raise 'MAX_CPU is 0.' if @metrics[:MAX_CPU] == '0'
+
+    (@metrics[:USED_CPU].to_f / @metrics[:MAX_CPU].to_f).round(4)*100
+  end
+
+  # @raise [Exception] calculation error
+  # @return [float] HOST_CPU_ALOC / HOST_CPU_LOAD
+  def get_HOST_CPU_WASTE
+    raise 'HOST_CPU_ALOC is missing.' unless @metrics.has_key? :HOST_CPU_ALOC
+    raise 'HOST_CPU_LOAD is missing.' unless @metrics.has_key? :HOST_CPU_LOAD
+
+    cpu_load = @metrics[:HOST_CPU_LOAD]
+    if @metrics[:HOST_CPU_LOAD] == 0
+      cpu_load = 0.001
+    end
+
+    (@metrics[:HOST_CPU_ALOC] / cpu_load).round(2)
+  end
 end

data/lib/one2influx/one_object/one_object.rb

@@ -47,7 +47,8 @@ class One2Influx::OneObject
     @tag_names.each do |influx_name, one_name|
       ni_element = @doc.css(one_name).first
       if ni_element.nil?
-        $LOG.error "Unable to get tag '#{one_name}' in #{self.class}."
+        $LOG.error "Unable to get tag '#{one_name}' in #{self.class}." +
+            'XML parsing error.'
       else
         @tags[influx_name.to_sym] = ni_element.content
       end
@@ -58,7 +59,8 @@ class One2Influx::OneObject
     @metric_names.each do |metric|
       ni_element = @doc.css(metric).first
       if ni_element.nil?
-        $LOG.error "Unable to get metric '#{metric}' in #{self.class}."
+        $LOG.error "Unable to get metric '#{metric}' in #{self.class}." +
+            'XML parsing error.'
       else
         @metrics[metric.to_sym] = ni_element.content
       end
@@ -67,7 +69,11 @@ class One2Influx::OneObject
 
   def init_custom_metrics
     @custom_metric_names.each do |metric|
-      @metrics[metric.to_sym] = self.send("get_#{metric.to_s}")
+      begin
+        @metrics[metric.to_sym] = self.send("get_#{metric.to_s}")
+      rescue Exception => e
+        $LOG.error "Unable to get metric '#{metric}'. #{e.message}"
+      end
     end
   end
 end

data/lib/one2influx/one_object/virtual_machine.rb

@@ -19,6 +19,8 @@ class One2Influx::VirtualMachine < ::One2Influx::OneObject
     super(xml, client)
   end
 
+  private
+
   # Computes percentage usage of memory for virtual machine.
   #  Values might go over 1.0 as there is an overhead
   # @return [float] current usage over max usage
@@ -35,10 +37,9 @@ class One2Influx::VirtualMachine < ::One2Influx::OneObject
 
     doc = Nokogiri::XML(template.to_xml)
     ni_element = doc.xpath('//TEMPLATE/MEMORY').first
-    puts @metrics
+
     if ni_element.nil? || @metrics[:MEMORY].nil?
-      $LOG.error "Unable to get metric 'MEMORY_PERC' in #{self.class}."
-      return
+      raise 'Unable to parse VM template.'
     end
 
     # Convert //TEMPLATE/MEMORY from MB to kB as //VM/CPU is in kB

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: one2influx
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Matej Zidek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -85,10 +85,12 @@ description: One2influx is small ruby daemon for getting monitoring data from Op
 email: zidek.matej@gmail.com
 executables:
 - one2influx
+- one2influx.log
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/one2influx
+- bin/one2influx.log
 - lib/one2influx.rb
 - lib/one2influx/config.rb
 - lib/one2influx/data.rb