oml4r 2.9.10 → 2.10.0

data/bin/oml4r-multiple-channel-example

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+# ------------------
+#
+# = oml4r-multiple-channel-example.rb
+#
+# == Description
+#
+# An extension of the 'oml4r-simple.example.rb' example demonstrating the use of
+# multiple destinations for different measurements.
+#
+# == Usage
+#
+# The following write the COS measurements to STDOUT (file:-) and the SIN 
+# measurements to /tmp/ch2.oml (which can be overwrriten with the --oml-ch2 option)
+#
+# % cd $OML_HOME
+# % ruby -I lib examples/oml4r-multiple-channel-example.rb --oml-ch1 file:-
+#
+# Use --oml-help to get all available options
+#
+# % cd $OML_HOME
+# % ruby -I lib examples/oml4r-multiple-channel-example.rb --oml-help
+# 
+require 'rubygems'
+require 'oml4r'
+
+# Define your own Measurement Points
+class SinMP < OML4R::MPBase
+  name :sin
+  channel :ch1
+
+  param :label
+  param :angle, :type => :int32
+  param :value, :type => :double
+end
+
+class CosMP < OML4R::MPBase
+  name :cos
+  channel :ch2
+
+  param :label
+  param :value, :type => :double
+end
+
+# Initialise the OML4R module for your application
+opts = {
+  :appName => 'oml4rSimpleExample',
+  :domain => 'foo',
+  :create_default_channel => false  # we don't need the default channel
+} 
+#  
+ch1 = OML4R::create_channel(:ch1, 'file:/tmp/ch1.oml')    
+ch2 = OML4R::create_channel(:ch2, 'file:/tmp/ch2.oml')    
+
+begin
+  OML4R::init(ARGV, opts) do |op|
+    op.on("--oml-ch1 URL", "Set destination for Channel 1 [#{ch1.url}]") { |url| ch1.url = url }
+    op.on("--oml-ch2 URL", "Set destination for Channel 2 [#{ch2.url}]") { |url| ch2.url = url }
+  end
+rescue OML4R::MissingArgumentException => mex
+  $stderr.puts mex
+  exit
+end
+
+# Now collect and inject some measurements
+500.times do |i|
+  sleep 0.5
+  angle = 15 * i
+  SinMP.inject("label_#{angle}", angle, Math.sin(angle))
+  CosMP.inject("label_#{angle}", Math.cos(angle))    
+end
+
+# Don't forget to close when you are finished
+OML4R::close()
+
+# vim: sw=2

data/bin/oml4r-neuca-beacon

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+# Observes network connectivity on ExoGENI slices
+# Sends UDP broadcast messages and reports incoming messages via OML
+# (including its own) to build a connectivity graph
+
+require 'rubygems'
+require 'eventmachine'
+require 'oml4r'
+require 'parseconfig'
+
+port = 9089
+interval = 10
+neuca_file = "/tmp/neuca-user-data.txt"
+
+abort "Could not run 'neuca-user-data'" if !`neuca-user-data > #{neuca_file}`
+neuca_user_data = ParseConfig.new(neuca_file)['global']
+
+class MyMP < OML4R::MPBase
+  name :received
+  param :actor_id, :type => :string
+  param :slice_id, :type => :string
+  param :reservation_id, :type => :string
+  param :unit_id, :type => :string
+end
+
+oml_opts = {:appName => 'beacon', :domain => neuca_user_data['slice_id'],
+  :nodeID => neuca_user_data['unit_id'], :collect => 'file:-'}
+
+node = OML4R::init(ARGV, oml_opts) do |op|
+  op.banner = "Usage: #{$0} [options]\n"
+  op.on( '-i', '--interval n', "Send UDP broadcast beacon every n seconds [#{interval}]" ) do |i|
+    interval = i.to_i
+  end
+end
+
+module ServerSocket
+    def receive_data data
+        d=eval(data)
+        return if d.class != Hash
+        MyMP.inject(d['actor_id'], d['slice_id'], d['reservation_id'], d['unit_id'])
+    end
+end
+
+EventMachine.run {
+    socket = EventMachine.open_datagram_socket "0.0.0.0", port, ServerSocket
+    EventMachine.add_periodic_timer(interval) {
+      socket.send_datagram(neuca_user_data, "255.255.255.255", port)
+    }
+}
+
+OML4R::close()

data/bin/oml4r-orca-beacon

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+# Observes network connectivity on ORCA slices
+# Sends UDP broadcast messages and reports incoming messages via OML
+# (including its own) to build a connectivity graph
+
+require 'rubygems'
+require 'eventmachine'
+require 'oml4r'
+require 'system/getifaddrs'
+
+port = 9089
+interval = 10
+ip_addresses = []
+NAME = ENV['OML_ID']
+oml_opts = {:appName => 'beacon', :collect => 'file:-'}
+
+abort "Please set the OML_ID environment variable" if NAME.nil?
+
+System.get_ifaddrs.each do |ip|
+  # don't report IP address of loopback interface
+  next if ip[0]==:lo
+  ip_addresses << ip[1][:inet_addr]
+end
+
+class MyMP < OML4R::MPBase
+  name :received
+  param :receiver_name, :type => :string
+  param :sender_name, :type => :string
+  param :ip_addresses, :type => :string
+end
+
+OML4R::init(ARGV, oml_opts) do |op|
+  op.banner = "Usage: #{$0} [options]\n"
+  op.on( '-i', '--interval n', "Send UDP broadcast beacon every n seconds [#{interval}]" ) do |i|
+    interval = i.to_i
+  end
+end
+
+module ServerSocket
+    def receive_data data
+        d=eval(data)
+        return if d.class != Hash
+        # don't log my own beacons
+        MyMP.inject(NAME, d[:sender_name], d[:ip_addresses]) if NAME != d[:sender_name] 
+    end
+end
+
+EventMachine.run {
+    socket = EventMachine.open_datagram_socket "0.0.0.0", port, ServerSocket
+    EventMachine.add_periodic_timer(interval) {
+      socket.send_datagram({:sender_name => NAME, :ip_addresses=> ip_addresses.join(' ')}, "255.255.255.255", port)
+    }
+}
+
+OML4R::close()

data/bin/oml4r-simple-example

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2009 - 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+# ------------------
+#
+# = oml4r-simple-example.rb
+#
+# == Description
+#
+# A very simple straightforward example of OML4R.
+#
+
+# Use the oml4r.rb from ../lib
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+
+require 'rubygems'
+require 'oml4r'
+
+# Define your own Measurement Points
+class SinMP < OML4R::MPBase
+  name :sin
+  #channel :default
+
+  param :label
+  param :angle, :type => :int32
+  param :value, :type => :double
+end
+
+class CosMP < OML4R::MPBase
+  name :cos
+  # channel :ch1
+  # channel :default
+
+  param :label
+  param :value, :type => :double
+end
+
+# Initialise the OML4R module for your application
+opts = {:appName => 'oml4rSimpleExample',
+  :domain => 'foo',
+  :collect => 'file:-'} # Server could also be tcp:host:port
+#  
+#OML4R::create_channel(:ch1, 'file:/tmp/foo.log')    
+
+begin
+  OML4R::init(ARGV, opts)
+rescue OML4R::MissingArgumentException => mex
+  $stderr.puts mex
+  exit
+end
+
+# Now collect and inject some measurements
+500.times do |i|
+  sleep 0.5
+  angle = 15 * i
+  SinMP.inject("label_#{angle}", angle, Math.sin(angle))
+  CosMP.inject("label_#{angle}", Math.cos(angle))    
+end
+
+# Don't forget to close when you are finished
+OML4R::close()
+
+# vim: sw=2

data/bin/oml4r-solar

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'oml4r'
+require 'nokogiri'
+require 'open-uri'
+
+# collects live solar power production data from the front page
+# of the SMA 'Sunny Webbox' plant management web interface
+# and inserts it into OML
+
+def convert_to_W(p)
+  a=p.split(" ")
+  case a[1]    
+  when "W"
+    return a[0].to_f
+  when "kW", "kWh"
+    return a[0].to_f*1000
+  when "MW", "MWh"
+    return a[0].to_f*1000000
+  when "GW", "GWh"
+    # 1.21 gigawatts!!
+    return a[0].to_f*1000000000
+  end
+end
+
+# Define your own Measurement Point
+class MyMP < OML4R::MPBase
+  name :Power
+  param :ts, :type => :string  
+  param :Now_W, :type => :double
+  param :DailyYield_Wh, :type => :double
+  param :TotalYield_Wh, :type => :double  
+end
+
+# poll every second by default
+interval = 1
+host = nil
+
+# Initialise the OML4R module for your application
+oml_opts = {:appName => 'webbox',
+  :domain => 'webbox-solar-live', :nodeID => 'plant1',
+  :collect => 'file:-'}
+
+node = OML4R::init(ARGV, oml_opts) do |op|
+  op.banner = "Usage: #{$0} [options] webbox_ip_addr ...\n"
+  op.on( '-i', '--interval SEC', "Query interval in seconds [#{interval}]" ) do |i|
+    interval = i.to_i
+  end
+  op.on( '-w', '--webbox HOST', "Hostname or IP address of Sunny Webbox" ) do |w|
+    host = w
+  end
+end
+
+abort "Please specify the hostname or IP address of the Sunny Webbox ('-w')." if host.nil?
+
+# catch CTRL-C
+exit_requested = false
+Kernel.trap( "INT" ) { exit_requested = true }
+
+# poll Sunny Webbox
+while !exit_requested
+  doc = Nokogiri::HTML(open("http://#{host}/home.htm"))
+  p=convert_to_W(doc.xpath('//td[@id="Power"]').text)
+  d=convert_to_W(doc.xpath('//td[@id="DailyYield"]').text)
+  t=convert_to_W(doc.xpath('//td[@id="TotalYield"]').text)
+  # do not collect data when no power is generated
+  next if p==0
+  # inject the measurements
+  MyMP.inject(Time.now,p,d,t)
+  sleep interval
+end
+
+OML4R::close()

data/bin/oml4r-wlanconfig

@@ -0,0 +1,151 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2010-2013 National ICT Australia (NICTA), Australia
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+#
+# = oml4r-wlanconfig.rb
+#
+# == Description
+#
+# This is a simple example on how to use the OML4R module to create a simple
+# ruby application that "wraps" around the existing command "wlanconfig".
+# This wrapper invokes "wlanconfig" at regular interval, captures and formats
+# its output (= measurements), and finally pass them to OML4R, which will in 
+# turn either store them in a local file or forward them to the OML Server.
+#
+require "rubygems"
+require "oml4r"
+
+APPNAME = "wlanconfig"
+APPPATH = "/sbin/wlanconfig"
+
+
+#
+# This class defines the Measurement Point for our application and the
+# corresponding metrics we would like to capture
+#
+class WlanConfigMP < OML4R::MPBase
+  name :wlanstat
+  param :addr
+  param :aid, :type => :int32
+  param :channel, :type => :int32
+  param :rate
+  param :rssi, :type => :int32
+  param :dbm, :type => :int32
+  param :idle, :type => :int32
+  param :txseq, :type => :int32
+  param :rxseq, :type => :int32
+  # Note: other metrics potentially returned by wlanconfig are 
+  # not supported here, as they are seldom set by wlanconfig.
+  # These are: caps, acaps, erp, mode
+end
+
+#
+# This class is the Wrapper around the existing "wlanconfig" application
+#
+class Wrapper
+
+  #
+  # Initialise a new Wrapper object
+  # - args = the command line argument which was given to this wrapper 
+  #          application
+  #
+  def initialize(args)
+
+    # Initialise some variable specific to this wrapper
+    @interface = nil
+    @interval = 1
+
+    # Now call the Init of OML4R with the command line arguments (args)
+    # and a block defining the arguments specific to this wrapper
+    OML4R::init(args, :appName => "#{APPNAME}_wrapper", :domain => 'foo', :collect => 'file:-') { |argParser|
+      argParser.banner = "\nExecute a wrapper around #{APPNAME}\n" +
+	"Use -h or --help for a list of options\n\n" 
+      argParser.on("-i", "--interface IFNAME", "Name of Interface to monitor") { |name| @interface = name }
+      argParser.on("-s", "--sampling DURATION", "Interval in second between sample collection for OML") { |time| @interval = time }
+    }
+
+    # Finally do some checking specific to this wrapper
+    # e.g. here we do not proceed if the user did not give us a 
+    # valid interface to monitor
+    unless @interface != nil
+      raise "You did not specify an interface to monitor! (-i option)"
+    end
+  end
+
+  #  
+  # Start the wrapped "wlaconfig" application, capture and process its output
+  #
+  def start()
+    # Loop until the user interrupts us
+    while true
+      # Run the wlanconfig command
+      cmd = "#{APPPATH} #{@interface} list"
+      output = `#{cmd}`
+      # Process its output
+      processOutput(output)
+      # Wait for a given duration and loop again
+      sleep @interval.to_i
+    end
+  end
+
+  #
+  # Process each output coming from an executing of the "wlaconfig" application
+  # - output =  a String holding the output to process
+  #
+  def processOutput(output)
+    # wlanconfig returns a sequence of lines
+    # The 1st line is a list of labels for the fields of the remaining lines
+    # Each remaining line is for a given station, and follow the format:
+    # ADDR AID CHAN RATE RSSI DBM IDLE TXSEQ RXSEQ CAPS ACAPS ERP STATE MODE
+    lines = output.split("\n")
+    labels = lines.delete_at(0)
+    lines.each { |row|
+      column = row.split(" ")
+      # Inject the measurements into OML 
+      WlanConfigMP.inject("#{column[0]}", column[1], column[2],
+				"#{column[3]}", column[4], column[5],
+				column[6], column[7], column[8])
+    }
+  end
+
+
+end
+
+#
+# Entry point to this Ruby application
+#
+begin
+  app = Wrapper.new(ARGV)
+  app.start()
+rescue SystemExit
+rescue SignalException
+  puts "Wrapper stopped."
+rescue Exception => ex
+  puts "Error - When executing the wrapper application!"
+  puts "Error - Type: #{ex.class}"
+  puts "Error - Message: #{ex}\n\n"
+  # Uncomment the next line to get more info on errors
+  # puts "Trace - #{ex.backtrace.join("\n\t")}"
+end
+OML4R::close()
+
+# vim: sw=2

data/bin/oml4r-zabbix

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+
+# example script that reads CPU load measurements from a Zabbix server
+# and pushes them into an OML database
+
+# make sure you install these two gems
+require "zabbixapi"
+require "oml4r"
+
+# # Zabbix node names
+# nodes = ["10.129.16.11", "10.129.16.12", "10.129.16.13"]
+
+# Define your own Measurement Point
+class CPU_MP < OML4R::MPBase
+  name :CPU
+  param :ts, :type => :string  
+  param :node, :type => :string    
+  param :load1, :type => :double
+  param :load5, :type => :double
+  param :load15, :type => :double 
+end
+
+
+# Initialise the OML4R module for your application
+oml_opts = {
+  :appName => 'zabbix',
+  :domain => 'zabbix-cpu-measurement', 
+  :nodeID => 'cloud',
+  :collect => 'file:-'
+}
+zabbix_opts = {
+  :url => 'http://cloud.npc.nicta.com.au/zabbix/api_jsonrpc.php',
+  :user => 'Admin',
+  :password => 'zabbix'
+}
+
+interval = 1
+
+nodes = OML4R::init(ARGV, oml_opts) do |op|
+  op.banner = "Usage: #{$0} [options] host1 host2 ...\n"
+
+  op.on( '-i', '--interval SEC', "Query interval in seconds [#{interval}]" ) do |i|
+    interval = i.to_i
+  end
+  op.on( '-s', '--service-url URL', "Zabbix service url [#{zabbix_opts[:url]}]" ) do |u|
+    zabbix_opts[:url] = p
+  end
+  op.on( '-p', '--password PW', "Zabbix password [#{zabbix_opts[:password]}]" ) do |p|
+    zabbix_opts[:password] = p
+  end
+  op.on( '-u', '--user USER', "Zabbix user name [#{zabbix_opts[:user]}]" ) do |u|
+    zabbix_opts[:user] = u
+  end
+end
+if nodes.empty?
+  OML4R.logger.error "Missing host list"
+  OML4R::close()
+  exit(-1)
+end
+
+# connect to Zabbix JSON API
+zbx = ZabbixApi.connect(zabbix_opts)
+
+# catch CTRL-C
+exit_requested = false
+Kernel.trap( "INT" ) { exit_requested = true }
+
+# poll Zabbix API
+while !exit_requested
+  nodes.each{|n|
+    # https://www.zabbix.com/documentation/2.0/manual/appendix/api/item/get
+    results = zbx.query(
+      :method => "item.get",
+      :params => {
+        :output => "extend",
+        :host => "#{n}",
+        # only interested in CPU load
+        :search => {
+          :name => "Processor load"
+        }
+      }
+    )
+    unless results.empty?
+      l15 = results[0]["lastvalue"]
+      l1 = results[1]["lastvalue"]
+      l5 = results[2]["lastvalue"]
+      #puts "Injecting values #{l1}, #{l5}, #{l15} for node #{n}"
+      # injecting measurements into OML
+      CPU_MP.inject(Time.now.to_s, n, l1, l5, l15)
+    else
+      OML4R.logger.warn "Empty result usually means misspelled host address"
+    end
+  }
+  sleep interval
+end
+
+OML4R::close()
+puts "Exiting"

data/bin/test_types

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2009 - 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+# ------------------
+#
+# = test_types.rb
+#
+# == Description
+#
+# Testing blobs and long strings. Should really go into a test suite.
+#
+require 'rubygems'
+require 'oml4r'
+
+# Define your own Measurement Points
+class TestMP < OML4R::MPBase
+  name :test
+  #channel :default
+
+  param :text
+  param :blob, :type => :blob
+end
+
+# Initialise the OML4R module for your application
+opts = {:appName => 'test_types',
+  :domain => 'foo', :nodeID => 'n1',
+  :collect => 'file:-'} 
+
+OML4R::init(ARGV, opts)
+
+# Now collect and inject some measurements
+blob = ""
+30.times {|i| blob << i}
+TestMP.inject(%{tab new line
+another two
+
+and that's it}, blob)
+
+# Don't forget to close when you are finished
+OML4R::close()
+
+# vim: sw=2

data/examples/oml4r-simple-example.rb

@@ -12,6 +12,10 @@
 #
 # A very simple straightforward example of OML4R.
 #
+
+# Use the oml4r.rb from ../lib
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+
 require 'rubygems'
 require 'oml4r'
 

data/examples/oml4r-solar.rb

@@ -71,4 +71,4 @@ while !exit_requested
   sleep interval
 end
 
-OML4R::close()
+OML4R::close()

data/examples/test_types.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 # Copyright (c) 2009 - 2012 National ICT Australia Limited (NICTA).
 # This software may be used and distributed solely under the terms of the MIT license (License).
 # You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.

data/lib/oml4r/version.rb

@@ -5,7 +5,7 @@
 # ------------------
 
 module OML4R
-  VERSION = "2.9.10"
+  VERSION = "2.10.0"
   VERSION_STRING = "OML4R Client V#{VERSION}"
   COPYRIGHT = "Copyright 2009-2013, NICTA"
 end

data/lib/oml4r.rb

@@ -19,6 +19,7 @@ require 'socket'
 require 'monitor'
 require 'thread'
 require 'optparse'
+require 'securerandom'
 
 require 'oml4r/version'
 
@@ -52,6 +53,7 @@ module OML4R
   class MPBase
 
     # Some Class variables
+    @@appName = nil
     @@defs = {}
     @@channels = {}
     @@channelNames = {}
@@ -112,7 +114,7 @@ module OML4R
     # Set a metric for this MP
     # - name = name of the metric to set
     # - opts = a Hash with the options for this metric
-    #          Only supported option is :type = { :string | :int32 | :double | :bool }
+    #          Only supported option is :type = { :string | :int32 | :double | :bool | :guid }
     def self.param(name, opts = {})
       o = opts.dup
       o[:name] = name
@@ -125,49 +127,81 @@ module OML4R
       nil
     end
 
+    # Inject a metadata measurement from this Measurement Point ot the OML Server. 
+    # - key = a string used to identify the key
+    # - value = the string value
+    # - fname = when not nil a string used to qualify the subject name
+    def self.inject_metadata(key, value, fname = nil)
+
+      return unless @@useOML
+
+      # retrieve infos
+      defs = @@defs[self]
+      mp_name_def = defs[:name]
+      mp_name = mp_name_def[:name]
+      pdefs = defs[:p_def]
+      defs[:types] = pdefs.map {|h| h[:type]}
+
+      # construct the subject reference
+      subject = "."
+      if self != OML4R::ExperimentMetadata
+        subject +=  "#{@@appName}_#{mp_name}"
+        unless fname.nil?
+          subject += ".#{fname}"
+        end
+      end
+
+      # prepare the message header
+      a = []
+      a << Time.now - @@start_time
+      a << "0"
+      a << (defs[:meta_no] += 1)
+      a << subject
+      a << key
+      a << value
+      msg = a.join("\t")
+
+      # Setup channels for the ExperimentMetadata MP
+      chans = @@channels[self] || []
+      if chans.empty?
+        @@channels[self] = [[Channel[], 0]]
+      end
+
+      # now inject the schema
+      @@channels[self].each do |ca|
+        channel = ca[0]
+        index = ca[1]
+        channel.send msg
+      end
+    end
+
     # Inject a measurement from this Measurement Point to the OML Server
     # However, if useOML flag is false, then only prints the measurement on stdout
     # - args = a list of arguments (comma separated) which correspond to the
     #          different values of the metrics for the measurement to inject
     def self.inject(*args)
-
       return unless @@useOML
 
-      # Do we need to send a schema update?
+      defs = __def__()
+
+      # Do we need to send the schema?
       if @@newDefs.include? self
-        defs = @@defs[self]
+        # Identify MP details
         mp_name_def = defs[:name]
         mp_name = mp_name_def[:name]
         pdefs = defs[:p_def]
         defs[:types] = pdefs.map {|h| h[:type]}
-        # prepare the message header
-        a = []
-        a << Time.now - @@start_time
-        a << "0"
-        a << (defs[:meta_no] += 1)
-        a << "."
-        a << "schema"
-        msg = a.join("\t")
-        # Create the channels
-        names = @@channelNames[self] || []
-        chans = names.collect do |cname, domain|
-          [Channel[cname.to_sym, domain.to_sym]]
-        end
-        @@channels[self] = chans.empty? ? [[Channel[]]] : chans
-        # Now inject the schema
-        meta_ca = @@channels[OML4R::ExperimentMetadata][0]
-        channel = meta_ca[0]
+        # Setup channel and schema
+        channel = Channel[]
         schema_info = channel.build_schema(mp_name, mp_name_def[:opts][:add_prefix], pdefs)
-        channel.send_schema_update(msg + "\t" + schema_info[1])
-        @@channels[self].each do |ca|
-          ca << schema_info[0]
-        end
+        @@channels[self] = [[channel, schema_info[0]]]
+        # Inject it!
+        ExperimentMetadata.inject_metadata("schema", schema_info[1])
         @@newDefs.delete self
       end
 
       # Check that the list of values passed as argument matches the
       # definition of this Measurement Point
-      defs = __def__()
       pdef = defs[:p_def]
       types = defs[:types]
       if args.size != pdef.size
@@ -200,6 +234,7 @@ module OML4R
         index = ca[1]
         channel.send "#{t}\t#{index}\t#{msg}"
       end
+
       args
     end
 
@@ -233,7 +268,7 @@ module OML4R
           [Channel[cname.to_sym, domain.to_sym]]
         end
         OML4R.logger.debug "Using channels '#{chans.inspect}"
-        @@channels[klass] = chans.empty? ? [[Channel[]]] : chans
+        @@channels[klass] = chans.empty? ? [[Channel[], 0]] : chans
       end
       @@start_time = start_time
     end
@@ -287,7 +322,7 @@ module OML4R
   # param block = a block which defines the additional application-specific arguments
   #
   def self.init(argv, opts = {}, &block)
-    OML4R.logger.info "V#{VERSION} #{COPYRIGHT}"
+    OML4R.logger.info "OML4R Client #{VERSION} [OMSPv#{opts[:protocol] || DEF_PROTOCOL}; Ruby #{RUBY_VERSION}] #{COPYRIGHT}"
     if d = (ENV['OML_EXP_ID'] || opts[:expID])
       # NOTE: It is still too early to complain about that. We need to be sure
       # of the nomenclature before making user-visible changes.
@@ -308,6 +343,7 @@ module OML4R
     #  raise 'OML4R: :app is not a valid option. Do you mean :appName?'
     #end
     opts[:appName] ||= opts[:app]
+    @@appName = opts[:appName]
     opts[:protocol] ||= DEF_PROTOCOL
 
     if  ENV['OML_URL'] || opts[:omlURL] || opts[:url]
@@ -330,7 +366,7 @@ module OML4R
       op.on("--oml-domain domain", "Name of experimental domain [#{opts[:domain] || 'undefined'}] *EXPERIMENTAL*") { |name| opts[:domain] = name }
       op.on("--oml-collect uri", "URI of server to send measurements to") { |u|  opts[:omlCollectUri] = u }
       op.on("--oml-protocol p", "Protocol number [#{OML4R::DEF_PROTOCOL}]") { |l| opts[:protocol] = l.to_i }
-      op.on("--oml-log-level l", "Log level used (info: 1 .. debug: 0)") { |l| OML4R.logger.level = l.to_i }
+      op.on("--oml-log-level l", "Log level used (info: 0 .. debug: 1)") { |l| OML4R.logger.level = 1 - l.to_i }
       op.on("--oml-noop", "Do not collect measurements") { noop = true }
       op.on("--oml-config file", "File holding OML configuration parameters") { |f| omlConfigFile = f }
       op.on("--oml-exp-id domain", "Obsolescent equivalent to --oml-domain domain") { |name|
@@ -350,12 +386,12 @@ module OML4R
       #op.on("--oml-appid APPID", "Application ID for OML [#{appName || 'undefined'}] *EXPERIMENTAL*") { |name| appID = name }
 
       # Now parse the command line
-      OML4R.logger.debug "ARGV: #{argv.inspect}"
       rest = op.parse(argv)
       if opts[:afterParse]
         # give the app a chance to fix missing parameters
         opts[:afterParse].call(opts)
       end
+     OML4R.logger.debug "ARGV: #{argv.inspect}"
      return if noop
      # Parameters in OML config file takes precedence
      unless omlConfigFile.nil? 
@@ -471,6 +507,13 @@ module OML4R
     Channel.close_all
   end
 
+  # Generate a random GUID
+  #
+  # @return [BigNum] An integer GUID.
+  def self.generate_guid()
+    SecureRandom.random_number(2**64)
+  end
+
 
   #
   # Measurement Channel
@@ -722,7 +765,7 @@ module OML4R
 
   class Logger < ::Logger
     def format_message(severity, time, progname, message)
-      "%5s oml4r: %s\n" % [severity, message]
+      "%s\t%s\n" % [severity, message]
     end
   end
 

data/oml4r.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.license	    = "MIT"
   gem.require_paths = ["lib"]
   gem.version       = OML4R::VERSION
+  gem.required_ruby_version = "~> 1.9"
 
 end
 

metadata

@@ -1,20 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oml4r
 version: !ruby/object:Gem::Version
-  version: 2.9.10
+  version: 2.10.0
+  prerelease: 
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies: []
 description: ! '["Simple OML client library and applications for Ruby"]'
 email:
 - oml-user@lists.nicta.com.au
 executables:
+- oml4r-multiple-channel-example
+- oml4r-neuca-beacon
+- oml4r-orca-beacon
+- oml4r-simple-example
+- oml4r-solar
+- oml4r-wlanconfig
+- oml4r-zabbix
 - ping-oml2
+- test_types
 extensions: []
 extra_rdoc_files: []
 files:
@@ -23,7 +32,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/oml4r-multiple-channel-example
+- bin/oml4r-neuca-beacon
+- bin/oml4r-orca-beacon
+- bin/oml4r-simple-example
+- bin/oml4r-solar
+- bin/oml4r-wlanconfig
+- bin/oml4r-zabbix
 - bin/ping-oml2
+- bin/test_types
 - examples/oml4r-multiple-channel-example.rb
 - examples/oml4r-neuca-beacon.rb
 - examples/oml4r-orca-beacon.rb
@@ -42,29 +59,29 @@ files:
 homepage: http://oml.mytestbed.net
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ! '["This is a simple client library for OML which does not use liboml2 and
   its filters, but connects directly to the server using the +text+ protocol.  User
   can use this library to create ruby applications which can send measurement to the
   OML collection server. The gem ships with some example applications."]'
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzExMmRjZTY5YjU4ZDFmNjg2NzU2NDMzNWFmNThhZTAyOWY3ZDNhZg==
-  data.tar.gz: !binary |-
-    NGU4MmY5MjQ5M2UyMzViNjA5ODMwY2Q3MmY3ZjIzY2VmYmM0YWQ1YQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NzI0ZjFhMWU1MTI3NGU5YmU5OGYwMzAyZDliZmYwMzBhZmI3MzM1OWVkNjQ2
-    ZTNjNDQ0Y2FlOWEwYjA0MGJkOTc0OGJmNjA0YzY4ZTMxODk4MGJhNmQ3YTJi
-    Y2E0MjAxOTJjMDc2OTQwMDQyYjVkNTFiMzAyMTAxZTkyZjA4Y2M=
-  data.tar.gz: !binary |-
-    MDE0ODUxZGU3OGZjNTcyZDFlYTFkNzkwZDhkZjM5ZTkxMjE4NjBkMmFmN2Mw
-    MWViYWQ2Yzg2MWE4YTc5MWVjNWRmMDMwOTRlYzMzZjk2NzgwNjYzYTM1ZjBh
-    M2IwMDRkOWVmOTkyZWYyYzRiNzY2YTZhZjgyOGMzNWIyYWM1MmE=