YPT / jmeter · Commits

Go to a project

Authored by Rong
Commit 678e9d6f086be4fa72a590ae433436cb708b74d0 1 parent e7b52b24

auto commit by shell by gr

Inline Side-by-side
Showing 1 changed file with 11 additions and 7 deletions
... ... @@ -4,16 +4,16 @@ then
. ~/.bash_profile
fi
MYSQL_IP=192.168.103.44
MYSQL_IP=192.168.104.43
MYSQL_PORT=3306
MYSQL_USERNAME=ypt
MYSQL_PASSWORD=123456
MYSQL_DBNAME=ypt
INFLUXDB_IP=192.168.103.44
INFLUXDB_IP=192.168.104.43
INFLUXDB_DB=ypt
YPT_IP=192.168.103.44
YPT_IP=192.168.104.43
YPTLOCKPATH_USER=/Data/logs/jmeter/ypt.user.lock
YPTLOCKPATH_RESULTID=/Data/logs/jmeter/ypt.resultId.lock
... ... @@ -80,8 +80,8 @@ memory_total=$(cat /proc/meminfo | grep MemTotal | awk '{print int($2/1024/102
#exeSqlStr="UPDATE machines SET hostname=\"${hostname}\" , cpu=${cpu_num} , memory=${memory_total},username=\"${username}\",monitor_cpu_load=${cpu_load} , monitor_cpu_ratio=${cpu_ratio} , monitor_memory_ratio=${memory_ratio} , monitor_net=${net} , monitor_disk_busy=${disk_busy} ,is_jmeter_running=${is_jmeter_running} WHERE ip=\"${ip}\""
#fi
#exeSqlStr="UPDATE machines SET hostname=\"${hostname}\" , cpu=${cpu_num} , memory=${memory_total} , monitor_cpu_load=${cpu_load} , monitor_cpu_ratio=${cpu_ratio} , monitor_memory_ratio=${memory_ratio} , monitor_net=${net} , monitor_disk_busy=${disk_busy} WHERE ip=\"${ip}\""
exeYptInterfaceStr="hostname=${hostname}&cpu=${cpu_num}&memory=${memory_total}&monitor_cpu_load=${cpu_load}&monitor_cpu_ratio=${cpu_ratio}&monitor_memory_ratio=${memory_ratio}&monitor_net=${net}&monitor_disk_busy=${disk_busy}&ip=${ip}"
#
#exeSqlStr2=""
#resultId=0
#if [ -f ${YPTLOCKPATH_RESULTID} ];then
... ... @@ -101,11 +101,15 @@ exeYptInterfaceStr="hostname=${hostname}&cpu=${cpu_num}&memory=${memory_total}&m
#exeMysql "$exeSqlStr2"
#fi
#fi
exeInfluxdbStr="machine_info,ip=${ip} cpu_load=${cpu_load},cpu_ratio=${cpu_ratio},memory_ratio=${memory_ratio},net=${net},disk_busy=${disk_busy}"
#上传到mysql
#exeYptInterfaceStr="hostname=${hostname}&cpu=${cpu_num}&memory=${memory_total}&monitor_cpu_load=${cpu_load}&monitor_cpu_ratio=${cpu_ratio}&monitor_memory_ratio=${memory_ratio}&monitor_net=${net}&monitor_disk_busy=${disk_busy}&ip=${ip}"
#exeMysql "$exeSqlStr"
exeYptInterface "$exeYptInterfaceStr"
#exeYptInterface "$exeYptInterfaceStr"
#上传到influxdb
exeInfluxdbStr="machine_info,ip=${ip} cpu_load=${cpu_load},cpu_ratio=${cpu_ratio},memory_ratio=${memory_ratio},net=${net},disk_busy=${disk_busy}"
exeInfluxdb "$exeInfluxdbStr"
}
... ...