Skip to content

Commit f490c8f

Browse files
author
Mattias Schlenker
committed
KNW-2079 pick-25 update standard paths to the FreeBSD conventions obeyed in 2.5
1 parent af35187 commit f490c8f

2 files changed

Lines changed: 19 additions & 31 deletions

File tree

‎src/onprem/de/agent_freebsd.asciidoc‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ root@bsd:/root # check_mk_agent | more
106106
Version: {current}
107107
AgentOS: freebsd
108108
Hostname: beastie
109-
AgentDirectory: /etc/check_mk
110-
DataDirectory: /var/lib/check_mk_agent
111-
SpoolDirectory: /var/lib/check_mk_agent/spool
109+
AgentDirectory: /usr/local/etc/check_mk
110+
DataDirectory: /var/db/check_mk_agent
111+
SpoolDirectory: /var/db/check_mk_agent/spool
112112
PluginsDirectory: /usr/local/lib/check_mk_agent/plugins
113113
LocalDirectory: /usr/local/lib/check_mk_agent/local
114114
OSType: unix
115115
OSName: FreeBSD
116-
OSVersion: 14.4
116+
OSVersion: 15.1
117117
----
118118

119119
Falls gar nichts ausgegeben wird, überprüfen Sie bitte noch einmal die Voraussetzungen, insbesondere, dass die Bash unter `/usr/local/bin` installiert ist.
@@ -219,9 +219,9 @@ Den Anfang macht xref:agent_linux.html#mrpe[MRPE].
219219

220220
=== MRPE
221221

222-
Erstellen Sie eine Konfigurationsdatei `/etc/check_mk/mrpe.cfg` mit folgendem Inhalt:
222+
Erstellen Sie eine Konfigurationsdatei `/usr/local/etc/check_mk/mrpe.cfg` mit folgendem Inhalt:
223223

224-
./etc/check_mk/mrpe.cfg
224+
./usr/local/etc/check_mk/mrpe.cfg
225225
[{file}]
226226
----
227227
Flux_Comp /bin/echo 'OK - Flux compensator up and running'
@@ -285,13 +285,7 @@ image::agent_freebsd_local.png[alt="Liste mit dem neu erkannten Service Hello Be
285285
|`/usr/local/lib/check_mk_agent` |Basisverzeichnis für Erweiterungen des Agenten.
286286
|`/usr/local/lib/check_mk_agent/plugins` |Plugins, welche den Agenten um zusätzliche Überwachungsdaten erweitern. Plugins können in jeder verfügbaren Programmiersprache geschrieben werden.
287287
|`/usr/local/lib/check_mk_agent/local` |Ablageort für eigene xref:localchecks#[lokale Checks].
288-
|`/var/spool/check_mk_agent` |Enthält Daten, die z.B. von Cronjobs erstellt werden und eine eigene Sektion beinhalten. Diese werden ebenfalls der Agentenausgabe angehängt.
289-
|`/etc/check_mk` |Ablage von Konfigurationsdateien für den Agenten.
290-
|`/etc/check_mk/mrpe.cfg` |Konfigurationsdatei für xref:agent_linux#mrpe[MRPE] -- für die Ausführung von klassischen Nagios-kompatiblen Check-Plugins.
288+
|`/var/db/check_mk_agent/spool` |Enthält Daten, die z.B. von Cronjobs erstellt werden und eine eigene Sektion beinhalten. Diese werden ebenfalls der Agentenausgabe angehängt.
289+
|`/usr/local/etc/check_mk` |Ablage von Konfigurationsdateien für den Agenten.
290+
|`/usr/local/etc/check_mk/mrpe.cfg` |Konfigurationsdatei für xref:agent_linux#mrpe[MRPE] -- für die Ausführung von klassischen Nagios-kompatiblen Check-Plugins.
291291
|===
292-
293-
[TIP]
294-
====
295-
Für FreeBSD sind keine Standardpfade hinterlegt, wie für Linux unterhalb von `/var/lib/check_mk_agent`.
296-
Wählen Sie einen passenden Ablageort und tragen Sie diesen im Agentenskript ein.
297-
====

‎src/onprem/en/agent_freebsd.asciidoc‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ root@bsd:/root # check_mk_agent | more
108108
Version: {current}
109109
AgentOS: freebsd
110110
Hostname: beastie
111-
AgentDirectory: /etc/check_mk
112-
DataDirectory: /var/lib/check_mk_agent
113-
SpoolDirectory: /var/lib/check_mk_agent/spool
111+
AgentDirectory: /usr/local/etc/check_mk
112+
DataDirectory: /var/db/check_mk_agent
113+
SpoolDirectory: /var/db/check_mk_agent/spool
114114
PluginsDirectory: /usr/local/lib/check_mk_agent/plugins
115115
LocalDirectory: /usr/local/lib/check_mk_agent/local
116116
OSType: unix
117117
OSName: FreeBSD
118-
OSVersion: 14.4
118+
OSVersion: 15.1
119119
----
120120

121121
If no output at all is produced, please check the prerequisites again, in particular that Bash is installed under `/usr/local/bin`.
@@ -222,9 +222,9 @@ This is started using xref:agent_linux.html#mrpe[MRPE].
222222

223223
=== MRPE
224224

225-
Create a configuration file `/etc/check_mk/mrpe.cfg` with the following content:
225+
Create a configuration file `/usr/local/etc/check_mk/mrpe.cfg` with the following content:
226226

227-
./etc/check_mk/mrpe.cfg
227+
./usr/local/etc/check_mk/mrpe.cfg
228228
[{file}]
229229
----
230230
Flux_Comp /bin/echo 'OK - Flux compensator up and running'
@@ -249,7 +249,7 @@ image::agent_freebsd_mrpe.png[alt="List with the newly detected service Flux_Com
249249

250250
The installation of the agent plug-ins is the same as described in the xref:agent_linux#manualplugins[Linux agent article].
251251
Be sure to use the correct Shebang when installing any plug-ins.
252-
Perl and Python are installed in `/usr/local/bin` on FreeBSD, and many a shell script that works with `/bin/sh` on Linux actually requires the Bourne Again shell installed in `/usr/local/bin/bash` on FreeBSD.
252+
Perl and Python are installed in `/usr/local/bin` on FreeBSD, and many times a shell script that works with `/bin/sh` on Linux actually requires the Bourne Again Shell installed as `/usr/local/bin/bash` on FreeBSD.
253253

254254
For testing, a simple xref:localchecks#[local check] is suitable, with which the evaluation of whether the monitored service is {OK}, {WARN} or {CRIT} is done directly on the monitored host.
255255
While we're at it, let's use a two-liner to test the Python interpreter.
@@ -288,13 +288,7 @@ image::agent_freebsd_local.png[alt="List with the newly detected service Hello B
288288
|`/usr/local/lib/check_mk_agent` |Base directory for agent extensions.
289289
|`/usr/local/lib/check_mk_agent/plugins` |Plug-ins, which extend the agent with additional monitoring data. Plug-ins can be written in any available programming language.
290290
|`/usr/local/lib/check_mk_agent/local` |Storage location for custom xref:localchecks#[local checks].
291-
|`/var/spool/check_mk_agent` |Contains data that is created by cronjobs, for example, and includes its own section. These are also appended to the agent output.
292-
|`/etc/check_mk` |Storage location for the agent's configuration files.
293-
|`/etc/check_mk/mrpe.cfg` |Configuration file for xref:agent_linux#mrpe[MRPE] -- for running classic Nagios compatible check plug-ins.
291+
|`/var/db/check_mk_agent/spool` |Contains data that is created by cronjobs, for example, and includes its own section. These are also appended to the agent output.
292+
|`/usr/local/etc/check_mk` |Storage location for the agent's configuration files.
293+
|`/usr/local/etc/check_mk/mrpe.cfg` |Configuration file for xref:agent_linux#mrpe[MRPE] -- for running classic Nagios compatible check plug-ins.
294294
|===
295-
296-
[TIP]
297-
====
298-
There are no default file paths defined for FreeBSD, as there are for Linux below `/var/lib/check_mk_agent`.
299-
Choose a suitable location and enter this in the agent's script.
300-
====

0 commit comments

Comments
 (0)