From 1c1cf80f6f1b3772174f59b5aa09dea61c350358 Mon Sep 17 00:00:00 2001 From: jsatoh Date: Tue, 1 Feb 2011 01:50:55 +0000 Subject: [PATCH] 2011-02-01 Junichi Satoh * unix/FreeBSD/pandora_agent.conf: Fixed invalid cpu usage data is returned when system has only one disk device. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3793 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 5 +++++ pandora_agents/unix/ChangeLog | 5 +++++ pandora_agents/unix/FreeBSD/pandora_agent.conf | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index 839794d33f..979deb4007 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,8 @@ +2011-02-01 Junichi Satoh + + * unix/FreeBSD/pandora_agent.conf: Fixed invalid cpu usage data is + returned when system has only one disk device. + 2011-01-27 Junichi Satoh * unix/pandora_agent_daemon: Changed order of 'su' argument. diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index 28f695de4b..2e56ba0351 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,8 @@ +2011-02-01 Junichi Satoh + + * FreeBSD/pandora_agent.conf: Fixed invalid cpu usage data is returned + when system has only one disk device. + 2011-01-27 Junichi Satoh * pandora_agent_daemon: Changed order of 'su' argument. diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf index f4f2bff7b2..dc7a96b499 100755 --- a/pandora_agents/unix/FreeBSD/pandora_agent.conf +++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf @@ -116,7 +116,7 @@ module_begin module_name cpu_user module_type generic_data module_interval 1 -module_exec vmstat 1 2 | tail -1 | awk '{ print $17 }' +module_exec vmstat -n0 1 2 | tail -1 | awk '{ print $15 }' module_max 100 module_min 0 module_description User CPU Usage (%) @@ -126,7 +126,7 @@ module_begin module_name cpu_system module_type generic_data module_interval 1 -module_exec vmstat 1 2 | tail -1 | awk '{ print $18 }' +module_exec vmstat -n0 1 2 | tail -1 | awk '{ print $16 }' module_max 100 module_min 0 module_description System CPU Usage (%) @@ -136,7 +136,7 @@ module_begin module_name cpu_idle module_type generic_data module_interval 1 -module_exec vmstat 1 2 | tail -1 | awk '{ print $19 }' +module_exec vmstat -n0 1 2 | tail -1 | awk '{ print $17 }' module_max 100 module_min 0 module_description CPU Idle (%)