From 8b426931e7512e616b13b9d204ec259192087811 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Sun, 5 Dec 2021 21:17:16 +0100 Subject: [PATCH 1/2] Misc. small changes. - Add os details from base (oshi) - Add netstat from base (oshi) - Update 3rd party dependencies - Bump version --- client/build.gradle | 6 +- .../main/java/sysmon/client/Application.java | 7 +- gradle.properties | 8 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 269 +++++++++++------- plugins/build.gradle | 4 +- .../plugins/os_aix/AixNetstatExtension.java | 4 +- .../plugins/os_aix/AixProcessorStat.java | 4 +- .../sysmon/plugins/os_base/BasePlugin.java | 9 +- plugins/os-ibmi/README.md | 2 +- .../sysmon/plugins/os_ibmi/IbmIPlugin.java | 48 ++++ .../sysmon/plugins/os_ibmi/TestExtension.java | 51 ++-- server/build.gradle | 6 +- 14 files changed, 254 insertions(+), 166 deletions(-) diff --git a/client/build.gradle b/client/build.gradle index d838cd0..71b6bd9 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -3,9 +3,9 @@ import org.redline_rpm.header.Os plugins { id 'application' - id "com.github.johnrengelman.shadow" version "7.0.0" - id "net.nemerosa.versioning" version "2.14.0" - id "nebula.ospackage" version "8.6.1" + id "com.github.johnrengelman.shadow" version "7.1.0" + id "net.nemerosa.versioning" version "2.15.1" + id "nebula.ospackage" version "9.0.0" } dependencies { diff --git a/client/src/main/java/sysmon/client/Application.java b/client/src/main/java/sysmon/client/Application.java index 22ee7ec..7756c9d 100644 --- a/client/src/main/java/sysmon/client/Application.java +++ b/client/src/main/java/sysmon/client/Application.java @@ -8,9 +8,8 @@ import org.slf4j.impl.SimpleLogger; import picocli.CommandLine; import java.io.File; -import java.io.IOException; -import java.net.InetAddress; import java.net.URL; +import java.net.InetAddress; import java.net.UnknownHostException; import java.util.concurrent.Callable; @@ -40,7 +39,7 @@ public class Application implements Callable { @Override - public Integer call() throws IOException { + public Integer call() { String sysmonDebug = System.getProperty("sysmon.debug"); if(sysmonDebug != null || enableDebug) { @@ -61,7 +60,7 @@ public class Application implements Callable { try { hostname = InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { - System.err.println("Could not detect hostname. Use the '-n' or '--hostname' option to specify it."); + System.err.println("Could not detect hostname. Use the '-n' or '--hostname' option to specify."); return -1; } } diff --git a/gradle.properties b/gradle.properties index f44dec5..2c76e0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ -version=0.1.6 +version=0.1.7 pf4jVersion=3.6.0 slf4jVersion=1.7.32 -camelVersion=3.11.3 -picocliVersion=4.6.1 -oshiVersion=5.8.3 \ No newline at end of file +camelVersion=3.11.4 +picocliVersion=4.6.2 +oshiVersion=5.8.5 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..84d1f85 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/plugins/build.gradle b/plugins/build.gradle index c5919ca..858482f 100644 --- a/plugins/build.gradle +++ b/plugins/build.gradle @@ -1,7 +1,7 @@ import org.redline_rpm.header.Os plugins { - id "nebula.ospackage" version "8.6.1" + id "nebula.ospackage" version "9.0.0" } @@ -48,7 +48,7 @@ subprojects { attributes( 'Plugin-Id' : "${pluginId}", 'Plugin-Class' : "${pluginClass}", - 'Plugin-Version' : "${version}", + 'Plugin-Version' : "${archiveVersion}", 'Plugin-Provider' : "System Monitor", 'Plugin-Description': "${pluginDescription}" ) diff --git a/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixNetstatExtension.java b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixNetstatExtension.java index ee29f75..b797305 100644 --- a/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixNetstatExtension.java +++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixNetstatExtension.java @@ -83,8 +83,8 @@ public class AixNetstatExtension implements MetricExtension { @Override public MetricResult getMetrics() throws Exception { - HashMap tagsMap = null; - HashMap fieldsMap = null; + HashMap tagsMap; + HashMap fieldsMap; try (InputStream buf = PluginHelper.executeCommand("netstat -s -f inet")) { AixNetstatParser parser = processCommandOutput(buf); diff --git a/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java index 7c4f576..18daf4c 100644 --- a/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java +++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java @@ -86,8 +86,8 @@ public class AixProcessorStat { //String lparstat = lines.get(lines.size() -1); String[] splitStr = Objects.requireNonNull(lastLine).trim().split("\\s+"); - if(type.equalsIgnoreCase("shared") && splitStr.length < 9 || - type.equalsIgnoreCase("dedicated") && splitStr.length < 8) { + if(type == null || (type.equalsIgnoreCase("shared") && splitStr.length < 9) || + (type.equalsIgnoreCase("dedicated") && splitStr.length < 8) ) { throw new UnsupportedOperationException("lparstat string error: " + lastLine); } diff --git a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BasePlugin.java b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BasePlugin.java index 4be658b..18eb6e5 100644 --- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BasePlugin.java +++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BasePlugin.java @@ -4,6 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; +import oshi.PlatformEnum; import oshi.SystemInfo; import oshi.hardware.HardwareAbstractionLayer; @@ -30,7 +31,8 @@ public class BasePlugin extends Plugin { } } catch (UnsupportedOperationException e) { - log.warn(e.getMessage()); + log.warn("getHardwareAbstractionLayer() - {}", e.getMessage()); + return null; } return hardwareAbstractionLayer; @@ -43,9 +45,10 @@ public class BasePlugin extends Plugin { if(systemInfo == null) { systemInfo = new SystemInfo(); } - + systemInfo.getOperatingSystem(); } catch (UnsupportedOperationException e) { - log.warn(e.getMessage()); + log.warn("getSystemInfo() - {}", e.getMessage()); + return null; } return systemInfo; diff --git a/plugins/os-ibmi/README.md b/plugins/os-ibmi/README.md index b13f57d..c191c34 100644 --- a/plugins/os-ibmi/README.md +++ b/plugins/os-ibmi/README.md @@ -1,4 +1,4 @@ # IBM i Plugin -TODO. Nothing here yet. +This is just for testing purposes. diff --git a/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/IbmIPlugin.java b/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/IbmIPlugin.java index c622954..e7c1fb9 100644 --- a/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/IbmIPlugin.java +++ b/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/IbmIPlugin.java @@ -1,18 +1,66 @@ package sysmon.plugins.os_ibmi; +import com.ibm.as400.access.AS400; +import com.ibm.as400.access.SystemStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; +import oshi.SystemInfo; +import oshi.hardware.HardwareAbstractionLayer; public class IbmIPlugin extends Plugin { private static final Logger log = LoggerFactory.getLogger(IbmIPlugin.class); + private static SystemStatus systemStatus; + private static AS400 as400; + public IbmIPlugin(PluginWrapper wrapper) { super(wrapper); } + + public static SystemStatus getSystemStatus() { + + try { + if (as400 == null) { + as400 = IbmIPlugin.getAS400(); + } + if(systemStatus == null) { + systemStatus = new SystemStatus(as400); + } + } catch (Exception exception) { + log.error("getSystemStatus() - {}", exception.getMessage()); + return null; + } + + return systemStatus; + } + + + public static AS400 getAS400() { + + String osArch = System.getProperty("os.arch").toLowerCase(); + String osName = System.getProperty("os.name").toLowerCase(); + + if(!osArch.equals("ppc64") && !osName.equals("os/400")) { + log.info("getAS400() - OS Arch: {}", osArch); + log.info("getAS400() - OS Name: {}", osName); + return null; + } + + try { + as400 = new AS400("localhost", "*CURRENT"); + //as400 = new AS400("10.32.64.142"); + } catch (Exception exception) { + log.error("getAS400() - {}", exception.getMessage()); + return null; + } + + return as400; + } + } diff --git a/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/TestExtension.java b/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/TestExtension.java index 01aff11..74080dd 100644 --- a/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/TestExtension.java +++ b/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/TestExtension.java @@ -4,13 +4,14 @@ import com.ibm.as400.access.*; import org.pf4j.Extension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sysmon.shared.Measurement; import sysmon.shared.MetricExtension; import sysmon.shared.MetricResult; import java.io.IOException; +import java.util.HashMap; import java.util.Map; -// Disable for now... //@Extension public class TestExtension implements MetricExtension { @@ -25,7 +26,6 @@ public class TestExtension implements MetricExtension { private boolean enabled = true; private boolean threaded = false; - private AS400 as400; private SystemStatus systemStatus; @@ -41,29 +41,8 @@ public class TestExtension implements MetricExtension { @Override public boolean isSupported() { - - String osArch = System.getProperty("os.arch").toLowerCase(); - String osName = System.getProperty("os.name").toLowerCase(); - - System.err.println("OS Arch: " + osArch); - System.err.println("OS Name: " + osName); - - try { - //as400 = new AS400("localhost", "CURRENT"); - as400 = new AS400("10.32.64.142"); - systemStatus = new SystemStatus(as400); - } catch (Exception exception) { - log.error(exception.getMessage()); - } - - if(as400.isLocal()) { - log.info("as400 isLocal() true"); - } else { - log.info("as400 isLocal() FALSE"); - } - - - return true; + systemStatus = IbmIPlugin.getSystemStatus(); + return systemStatus != null; } @Override @@ -101,22 +80,32 @@ public class TestExtension implements MetricExtension { try { int jobsInSystem = systemStatus.getJobsInSystem(); - log.info("Jobs In System: " + jobsInSystem); + log.info("Jobs In System: {}", jobsInSystem); int batchJobsRunning = systemStatus.getBatchJobsRunning(); - log.info("Batch Jobs Running: " + batchJobsRunning); + log.info("Batch Jobs Running: {}", batchJobsRunning); int activeThreads = systemStatus.getActiveThreadsInSystem(); - log.info("Active Threads: " + activeThreads); + log.info("Active Threads: {}", activeThreads); int activeJobs = systemStatus.getActiveJobsInSystem(); - log.info("Active Jobs: " + activeJobs); + log.info("Active Jobs: {}", activeJobs); int onlineUsers = systemStatus.getUsersCurrentSignedOn(); - log.info("Online Users: " + onlineUsers); + log.info("Online Users: {}", onlineUsers); + + HashMap fieldsMap = new HashMap() {{ + put("jobs_total", jobsInSystem); + put("jobs_running", batchJobsRunning); + put("jobs_active", activeJobs); + put("threads", activeThreads); + put("users", onlineUsers); + + }}; + return new MetricResult(name, new Measurement(new HashMap<>(), fieldsMap)); } catch (AS400SecurityException | ErrorCompletingRequestException | InterruptedException | IOException | ObjectDoesNotExistException e) { - log.error(e.getMessage()); + log.error("getMetrics() {}", e.getMessage()); e.printStackTrace(); } diff --git a/server/build.gradle b/server/build.gradle index e0f95b3..dab05f6 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -3,9 +3,9 @@ import org.redline_rpm.header.Os plugins { id 'application' - id "com.github.johnrengelman.shadow" version "7.0.0" - id "net.nemerosa.versioning" version "2.14.0" - id "nebula.ospackage" version "8.6.1" + id "com.github.johnrengelman.shadow" version "7.1.0" + id "net.nemerosa.versioning" version "2.15.1" + id "nebula.ospackage" version "9.0.0" } dependencies { From 03327324012a38f998920d23bf31282558670e85 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Tue, 11 Jan 2022 11:23:06 +0100 Subject: [PATCH 2/2] Misc. small changes. - Update 3rd party dependencies --- README.md | 13 +-- client/README.md | 8 +- client/doc/AIX.md | 7 +- client/doc/sysmon-client.service | 2 + client/doc/sysmon-client.sh | 100 ++++++++++++++++++ client/doc/sysv-init.md | 6 ++ doc/ansible/README.md | 3 - doc/ansible/sysmon-client-aix.yml | 63 ----------- doc/ansible/sysmon-client-linux.yml | 61 ----------- .../templates/sysmon-client.service.j2 | 10 -- doc/ansible/timezone-aix.yml | 33 ------ doc/monitoring-eye-320x320.png | Bin 0 -> 17817 bytes ...epo-com.png => monitoring-eye-512x512.png} | Bin gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- plugins/README.md | 2 +- plugins/os-base/README.md | 2 +- .../plugins/os_base/BaseDetailsExtension.java | 4 - .../plugins/os_base/BaseNetstatExtension.java | 4 - server/README.md | 6 +- server/doc/AIX.md | 18 ++++ server/doc/sysmon-server.sh | 100 ++++++++++++++++++ server/doc/sysv-init.md | 6 ++ 23 files changed, 256 insertions(+), 198 deletions(-) create mode 100644 client/doc/sysmon-client.sh create mode 100644 client/doc/sysv-init.md delete mode 100644 doc/ansible/README.md delete mode 100644 doc/ansible/sysmon-client-aix.yml delete mode 100644 doc/ansible/sysmon-client-linux.yml delete mode 100644 doc/ansible/templates/sysmon-client.service.j2 delete mode 100644 doc/ansible/timezone-aix.yml create mode 100644 doc/monitoring-eye-320x320.png rename doc/{monitoring-eye-svgrepo-com.png => monitoring-eye-512x512.png} (100%) create mode 100644 server/doc/AIX.md create mode 100644 server/doc/sysmon-server.sh create mode 100644 server/doc/sysv-init.md diff --git a/README.md b/README.md index 81bcb88..69f6021 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This software is free to use and is licensed under the [Apache 2.0 License](LICE - Example dashboards are provided in the [doc/](doc) folder, which can be imported into your Grafana installation. - Screenshots are available in the [downloads](https://bitbucket.org/mnellemann/sysmon/downloads/) section. -![Sysmon Icon](doc/monitoring-eye-svgrepo-com.png) +![Sysmon Icon](doc/monitoring-eye-320x320.png) ## Components @@ -15,17 +15,18 @@ Runs on your hosts and collects metrics, which are sent to the central *server*. [More information](client/README.md). +### Plugins + +Loaded by the *client* and provides extensions for doing the actual collecting of metrics. + +[More information](plugins/README.md). + ### Server Receives aggregated metrics from *clients* and saves these into InfluxDB. [More information](server/README.md). -### Plugins - -Loaded by the *client* and provides extensions for doing the actual collecting of metrics. - -[More information](plugins/README.md). ## Known problems diff --git a/client/README.md b/client/README.md index d5d165a..2d23ac9 100644 --- a/client/README.md +++ b/client/README.md @@ -1,6 +1,12 @@ # Client -Client component. +This is the client component of SysMon. Install on the hosts for which you want to collect metrics. + +## Installation + +Download *.deb* or *.rpm* packages for sysmon-client *and* sysmon-plugins, and install. + +See the [doc/systemd.md](doc/systemd.md) or [doc/sysv-init.md](doc/sysv-init.md) files for further instructions. ## Development diff --git a/client/doc/AIX.md b/client/doc/AIX.md index cea5076..db4374e 100644 --- a/client/doc/AIX.md +++ b/client/doc/AIX.md @@ -13,9 +13,4 @@ rpm -i --ignoreos sysmon-client.rpm sysmon-plugins.rpm ## Run automatically at boot -Change the *sysmon-server* URL for your environment. - -```shell -mkitab 'sysmon:2:respawn:env JAVA_HOME=/usr/java8_64 /opt/sysmon/client/bin/client -s http://10.20.30.40:9925/metrics >/tmp/sysmon.log 2>&1' -init q -``` +See the [sysv-init.md](sysv-init.md) file for instructions. \ No newline at end of file diff --git a/client/doc/sysmon-client.service b/client/doc/sysmon-client.service index cee5c52..e6e25d9 100644 --- a/client/doc/sysmon-client.service +++ b/client/doc/sysmon-client.service @@ -2,6 +2,8 @@ Description=Sysmon Client Service [Service] +#User=nobody +#Group=nobody TimeoutSec=20 Restart=on-failure ExecStart=/opt/sysmon/client/bin/client -s http://10.20.30.40:9925/metrics diff --git a/client/doc/sysmon-client.sh b/client/doc/sysmon-client.sh new file mode 100644 index 0000000..e958d1f --- /dev/null +++ b/client/doc/sysmon-client.sh @@ -0,0 +1,100 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start daemon at boot time +# Description: Enable service provided by daemon. +### END INIT INFO + +dir="/opt/sysmon/client" +cmd="/opt/sysmon/client/bin/client" +args="-s http://10.20.30.40:9925/metrics" +user="" + +name=`basename $0` +pid_file="/var/run/$name.pid" +stdout_log="/var/log/$name.log" +stderr_log="/var/log/$name.err" + +get_pid() { + cat "$pid_file" +} + +is_running() { + [ -f "$pid_file" ] && ps -p `get_pid` > /dev/null 2>&1 +} + +case "$1" in + start) + if is_running; then + echo "Already started" + else + echo "Starting $name" + cd "$dir" + if [ -z "$user" ]; then + $cmd $args >> "$stdout_log" 2>> "$stderr_log" & + else + sudo -u "$user" $cmd $args >> "$stdout_log" 2>> "$stderr_log" & + fi + echo $! > "$pid_file" + if ! is_running; then + echo "Unable to start, see $stdout_log and $stderr_log" + exit 1 + fi + fi + ;; + stop) + if is_running; then + echo -n "Stopping $name.." + kill `get_pid` + for i in 1 2 3 4 5 6 7 8 9 10 + # for i in `seq 10` + do + if ! is_running; then + break + fi + + echo -n "." + sleep 1 + done + echo + + if is_running; then + echo "Not stopped; may still be shutting down or shutdown may have failed" + exit 1 + else + echo "Stopped" + if [ -f "$pid_file" ]; then + rm "$pid_file" + fi + fi + else + echo "Not running" + fi + ;; + restart) + $0 stop + if is_running; then + echo "Unable to stop, will not attempt to start" + exit 1 + fi + $0 start + ;; + status) + if is_running; then + echo "Running" + else + echo "Stopped" + exit 1 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/client/doc/sysv-init.md b/client/doc/sysv-init.md new file mode 100644 index 0000000..909ddb7 --- /dev/null +++ b/client/doc/sysv-init.md @@ -0,0 +1,6 @@ +# 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. +- SymLink to the required run-levels. + diff --git a/doc/ansible/README.md b/doc/ansible/README.md deleted file mode 100644 index a89fbd8..0000000 --- a/doc/ansible/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Example Ansible Playbooks - -For installing on AIX and RPM-based Linux. \ No newline at end of file diff --git a/doc/ansible/sysmon-client-aix.yml b/doc/ansible/sysmon-client-aix.yml deleted file mode 100644 index 785177f..0000000 --- a/doc/ansible/sysmon-client-aix.yml +++ /dev/null @@ -1,63 +0,0 @@ ---- -# -# Example ansible playbook for installation of sysmon client on AIX. -# More information at: https://bitbucket.org/mnellemann/sysmon -# -# ansible-galaxy collection install community.general -# ansible-playbook -i aixhost, -u root sysmon-client-aix.yml -# -# NOTE: Ensure correct timezone and time - -- name: "Install Sysmon Client and Plugins on AIX" - hosts: all - gather_facts: yes - vars: - server_url: http://sysmon-server:9925/metrics - - tasks: - - - name: Sysmon Client | Ensure hostname resolves - ansible.builtin.lineinfile: - path: /etc/hosts - state: present - line: "127.0.1.1 {{ ansible_hostname }}" - - - name: Sysmon Client | Copy sysmon-client.rpm - ansible.builtin.copy: - src: "{{ item }}" - dest: /opt/sysmon-client.rpm - with_fileglob: - - ../../client/build/distributions/sysmon-client-*.noarch.rpm - - - name: Sysmon Client | Copy sysmon-plugins.rpm - ansible.builtin.copy: - src: "{{ item }}" - dest: /opt/sysmon-plugins.rpm - with_fileglob: - - ../../plugins/build/distributions/sysmon-plugins-*.noarch.rpm - - - name: Sysmon Client | Install sysmon-client.rpm - ansible.builtin.command: /usr/bin/rpm -i --ignoreos /opt/sysmon-client.rpm - args: - creates: /opt/sysmon/client - - - name: Sysmon Client | Install sysmon-plugins.rpm - ansible.builtin.command: /usr/bin/rpm -i --ignoreos /opt/sysmon-plugins.rpm - args: - creates: /opt/sysmon/plugins - - - name: Sysmon Client | Create inittab entry for sysmon-client - community.general.aix_inittab: - name: sysmon - runlevel: '2' - action: respawn - command: env JAVA_HOME=/usr/java8_64 /opt/sysmon/client/bin/client -s {{ server_url }} >/tmp/sysmon.log 2>&1 - state: present - become: yes - notify: - - reload inittab - - handlers: - - - name: reload inittab - command: init q diff --git a/doc/ansible/sysmon-client-linux.yml b/doc/ansible/sysmon-client-linux.yml deleted file mode 100644 index 4bfcb0d..0000000 --- a/doc/ansible/sysmon-client-linux.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- -# -# Example ansible playbook for installation of sysmon client on Linux (RPM based). -# More information at: https://bitbucket.org/mnellemann/sysmon -# -# ansible-playbook -i linuxhost, -u root sysmon-client-linux.yml -# -# NOTE: Ensure correct timezone and time - -- name: "Install Sysmon Client and Plugins on Linux (RPM based)" - hosts: all - gather_facts: no - vars: - server_url: http://sysmon-server:9925/metrics - - tasks: - - - name: Sysmon Client | Copy sysmon-client.rpm - ansible.builtin.copy: - src: "{{ item }}" - dest: /opt/sysmon-client.rpm - with_fileglob: - - ../../client/build/distributions/sysmon-client-*.noarch.rpm - - - name: Sysmon Client | Copy sysmon-plugins.rpm - ansible.builtin.copy: - src: "{{ item }}" - dest: /opt/sysmon-plugins.rpm - with_fileglob: - - ../../plugins/build/distributions/sysmon-plugins-*.noarch.rpm - - - name: Sysmon Client | Install OpenJDK (headless) - yum: - name: "java-11-openjdk-headless" - state: present - - - name: Sysmon Client | Install sysmon-client.rpm - yum: - name: /opt/sysmon-client.rpm - state: present - disable_gpg_check: true - - - name: Sysmon Plugins | Install sysmon-plugins.rpm - yum: - name: /opt/sysmon-plugins.rpm - state: present - disable_gpg_check: true - - - name: Sysmon Client | Create service file - template: src=sysmon-client.service.j2 dest=/lib/systemd/system/sysmon-client.service mode=644 - notify: - - reload systemctl - - - name: Sysmon Client | Start service - service: name=sysmon-client.service state=started enabled=yes - - - handlers: - - - name: reload systemctl - command: systemctl daemon-reload diff --git a/doc/ansible/templates/sysmon-client.service.j2 b/doc/ansible/templates/sysmon-client.service.j2 deleted file mode 100644 index 25ea9a2..0000000 --- a/doc/ansible/templates/sysmon-client.service.j2 +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Sysmon Client Service - -[Service] -TimeoutStartSec=3 -Restart=always -ExecStart=/opt/sysmon/client/bin/client -s {{server_url}} - -[Install] -WantedBy=default.target diff --git a/doc/ansible/timezone-aix.yml b/doc/ansible/timezone-aix.yml deleted file mode 100644 index 97c426a..0000000 --- a/doc/ansible/timezone-aix.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# -# Example ansible playbook for timezone and NTP setup on AIX. -# -# ansible-playbook -i aixhost, -u root timezone-aix.yml -# - -- name: "Timezone and NTP on AIX" - hosts: all - gather_facts: no - vars: - timezone: Europe/Copenhagen - ntp_server: dk.pool.ntp.org - - tasks: - - - name: Configure timezone - ansible.builtin.replace: - path: /etc/environment - regexp: '^TZ=(.*)$' - replace: "TZ={{ timezone }}" - - - name: Update time from NTP server - ansible.builtin.command: "env TZ={{ timezone }} /usr/sbin/ntpdate {{ ntp_server }}" - - - name: Create cron entry for updating time periodically - ansible.builtin.cron: - name: ntpdate - weekday: "*" - minute: "1" - hour: "*" - user: root - job: "/usr/sbin/ntpdate {{ ntp_server }}" diff --git a/doc/monitoring-eye-320x320.png b/doc/monitoring-eye-320x320.png new file mode 100644 index 0000000000000000000000000000000000000000..b76724adca40a2fbc4290aa857d392df0cf5ba6b GIT binary patch literal 17817 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 literal 0 HcmV?d00001 diff --git a/doc/monitoring-eye-svgrepo-com.png b/doc/monitoring-eye-512x512.png similarity index 100% rename from doc/monitoring-eye-svgrepo-com.png rename to doc/monitoring-eye-512x512.png diff --git a/gradle.properties b/gradle.properties index 2c76e0e..6f8fccf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ version=0.1.7 pf4jVersion=3.6.0 slf4jVersion=1.7.32 -camelVersion=3.11.4 +camelVersion=3.14.0 picocliVersion=4.6.2 -oshiVersion=5.8.5 \ No newline at end of file +oshiVersion=5.8.6 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85..d2880ba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/plugins/README.md b/plugins/README.md index 6e6b5b9..38ebedf 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -2,6 +2,6 @@ Collection of standard sysmon plugins. -- [base](os-base/) - base OS metrics +- [base](os-base/) - Base OS metrics (through [oshi](https://github.com/oshi/oshi)) - [aix](os-aix/) - AIX (and Power) specific metrics - [linux](os-linux/) - Linux specific metrics \ No newline at end of file diff --git a/plugins/os-base/README.md b/plugins/os-base/README.md index e0790fe..8470b4e 100644 --- a/plugins/os-base/README.md +++ b/plugins/os-base/README.md @@ -40,7 +40,7 @@ Metrics reported are: ## Filesystem Extension ### Metrics -- + - **free_bytes** - Free bytes for filesystem. - **total_bytes** - Total bytes for filesystem. - **free_inoed** - Free inodes for filesystem. diff --git a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseDetailsExtension.java b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseDetailsExtension.java index e03640f..912e6bf 100644 --- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseDetailsExtension.java +++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseDetailsExtension.java @@ -4,15 +4,11 @@ import org.pf4j.Extension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import oshi.SystemInfo; -import oshi.hardware.HWDiskStore; -import oshi.hardware.HardwareAbstractionLayer; import sysmon.shared.Measurement; import sysmon.shared.MetricExtension; import sysmon.shared.MetricResult; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; @Extension diff --git a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetstatExtension.java b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetstatExtension.java index 3f57f33..bf1a383 100644 --- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetstatExtension.java +++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetstatExtension.java @@ -4,15 +4,11 @@ import org.pf4j.Extension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import oshi.SystemInfo; -import oshi.hardware.HWDiskStore; -import oshi.hardware.HardwareAbstractionLayer; import sysmon.shared.Measurement; import sysmon.shared.MetricExtension; import sysmon.shared.MetricResult; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; @Extension diff --git a/server/README.md b/server/README.md index 4546314..0947758 100644 --- a/server/README.md +++ b/server/README.md @@ -1,10 +1,12 @@ # Server -Server component. +This is the server component of SysMon. ## Installation -TODO. +Download *.deb* or *.rpm* package and install. + +See the [doc/systemd.md](doc/systemd.md) or [doc/sysv-init.md](doc/sysv-init.md) files for further instructions. ### Influx Database diff --git a/server/doc/AIX.md b/server/doc/AIX.md new file mode 100644 index 0000000..1c0bbcd --- /dev/null +++ b/server/doc/AIX.md @@ -0,0 +1,18 @@ +# AIX Notes + +Works on IBM Power AIX installations. + +## Installation + +We require Java 8, which should already be installed on AIX, or is available to install. +The RPM packages are *"noarch"* Java bytecode, so we can use the **--ignoreos** option to install: + +```shell +rpm -i --ignoreos sysmon-server.rpm +``` + +You can find InfluxDB and Grafana packaged for AIX on the [https://www.power-devops.com/](https://www.power-devops.com/) website. + +## Run automatically at boot + +See the [sysv-init.md](sysv-init.md) file for instructions. \ No newline at end of file diff --git a/server/doc/sysmon-server.sh b/server/doc/sysmon-server.sh new file mode 100644 index 0000000..60f4b38 --- /dev/null +++ b/server/doc/sysmon-server.sh @@ -0,0 +1,100 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start daemon at boot time +# Description: Enable service provided by daemon. +### END INIT INFO + +dir="/opt/sysmon/server" +cmd="/opt/sysmon/server/bin/server" +args="-d" +user="" + +name=`basename $0` +pid_file="/var/run/$name.pid" +stdout_log="/var/log/$name.log" +stderr_log="/var/log/$name.err" + +get_pid() { + cat "$pid_file" +} + +is_running() { + [ -f "$pid_file" ] && ps -p `get_pid` > /dev/null 2>&1 +} + +case "$1" in + start) + if is_running; then + echo "Already started" + else + echo "Starting $name" + cd "$dir" + if [ -z "$user" ]; then + $cmd $args >> "$stdout_log" 2>> "$stderr_log" & + else + sudo -u "$user" $cmd $args >> "$stdout_log" 2>> "$stderr_log" & + fi + echo $! > "$pid_file" + if ! is_running; then + echo "Unable to start, see $stdout_log and $stderr_log" + exit 1 + fi + fi + ;; + stop) + if is_running; then + echo -n "Stopping $name.." + kill `get_pid` + for i in 1 2 3 4 5 6 7 8 9 10 + # for i in `seq 10` + do + if ! is_running; then + break + fi + + echo -n "." + sleep 1 + done + echo + + if is_running; then + echo "Not stopped; may still be shutting down or shutdown may have failed" + exit 1 + else + echo "Stopped" + if [ -f "$pid_file" ]; then + rm "$pid_file" + fi + fi + else + echo "Not running" + fi + ;; + restart) + $0 stop + if is_running; then + echo "Unable to stop, will not attempt to start" + exit 1 + fi + $0 start + ;; + status) + if is_running; then + echo "Running" + else + echo "Stopped" + exit 1 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/server/doc/sysv-init.md b/server/doc/sysv-init.md new file mode 100644 index 0000000..9bd78aa --- /dev/null +++ b/server/doc/sysv-init.md @@ -0,0 +1,6 @@ +# SysV init Notes + +- Copy the *sysmon-server.sh* into *sysmon-server* in the correct location for init scripts on your operating system. +- Edit the file if you need to specify any options in the *args* variable. +- SymLink to the required run-levels. +