[checkmk-commits] Unified check_mk sections

Module: check_mk Branch: master Commit: a5dcb9e90c51796c12f32c9b0dc4257ca0182584 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5dcb9e90c5179… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Tue Jul 3 12:12:11 2018 +0200 Unified check_mk sections Change-Id: I58804aa7f412f1422798b9fb665ddce53968cc2e --- agents/check_mk_agent.aix | 13 +++++++++---- agents/check_mk_agent.freebsd | 14 +++++++++----- agents/check_mk_agent.hpux | 15 +++++++++------ agents/check_mk_agent.linux | 6 +++--- agents/check_mk_agent.macosx | 12 +++++++++--- agents/check_mk_agent.netbsd | 12 +++++++++--- agents/check_mk_agent.openbsd | 12 +++++++++--- agents/check_mk_agent.openwrt | 18 +++++++++--------- agents/check_mk_agent.solaris | 12 +++++++++--- 9 files changed, 75 insertions(+), 39 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 9ca376e..dc7ad5f 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -124,10 +124,15 @@ function run_cached { fi } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: aix -echo Hostname: $(hostname) +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: aix" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" echo '<<<df>>>' if [ -x /usr/opt/freeware/bin/df ] ; then diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 7395601..1da6507 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -104,11 +104,15 @@ function run_cached() { fi } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: freebsd - - +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: freebsd" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" osver="$(uname -r)" is_jailed="$(sysctl -n security.jail.jailed)" diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 4c1e839..4fe3ddd 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,12 +48,15 @@ else fi -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: hpux -echo PluginsDirectory: $PLUGINSDIR -echo LocalDirectory: $LOCALDIR -echo AgentDirectory: $MK_CONFDIR +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: hpux" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" # Filesystems. HP-UX does not provide a filesystem type. We assume # modern systems with vxfs only here. The filesystem type is currently diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 6850015..ac842d9 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -344,10 +344,10 @@ function run_real_time_checks() done } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" echo "AgentOS: linux" -echo "Hostname: $HOSTNAME" +echo "Hostname: $(hostname)" echo "AgentDirectory: $MK_CONFDIR" echo "DataDirectory: $MK_VARDIR" echo "SpoolDirectory: $SPOOLDIR" diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 388a78a..4ece76c 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,9 +43,15 @@ else fi -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: macosx +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: macosx" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index f4e1820..bf60f7c 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,9 +59,15 @@ else exec <&- 2>/dev/null fi -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: netbsd +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: netbsd" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 5e77954..b8263c5 100755 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,9 +59,15 @@ else exec <&- 2>/dev/null fi -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: openbsd +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: openbsd" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" osver="$(uname -r)" diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 94c3377..463e56a 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -220,15 +220,15 @@ run_real_time_checks() done } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: openwrt -echo Hostname: $HOSTNAME -echo AgentDirectory: $MK_CONFDIR -echo DataDirectory: $MK_VARDIR -echo SpoolDirectory: $SPOOLDIR -echo PluginsDirectory: $PLUGINSDIR -echo LocalDirectory: $LOCALDIR +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: openwrt" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" # If we are called via xinetd, try to find only_from configuration if [ -n "$REMOTE_HOST" ] diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 87e5f24..e5fa784 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -131,9 +131,15 @@ function run_cached () { } -echo '<<<check_mk>>>' -echo Version: 1.6.0i1 -echo AgentOS: solaris +echo "<<<check_mk>>>" +echo "Version: 1.6.0i1" +echo "AgentOS: solaris" +echo "Hostname: $(hostname)" +echo "AgentDirectory: $MK_CONFDIR" +echo "DataDirectory: $MK_VARDIR" +echo "SpoolDirectory: $SPOOLDIR" +echo "PluginsDirectory: $PLUGINSDIR" +echo "LocalDirectory: $LOCALDIR" # Find out what zone we are running in