upload logstash configure file.
Merge branch 'master' of https://github.com/snowery/CMPE283_DRS-DPM

Conflicts:
	bin/PerfStatCollect/PerfStatsCollector.class