opennebula-cli 5.11.90.pre → 5.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f9d505a4c075609888337b302394b8ad09f564
-  data.tar.gz: 5f91c8dd57ee2e6ebe71f6a5563d289e68ed97ee
+  metadata.gz: d3699c3c2d650493465035066057a79c20a59f40
+  data.tar.gz: 1577fe3f9e9ca3af5db399a0d9bc3587ad81cea4
 SHA512:
-  metadata.gz: 45a4ca86499b26e4f8d94178384b7266da3764e0c0169226b1b8f3e582ba09298b01387f852dea0b9d05e66420ea74a2ee84295101aca55366d9adfa92d402e6
-  data.tar.gz: 547591723faffe0aa33786c3f4ee863576348a618e30ede74df643e98c664afca036dae467f277cce9ef3f063f93391e64ae5e48123156968769ab0e255c6244
+  metadata.gz: 7c85e13cf698bcb599380d24b4eff94fc8c5ea157947ba42ec4bf2cd56bbf83043a4bc660fe78da567e35b3c4f0b9780fcbc1105886d79bc05d21e6495fdb295
+  data.tar.gz: 334c79870dd8a1dde30dfd971f0007d8f925cb1bccc870d863a0e86509f9840671754a4a4b17ec51d21f29cd458997e4a99140c3aa325c210018120e6e8012a9

data/bin/onehost

@@ -97,6 +97,52 @@ CommandParser::CmdParser.new(ARGV) do
     CREAT_OPTIONS = [IM, VMM, OneClusterHelper::CLUSTER, TYPE]
     SYNC_OPTIONS  = [OneClusterHelper::CLUSTER, FORCE, SSH]
 
+    ########################################################################
+    # Monitoring PLOT options
+    ########################################################################
+    START_T = {
+        :name => 'start',
+        :large => '--start date',
+        :description => 'Start date to show data',
+        :format => String
+    }
+
+    END_T = {
+        :name => 'end',
+        :large => '--end date',
+        :description => 'End date to show data',
+        :format => String
+    }
+
+    UNIT = {
+        :name => 'unit',
+        :large => '--unit unit',
+        :description => 'Unit to format data',
+        :format => String
+    }
+
+    TABLE = {
+        :name => 'table',
+        :large => '--table',
+        :description => 'Show monitoring information in table format'
+    }
+
+    N_ELEMS = {
+        :name => 'n_elems',
+        :large => '--n elements',
+        :description => 'Number of records to show',
+        :format => Integer
+    }
+
+    CSV_WITH_SEP = {
+        :name => 'csv',
+        :large => '--csv separator',
+        :description => 'Show data in CSV format',
+        :format => String
+    }
+
+    PLOT_OPTS = [START_T, END_T, UNIT, TABLE, N_ELEMS, CSV_WITH_SEP]
+
     ########################################################################
     # Formatters for arguments
     ########################################################################
@@ -304,4 +350,25 @@ CommandParser::CmdParser.new(ARGV) do
             :options => [OneClusterHelper::CLUSTER] do
         helper.forceupdate(args[0], options)
     end
+
+    monitoring_desc = <<-EOT.unindent
+        Show monitoring metrics in a graphic
+    EOT
+
+    command :monitoring,
+            monitoring_desc,
+            :hostid,
+            :attr,
+            :options => PLOT_OPTS do
+        helper.perform_action(args[0], options, 'monitoring') do |host|
+            rc = host.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts rc.message
+                exit(-1)
+            end
+
+            helper.monitoring(host, args[1], options)
+        end
+    end
 end

data/lib/cli_helper.rb

@@ -356,6 +356,12 @@ module CLIHelper
         # @param options [Hash] Object with CLI user options
         # @param top     [Boolean]     True to not update columns again
         def show(data, options = {}, top = false)
+            if options[:list]
+                @cli_columns = options[:list].collect {|o| o.upcase.to_sym }
+            else
+                @cli_columns = @default_columns
+            end
+
             update_columns(options) unless top
 
             if data.is_a? Hash
@@ -477,7 +483,7 @@ module CLIHelper
 
         # Get header in string format
         def header_str
-            @default_columns.collect do |c|
+            @cli_columns.collect do |c|
                 if @columns[c]
                     format_str(c, c.to_s)
                 else
@@ -495,12 +501,12 @@ module CLIHelper
 
             update_columns_size(options)
 
+            options[:csv_del] ? del = options[:csv_del] : del = ','
+
             if !options[:csv] && (!options.key? :no_header)
                 CLIHelper.print_header(header_str)
-            end
-
-            if options[:csv] && (!options.key? :no_header)
-                print_csv_data([@default_columns], options[:csv_del])
+            elsif options[:csv] && (!options.key? :no_header)
+                puts CSV.generate_line(@cli_columns, :col_sep => del)
             end
 
             @res_data ? print_data(@res_data, options) : puts
@@ -528,7 +534,13 @@ module CLIHelper
             del ? del = del : del = ','
 
             data.each do |l|
-                puts CSV.generate_line(l, :col_sep => del)
+                result = []
+
+                @cli_columns.each do |col|
+                    result << l[@default_columns.index(col)]
+                end
+
+                puts CSV.generate_line(result, :col_sep => del)
             end
         end
 
@@ -537,25 +549,26 @@ module CLIHelper
         # @param data        [Array]  Array with data to show
         # @param stat_column [String] Name of the state column
         def print_normal_data(data, stat_column)
-            ncolumns = @default_columns.length
-
             if stat_column
-                stat        = stat_column.upcase.to_sym
-                stat_column = @default_columns.index(stat)
+                stat = stat_column.upcase.to_sym
             else
-                stat_column = @default_columns.index(:STAT)
+                stat = :STAT
             end
 
             data.each do |l|
                 result = []
 
-                ncolumns.times do |i|
+                @cli_columns.each do |col|
+                    i = @default_columns.index(col)
+
+                    # Column might not exist
+                    next unless i
+
                     dat = l[i]
-                    col = @default_columns[i]
 
                     str = format_str(col, dat)
 
-                    str = CLIHelper.color_state(str) if i == stat_column
+                    str = CLIHelper.color_state(str) if col == stat
 
                     result << str
                 end
@@ -570,8 +583,17 @@ module CLIHelper
         #
         # @return        [Array] Array with selected columns information
         def data_array(data, options)
+            # Take default table columns and desired ones by the user
+            cols = @default_columns
+
+            @cli_columns.each do |col|
+                next if @default_columns.include?(col)
+
+                @default_columns.insert(@cli_columns.index(col) + 1, col)
+            end
+
             res_data = data.collect do |d|
-                @default_columns.collect do |c|
+                cols.collect do |c|
                     @columns[c][:proc].call(d).to_s if @columns[c]
                 end
             end
@@ -580,10 +602,6 @@ module CLIHelper
                 filter_data!(res_data, options) if options[:filter]
             end
 
-            return res_data unless options[:list]
-
-            @default_columns = options[:list].collect {|o| o.upcase.to_sym }
-
             res_data
         end
 
@@ -612,7 +630,7 @@ module CLIHelper
         def config_expand_data
             ret = []
 
-            @default_columns.each do |column|
+            @cli_columns.each do |column|
                 expand_c = @columns[column][:expand]
 
                 next unless expand_c
@@ -633,7 +651,7 @@ module CLIHelper
         def config_adjust_data
             ret = []
 
-            @default_columns.each do |column|
+            @cli_columns.each do |column|
                 next unless @columns[column][:adjust]
 
                 ret << column.to_s.downcase
@@ -657,13 +675,13 @@ module CLIHelper
 
             return if terminal_size.nil?
 
-            default_columns = columns_info(@default_columns)
+            default_columns = columns_info(@cli_columns)
             expand_columns  = columns_info(expand_columns)
 
             total_size     = total_columns_size(default_columns)
             columns_size   = total_columns_size(expand_columns)
 
-            terminal_size -= (@default_columns.size - 1)
+            terminal_size -= (@cli_columns.size - 1)
             left_size      = terminal_size - total_size
             remaining_size = left_size
 
@@ -735,7 +753,7 @@ module CLIHelper
             expand_data = []
 
             if expand_all
-                expand_data = @default_columns
+                expand_data = @cli_columns
             elsif expand
                 expand_data += options[:expand]
             end
@@ -749,7 +767,7 @@ module CLIHelper
             unless expand_all
                 adjust.each do |column|
                     column = column.upcase.to_sym
-                    size   = max_size(@default_columns.index(column))
+                    size   = max_size(@cli_columns.index(column))
 
                     if size && size > @columns[column][:size]
                         @columns[column][:adjust] = true
@@ -821,7 +839,7 @@ module CLIHelper
                 m = s.match(/^(.*?)#{operators}(.*?)$/)
 
                 if m
-                    index = @columns.keys.index(m[1].to_sym)
+                    index = @default_columns.index(m[1].upcase.to_sym)
 
                     if index
                         {

data/lib/command_parser.rb

@@ -649,7 +649,7 @@ module CommandParser
             print_formatters
             puts
             if @version
-                puts "## LICENSE"
+                puts "## VERSION"
                 puts @version
             end
         end

data/lib/one_helper.rb

@@ -31,10 +31,6 @@ module OpenNebulaHelper
     ONE_VERSION=<<-EOT
 OpenNebula #{OpenNebula::VERSION}
 Copyright 2002-2020, OpenNebula Project, OpenNebula Systems
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may
-not use this file except in compliance with the License. You may obtain
-a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 EOT
 
     if ONE_LOCATION
@@ -1203,6 +1199,18 @@ EOT
         end
     end
 
+    def OpenNebulaHelper.bytes_to_unit(value, unit = 'K')
+        j = 0
+        i = BinarySufix.index(unit).to_i
+
+        while j < i do
+            value /= 1024.0
+            j += 1
+        end
+
+        value
+    end
+
     # If the cluster name is empty, returns a '-' char.
     #
     # @param str [String || Hash] Cluster name, or empty Hash (when <CLUSTER/>)
@@ -1887,4 +1895,57 @@ EOT
         answers
     end
 
+    # Returns plot object to print it on the CLI
+    #
+    # @param x     [Array]  Data to x axis (Time axis)
+    # @param y     [Array]  Data to y axis
+    # @param attr  [String] Parameter to y axis
+    # @param title [String] Plot title
+    #
+    # @return Gnuplot plot object
+    def OpenNebulaHelper.get_plot(x, y, attr, title)
+        # Require gnuplot gem only here
+        begin
+            require 'gnuplot'
+        rescue LoadError, Gem::LoadError
+            STDERR.puts(
+                'Gnuplot gem is not installed, run `gem install gnuplot` '\
+                'to install it'
+            )
+            exit(-1)
+        end
+
+        # Check if gnuplot is installed on the system
+        unless system('gnuplot --version')
+            STDERR.puts(
+                'Gnuplot is not installed, install it depending on your distro'
+            )
+            exit(-1)
+        end
+
+        Gnuplot.open do |gp|
+            Gnuplot::Plot.new(gp) do |p|
+                p.title title
+
+                p.xlabel 'Time'
+                p.ylabel attr
+
+                p.xdata   'time'
+                p.timefmt "'%H:%M'"
+                p.format  "x '%H:%M'"
+
+                p.style    'data lines'
+                p.terminal 'dumb'
+
+                p.data << Gnuplot::DataSet.new([x, y]) do |ds|
+                    ds.with      = 'linespoints'
+                    ds.linewidth = '3'
+                    ds.using     = '1:2'
+
+                    ds.notitle
+                end
+            end
+        end
+    end
+
 end

data/lib/one_helper/onehost_helper.rb

@@ -17,6 +17,7 @@
 require 'one_helper'
 require 'one_helper/onevm_helper'
 require 'rubygems'
+require 'time'
 
 # implements onehost command
 class OneHostHelper < OpenNebulaHelper::OneHelper
@@ -75,6 +76,15 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
     VERSION_XPATH = "#{TEMPLATE_XPATH}/VERSION"
 
+    MONITORING = {
+        'FREE_CPU'    => 'CAPACITY',
+        'FREE_MEMORY' => 'CAPACITY',
+        'USED_CPU'    => 'CAPACITY',
+        'USED_MEMORY' => 'CAPACITY',
+        'NETRX'       => 'SYSTEM',
+        'NETTX'       => 'SYSTEM'
+    }
+
     def self.rname
         'HOST'
     end
@@ -425,8 +435,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         rc = pool.info
         return -1, rc.message if OpenNebula.is_error?(rc)
 
-        # Assign hosts to threads
-        queue = []
+        host_errors = []
 
         pool.each do |host|
             if host_ids
@@ -435,7 +444,6 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 next if host['CLUSTER_ID'].to_i != cluster_id
             end
 
-            vm_mad = host['VM_MAD'].downcase
             state = host['STATE']
 
             # Skip this host from remote syncing if it's a PUBLIC_CLOUD host
@@ -444,60 +452,104 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             # Skip this host from remote syncing if it's OFFLINE
             next if Host::HOST_STATES[state.to_i] == 'OFFLINE'
 
-            # Skip this host if it is a vCenter cluster
-            next if vm_mad == 'vcenter'
+            rc = host.forceupdate
 
-            queue << host
+            host_errors << host['NAME'] if OpenNebula.is_error?(rc)
         end
 
-        # Run the jobs in threads
-        host_errors = []
-        queue_lock = Mutex.new
-        error_lock = Mutex.new
-        total = queue.length
+        if host_errors.empty?
+            puts 'All hosts updated successfully.'
+            0
+        else
+            STDERR.puts 'Failed to update the following hosts:'
+            host_errors.each {|h| STDERR.puts "* #{h}" }
+            -1
+        end
+    end
 
-        if total.zero?
-            puts 'No hosts are going to be forced.'
-            exit(0)
+    def monitoring(host, attr, options)
+        unit    = options[:unit] || 'G'
+        start_d = options[:start]
+        end_d   = options[:end]
+        n_elems = options[:n_elems] || 8
+
+        # Different available size units
+        units = %w[K M G T]
+
+        # Attrs that need units conversion
+        attrs = %w[FREE_MEMORY USED_MEMORY]
+
+        if unit && !units.include?(unit)
+            STDERR.puts "Invalid unit `#{unit}`"
+            exit(-1)
         end
 
-        ts = (1..NUM_THREADS).map do |_t|
-            Thread.new do
-                loop do
-                    host = nil
-                    size = 0
+        attr      = attr.upcase
+        start_d   = Time.parse(start_d) if start_d
+        end_d     = Time.parse(end_d) if end_d
 
-                    queue_lock.synchronize do
-                        host = queue.shift
-                        size = queue.length
-                    end
+        # Get monitoring data from user path
+        #
+        #   0 -> timestamp
+        #   1 -> data retrieved
+        monitoring_data = host.monitoring(["#{MONITORING[attr]}/#{attr}"])
+        monitoring_data = monitoring_data["#{MONITORING[attr]}/#{attr}"]
 
-                    break unless host
+        if monitoring_data.empty?
+            STDERR.puts 'No monitoring data found'
+            return
+        end
 
-                    hn = host['NAME']
+        # Get data max and min date
+        start_d ||= Time.at(monitoring_data.min {|v| v[0].to_i }[0].to_i)
+        end_d   ||= Time.at(monitoring_data.max {|v| v[0].to_i }[0].to_i)
 
-                    system("onehost offline #{hn} && onehost enable #{hn}")
-                    if !$CHILD_STATUS.success?
-                        error_lock.synchronize do
-                            host_errors << hn
-                        end
-                    else
-                        puts "#{hn} monitoring forced"
-                    end
-                end
+        # Filter data betwen dates
+        monitoring_data.reject! do |v|
+            v[0].to_i < start_d.to_i || v[0].to_i > end_d.to_i
+        end
+
+        if monitoring_data.empty?
+            STDERR.puts "No monitoring data found between #{start_d} " \
+                        "and #{end_d}"
+            return
+        end
+
+        start_d = start_d.strftime('%d/%m/%Y %H:%M')
+        end_d   = end_d.strftime('%d/%m/%Y %H:%M')
+
+        # Parse dcollected data
+        x = monitoring_data.collect {|v| Time.at(v[0].to_i).strftime('%H:%M') }
+        y = monitoring_data.collect do |v|
+            if attrs.include?(attr)
+                # GB is the default unit
+                v = OpenNebulaHelper.bytes_to_unit(v[1].to_i, unit).round(2)
+                "#{v} #{unit}B"
+            else
+                v[1]
             end
         end
 
-        # Wait for threads to finish
-        ts.each {|t| t.join }
+        title = ''
+        title << "Host #{host.id} #{attr} "
+        title << "in #{unit}B " if unit && attrs.include?(attr)
+        title << "from #{start_d} to #{end_d}"
 
-        if host_errors.empty?
-            puts 'All hosts updated successfully.'
-            0
+        x = x.last(n_elems)
+        y = y.last(n_elems)
+
+        if options[:table]
+            print_monitoring_table(x, y, title)
+        elsif options[:csv]
+            csv = ''
+
+            csv << "TIME#{options[:csv]}VALUE\n"
+
+            x.zip(y) {|x_v, y_v| csv << "#{x_v}#{options[:csv]}#{y_v}\n" }
+
+            puts csv
         else
-            STDERR.puts 'Failed to update the following hosts:'
-            host_errors.each {|h| STDERR.puts "* #{h}" }
-            -1
+            puts OpenNebulaHelper.get_plot(x, y, attr, title)
         end
     end
 
@@ -920,4 +972,30 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         table.show(hugepages)
     end
 
+    def print_monitoring_table(x, y, title)
+        puts
+        CLIHelper.print_header(title, true)
+        puts
+
+        table = CLIHelper::ShowTable.new(nil, self) do
+            column :TIME, 'Timestamp', :size => 8, :left => false do |d|
+                d['TIME']
+            end
+
+            column :VALUE, 'Value', :size => 8, :left => false do |d|
+                d['VALUE']
+            end
+
+            default :TIME, :VALUE
+        end
+
+        data = []
+
+        x.zip(y) do |x_v, y_v|
+            data << { 'TIME' => x_v, 'VALUE' => y_v }
+        end
+
+        table.show(data)
+    end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.11.90.pre
+  version: 5.12.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.90.pre
+        version: 5.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.90.pre
+        version: 5.12.0
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables:
@@ -123,9 +123,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1