diff --git a/src/im_mad/remotes/run_probes b/src/im_mad/remotes/run_probes index 3209b285bc..d77b75714f 100755 --- a/src/im_mad/remotes/run_probes +++ b/src/im_mad/remotes/run_probes @@ -16,6 +16,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +export LANG=C + HYPERVISOR_DIR=$1.d ARGUMENTS=$* diff --git a/src/mad/ruby/Ganglia.rb b/src/mad/ruby/Ganglia.rb index 5929846e24..f9b3acb7e3 100644 --- a/src/mad/ruby/Ganglia.rb +++ b/src/mad/ruby/Ganglia.rb @@ -49,7 +49,7 @@ class GangliaHost self.new(xml, host) end - def self.new_fom_file(host, file) + def self.new_from_file(host, file) new_with_options(host, :file => file) end diff --git a/src/tm_mad/tm_common.sh b/src/tm_mad/tm_common.sh index cb087cc23e..6634c8afca 100644 --- a/src/tm_mad/tm_common.sh +++ b/src/tm_mad/tm_common.sh @@ -14,6 +14,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +export LANG=C + if [ -z "$ONE_LOCATION" ]; then ONE_LOCAL_VAR=/var/lib/one else diff --git a/src/vmm_mad/remotes/kvm/kvmrc b/src/vmm_mad/remotes/kvm/kvmrc index 0fc5d39ddd..abe2945774 100644 --- a/src/vmm_mad/remotes/kvm/kvmrc +++ b/src/vmm_mad/remotes/kvm/kvmrc @@ -14,6 +14,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +export LANG=C + export LIBVIRT_URI=qemu:///system export QEMU_PROTOCOL=qemu diff --git a/src/vmm_mad/remotes/poll_ganglia.rb b/src/vmm_mad/remotes/poll_ganglia.rb index b285517fb5..15981f22a0 100755 --- a/src/vmm_mad/remotes/poll_ganglia.rb +++ b/src/vmm_mad/remotes/poll_ganglia.rb @@ -64,11 +64,16 @@ rescue exit -1 end -dom_info=ganglia.get_vms_information +doms_info=ganglia.get_vms_information +dom_id=domain.split('-').last -if dom_info[domain] - info=dom_info[domain].map do |key, value| - "#{key.to_s.upcase}=\"#{value}\"" +# Get key one- or key from the hash +dom_info=doms_info[domain] +dom_info=doms_info[dom_id] if !dom_info + +if dom_info + info=dom_info.map do |key, value| + "#{key.to_s.upcase}=#{value}" end.join(' ') puts info diff --git a/src/vmm_mad/remotes/poll_xen_kvm.rb b/src/vmm_mad/remotes/poll_xen_kvm.rb index 5b02bbfb10..8984cdb7b8 100755 --- a/src/vmm_mad/remotes/poll_xen_kvm.rb +++ b/src/vmm_mad/remotes/poll_xen_kvm.rb @@ -19,6 +19,8 @@ require 'pp' require 'rexml/document' +ENV['LANG']='C' + module KVM CONF={ :dominfo => 'virsh --connect LIBVIRT_URI --readonly dominfo', diff --git a/src/vmm_mad/remotes/xen/xenrc b/src/vmm_mad/remotes/xen/xenrc index 0715fac7e3..6ce17b0c7a 100644 --- a/src/vmm_mad/remotes/xen/xenrc +++ b/src/vmm_mad/remotes/xen/xenrc @@ -14,6 +14,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +export LANG=C + export XM_PATH="/usr/sbin/xm" export XM_CANCEL="sudo $XM_PATH destroy" export XM_CREATE="sudo $XM_PATH create"