From e66c3df6c2e1e27130fc5e6e8dbb096fc26a068c Mon Sep 17 00:00:00 2001
From: servelight <serve.light@prever.io>
Date: Fri, 14 Apr 2017 17:27:12 +0900
Subject: [PATCH] update properties

---
 .gitignore                            |  9 +++++-
 src/test/resources/centos7.properties | 42 +++++++++++++++++----------
 src/test/resources/pang.properties    |  6 ++--
 src/test/resources/window.properties  |  1 -
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 55698b2..dd7d455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,11 @@
 hs_err_pid*
 
 # Eclipse settings
-.settings/
\ No newline at end of file
+.settings/
+.classpath
+.project
+/build
+/bin
+
+# Gradle
+.gradle/
\ No newline at end of file
diff --git a/src/test/resources/centos7.properties b/src/test/resources/centos7.properties
index db2f481..d98540e 100644
--- a/src/test/resources/centos7.properties
+++ b/src/test/resources/centos7.properties
@@ -37,30 +37,40 @@ vmstat.value.13.devicename = cpu-sy
 #vmstat.value.16.valueCol = 16
 #vmstat.value.16.devicename = cpu-st
 
-cmd.ps = ps -e -o pid,%cpu,%mem,rss,cmd
-ps.period = 10
-ps.key.2 = mysql1
-ps.key.4 = mqtt-dev1
-ps.key.5 = mqtt-dev2
-ps.key.6 = cassandra
-ps.key.7 = redis
-ps.value.1.keyCol = 4
+cmd.ps = ps -e -o pid,%cpu,%mem,rss,nlwp,cmd
+#ps.period = 10
+ps.maxCol = 6
+########################################
+# Insert process unique name
+# ex)ps.key.# = process_name
+########################################
+ps.key.1 = _PROCESS_NAME
+########################################
+ps.value.1.keyCol = 5
 ps.value.1.valueCol = 1
-ps.value.1.devicename = ps-cpu-{}
-ps.value.2.keyCol = 4
+ps.value.1.devicename = {}-ps-cpu
+ps.value.2.keyCol = 5
 ps.value.2.valueCol = 2
-ps.value.2.devicename = proc-memp-{}
-ps.value.3.keyCol = 4
+ps.value.2.devicename = {}-ps-memp
+ps.value.3.keyCol = 5
 ps.value.3.valueCol = 3
-ps.value.3.devicename = proc-mem-{}
+ps.value.3.devicename = {}-ps-mem
+ps.value.4.keyCol = 5
+ps.value.4.valueCol = 4
+ps.value.4.devicename = {}-ps-thcnt
 
 cmd.df = df --block-size=1M
 df.period = 3600
-df.key.1 = centos-home
+########################################
+# Insert filesystem name
+# ex)df.key.# = filesystem_name
+########################################
+df.key.1 = _PARTITION_NAME
+########################################
 df.value.1.keyCol = 0
 df.value.1.valueCol = 2
-df.value.1.devicename = disk-used-{}
+df.value.1.devicename = {}-disk-used
 df.value.2.keyCol = 0
 df.value.2.valueCol = 3
-df.value.2.devicename = disk-available-{}
+df.value.2.devicename = {}-disk-avail
 
diff --git a/src/test/resources/pang.properties b/src/test/resources/pang.properties
index 19eada4..9d01497 100644
--- a/src/test/resources/pang.properties
+++ b/src/test/resources/pang.properties
@@ -1,7 +1,7 @@
 #pangdata reserved properties
-pang.username=USERNAME
-pang.userkey=USER_KEY
-pang.prefix=PREFIX
+pang.username=_USERNAME
+pang.userkey=_USER_KEY
+pang.prefix=_PREFIX
 pang.conf=centos7.properties
 #Insert default period(seconds)
 pang.period=15
\ No newline at end of file
diff --git a/src/test/resources/window.properties b/src/test/resources/window.properties
index 3bd38fe..93e636e 100644
--- a/src/test/resources/window.properties
+++ b/src/test/resources/window.properties
@@ -1,4 +1,3 @@
-#cmd.dir = echo list disk | diskpart | findstr GB
 cmd.dir = fsutil volume diskfree c:
 dir.period = 10
 dir.key.1 = KB