diff --git a/build.gradle b/build.gradle index d07ef80..b41ac93 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ subprojects { apply plugin: 'groovy' dependencies { - testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0' + testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' testImplementation "org.slf4j:slf4j-api:${slf4jVersion}" testImplementation "org.slf4j:slf4j-simple:${slf4jVersion}" diff --git a/client/doc/sysmon-client.service b/client/doc/sysmon-client.service index e6e25d9..56a310f 100644 --- a/client/doc/sysmon-client.service +++ b/client/doc/sysmon-client.service @@ -1,5 +1,5 @@ [Unit] -Description=Sysmon Client Service +Description=Sysmon Client [Service] #User=nobody diff --git a/client/doc/sysmon-client.sh b/client/doc/sysmon-client.sh index e958d1f..95d55c6 100644 --- a/client/doc/sysmon-client.sh +++ b/client/doc/sysmon-client.sh @@ -11,7 +11,7 @@ dir="/opt/sysmon/client" cmd="/opt/sysmon/client/bin/client" -args="-s http://10.20.30.40:9925/metrics" +args="-s http://10.20.30.40:9925/metrics" # Specify sysmon-server URL here user="" name=`basename $0` @@ -19,6 +19,10 @@ pid_file="/var/run/$name.pid" stdout_log="/var/log/$name.log" stderr_log="/var/log/$name.err" +# Uncomment if required +#JAVA_HOME=/usr/java8_64 +#export JAVA_HOME + get_pid() { cat "$pid_file" } diff --git a/client/doc/systemd.md b/client/doc/systemd.md index 29b5fe2..1fc9bf7 100644 --- a/client/doc/systemd.md +++ b/client/doc/systemd.md @@ -1,4 +1,4 @@ -# SystemD Notes +# Linux systemd notes Edit the *sysmon-client.service* file and change the sysmon-server URL accordingly to your environment. @@ -9,4 +9,4 @@ cp sysmon-client.service /etc/systemd/system/ systemctl daemon-reload systemctl enable sysmon-client systemctl restart sysmon-client -``` \ No newline at end of file +``` diff --git a/client/doc/sysv-init.md b/client/doc/sysv-init.md index 909ddb7..ff66296 100644 --- a/client/doc/sysv-init.md +++ b/client/doc/sysv-init.md @@ -1,6 +1,18 @@ # SysV init Notes - Copy the *sysmon-client.sh* into *sysmon-client* in the correct location for init scripts on your operating system. -- Edit the file to specify sysmon-server URL in the *args* variable. +- Edit the file and specify the sysmon-server URL in the *args* variable. +- Edit the file and uncomment *JAVA_HOME* if required - SymLink to the required run-levels. + +## AIX & VIO + +```shell +# Remember to edit and set JAVA_HOME to eg. /usr/java8_64 +cp sysmon-client.sh /etc/rc.d/init.d/sysmon-client +chmod +x /etc/rc.d/init.d/sysmon-client +ln -s /etc/rc.d/init.d/sysmon-client /etc/rc.d/rc2.d/Ssysmon-client +ln -s /etc/rc.d/init.d/sysmon-client /etc/rc.d/rc2.d/Ksysmon-client +``` + diff --git a/plugins/build.gradle b/plugins/build.gradle index d4e7920..45703e2 100644 --- a/plugins/build.gradle +++ b/plugins/build.gradle @@ -10,7 +10,7 @@ subprojects { apply plugin: 'groovy' dependencies { - testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0' + testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' testImplementation "org.slf4j:slf4j-api:${slf4jVersion}" testImplementation "org.slf4j:slf4j-simple:${slf4jVersion}" testImplementation project(':shared') diff --git a/server/build.gradle b/server/build.gradle index 9fa672b..a28a7b2 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -28,7 +28,7 @@ def projectName = "sysmon-server" application { // Define the main class for the application. mainClass.set('sysmon.server.Application') - applicationDefaultJvmArgs = [ "-server", "-Xmx128m" ] + applicationDefaultJvmArgs = [ "-server", "-Xmx64m" ] } run { diff --git a/server/doc/sysmon-server.sh b/server/doc/sysmon-server.sh index 60f4b38..b89a031 100644 --- a/server/doc/sysmon-server.sh +++ b/server/doc/sysmon-server.sh @@ -19,6 +19,10 @@ pid_file="/var/run/$name.pid" stdout_log="/var/log/$name.log" stderr_log="/var/log/$name.err" +# Uncomment if required +#JAVA_HOME=/usr/java8_64 +#export JAVA_HOME + get_pid() { cat "$pid_file" } diff --git a/server/doc/systemd.md b/server/doc/systemd.md index 3a196cc..19d527d 100644 --- a/server/doc/systemd.md +++ b/server/doc/systemd.md @@ -1,4 +1,4 @@ -# SystemD Notes +# Linux systemd notes Setup as systemd service to start automatically at boot: @@ -7,4 +7,4 @@ cp sysmon-server.service /etc/systemd/system/ systemctl daemon-reload systemctl enable sysmon-server systemctl restart sysmon-server -``` \ No newline at end of file +```