Changeset 197 for drbl-virt/sbin

Timestamp:

Aug 29, 2010, 4:26:10 PM (14 years ago)

Author:

rock

Message:

Modify: printf format

Location:

drbl-virt/sbin

Files:

• check_drbl_client.sh (modified) (1 diff)
• check_drbl_vm.sh (modified) (2 diffs)

drbl-virt/sbin/check_drbl_client.sh

@@ -42 +42 @@
     fi
 
-echo "$client_hostname $client_IP $IP_status CPU_Core=$client_CPU_core Ram=$client_Ram idle_CPU=$client_idle_CPU unused_Ram=$client_unused_Ram"
-echo "$client_hostname $client_IP $IP_status $client_CPU_core $client_Ram $client_idle_CPU $client_unused_Ram" >> $drbl_client_file
+echo "[$client_hostname $client_IP] $IP_status CPU_Core=$client_CPU_core Ram=$client_Ram idle_CPU=$client_idle_CPU unused_Ram=$client_unused_Ram"
+echo "[$client_hostname $client_IP] $IP_status $client_CPU_core $client_Ram $client_idle_CPU $client_unused_Ram" >> $drbl_client_file
 
 done

drbl-virt/sbin/check_drbl_vm.sh

@@ -38 +38 @@
         vm_hostnames="$(cat $drbl_vm_xentop_file | sed -n '3,$p' | awk '{print $1}')"
     
-        printf "[$client_hostname]  " >> $drbl_vm_file
-        printf "[$client_hostname]  "
+        printf "[$client_hostname]\n" >> $drbl_vm_file
+        printf "[$client_hostname]\n"
         declare -i i=1
 
@@ -48 +48 @@
             vm_CPU_loading="$(cat $drbl_vm_xentop_file | grep $vm_hostname | awk '{print $4}')"
             vm_Ram_loading="$(cat $drbl_vm_xentop_file | grep $vm_hostname | awk '{print $6}')"
-            printf "VM$i: $vm_hostname $vm_CPU_core ${vm_Ram}M $vm_CPU_loading $vm_Ram_loading " >> $drbl_vm_file
-            printf "VM$i: $vm_hostname $vm_CPU_core ${vm_Ram}M $vm_CPU_loading $vm_Ram_loading "
+            printf "VM$i: $vm_hostname $vm_CPU_core ${vm_Ram}M $vm_CPU_loading%% $vm_Ram_loading%%\n" >> $drbl_vm_file
+            printf "VM$i: $vm_hostname VCPU=$vm_CPU_core Mem=${vm_Ram}M VCPU_loading=$vm_CPU_loading%% Mem_usage=$vm_Ram_loading%%\n"
             i=i+1
         done
     
     fi
-    printf "\n" >> $drbl_vm_file
-    printf "\n"
 done