diff --git a/README.md b/README.md index 6ab7cc8..79f0158 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,8 @@ The script does not use JMeter's Distributed Mode so you do not need to adjust t `AMI_ID="[A linix based AMI, eg. ami-f95ef58a]"` Recommended AMI provided. Both Java and JMeter are installed by the script dynamically and are not required. - `INSTANCE_TYPE="t2.micro"` + `INSTANCE_TYPE="m3.medium"` + `micro` type instances do work and are good for developing but they are not recommended for important test runs. Performance can be slow and you risk affecting test results. Note. Older generation instance types require a different type of AMI (paravirtual vs. hmv). `USER="ubuntu"` diff --git a/jmeter-ec2.sh b/jmeter-ec2.sh index 0560bdf..00481f8 100755 --- a/jmeter-ec2.sh +++ b/jmeter-ec2.sh @@ -832,6 +832,9 @@ function runcleanup() { -P $REMOTE_PORT \ $USER@${hosts[$i]}:$REMOTE_HOME/$project-*.jtl \ $project_home/ + # Append the hostname + sed "s/$/,"${hosts[$i]}"/" $project_home/$project-$DATETIME-$i.jtl >> $project_home/$project-$DATETIME-$i-appended.jtl + rm $project_home/$project-$DATETIME-$i.jtl echo "$project_home/$project-$DATETIME-$i.jtl complete" done echo @@ -839,8 +842,8 @@ function runcleanup() { # process the files into one jtl results file echo -n "processing results..." for (( i=0; i<$instance_count; i++ )) ; do - cat $project_home/$project-$DATETIME-$i.jtl >> $project_home/$project-$DATETIME-grouped.jtl - rm $project_home/$project-$DATETIME-$i.jtl # removes the individual results files (from each host) - might be useful to some people to keep these files? + cat $project_home/$project-$DATETIME-$i-appended.jtl >> $project_home/$project-$DATETIME-grouped.jtl + rm $project_home/$project-$DATETIME-$i-appended.jtl # removes the individual results files (from each host) - might be useful to some people to keep these files? done # Sort File diff --git a/jmeter.properties b/jmeter.properties index f0abb45..8e5e414 100644 --- a/jmeter.properties +++ b/jmeter.properties @@ -500,7 +500,7 @@ jmeter.save.saveservice.output_format=csv #jmeter.save.saveservice.bytes=true #jmeter.save.saveservice.url=false #jmeter.save.saveservice.filename=false -jmeter.save.saveservice.hostname=true +jmeter.save.saveservice.hostname=false jmeter.save.saveservice.thread_counts=true #jmeter.save.saveservice.sample_count=false #jmeter.save.saveservice.idle_time=false