Skip to content

Commit c287f72

Browse files
sebkirsebkir
committed
2.2.0-only added macro for current version to agent articles
1 parent 68a51d4 commit c287f72

File tree

6 files changed

+41
-41
lines changed

6 files changed

+41
-41
lines changed

‎src/common/de/agent_linux.asciidoc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,15 @@ Setzen Sie `/mysite/check_mk/agents/` vor den Dateinamen, im folgenden Beispiel
137137

138138
[{shell-raw}]
139139
----
140-
{c-root} wget http://mycmkserver/mysite/check_mk/agents/check-mk-agent-2.1.0b1-1.noarch.rpm
140+
{c-root} wget http://mycmkserver/mysite/check_mk/agents/check-mk-agent-{current}-1.noarch.rpm
141141
----
142142

143143
*Tipp:* RPM hat sogar ein eingebautes `wget`.
144144
Hier können Sie Download und xref:install_package[Installation] mit einem Kommando durchführen:
145145

146146
[{shell-raw}]
147147
----
148-
{c-root} rpm -U http://mycmkserver/mysite/check_mk/agents/check-mk-agent-2.1.0b1-1.noarch.rpm
148+
{c-root} rpm -U http://mycmkserver/mysite/check_mk/agents/check-mk-agent-{current}-1.noarch.rpm
149149
----
150150

151151

@@ -185,7 +185,7 @@ Die Installation des RPM-Pakets erfolgt unter `root` mit dem Befehl `rpm -U`:
185185

186186
[{shell}]
187187
----
188-
{c-root} rpm -U check-mk-agent-2.1.0b1-1.noarch.rpm
188+
{c-root} rpm -U check-mk-agent-{current}-1.noarch.rpm
189189
----
190190

191191
Die Option `-U` steht übrigens für „Update“, kann aber auch eine Erstinstallation korrekt durchführen.
@@ -195,7 +195,7 @@ Die Installation des DEB-Pakets -- und ein Update -- erfolgt unter `root` mit de
195195

196196
[{shell}]
197197
----
198-
{c-root} dpkg -i check-mk-agent_2.1.0b1-1_all.deb
198+
{c-root} dpkg -i check-mk-agent_{current}-1_all.deb
199199
(Reading database ... 739920 files and directories currently installed.)
200200
Preparing to unpack .../check-mk-agent_2.1.0b5-1_all.deb ...
201201
Unpacking check-mk-agent (2.1.0b5-1) ...
@@ -348,7 +348,7 @@ Als Ausgabe sollte die Versionsnummer zu sehen sein, beispielsweise:
348348

349349
[{shell}]
350350
----
351-
cmk-agent-ctl 2.2.0b1
351+
cmk-agent-ctl {current}
352352
----
353353

354354
In seltenen Fällen erscheint die folgende Fehlermeldung:
@@ -619,7 +619,7 @@ Sie können Ihn mit der Taste Q verlassen:
619619
----
620620
{c-root} check_mk_agent | less
621621
<<<check_mk>>>
622-
Version: 2.2.0b1
622+
Version: {current}
623623
AgentOS: linux
624624
Hostname: mynewhost
625625
AgentDirectory: /etc/check_mk
@@ -738,7 +738,7 @@ Der Agent Controller stellt ein eigenes Subkommando `dump` bereit, das die volls
738738
----
739739
{c-root} cmk-agent-ctl dump | less
740740
<<<check_mk>>>
741-
Version: 2.2.0b1
741+
Version: {current}
742742
AgentOS: linux
743743
Hostname: mynewhost
744744
----
@@ -1304,7 +1304,7 @@ So finden Sie heraus, welches DEB-Paket installiert ist:
13041304
[{shell}]
13051305
----
13061306
{c-root} dpkg -l | grep check-mk-agent
1307-
ii check-mk-agent 2.1.0b1-1 all Checkmk Agent for Linux
1307+
ii check-mk-agent {current}-1 all Checkmk Agent for Linux
13081308
----
13091309

13101310
Die Deinstallation des DEB-Pakets erfolgt dann mit `dpkg --purge`:

‎src/common/de/agent_linux_legacy.asciidoc‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ Sie können diese über den Browser herunterladen oder direkt auf dem Host im Mo
6666

6767
[{shell-raw}]
6868
----
69-
{c-root} wget http://mycmkserver/mysite/check_mk/agents/check-mk-agent-2.2.0b1-1.noarch.rpm
69+
{c-root} wget http://mycmkserver/mysite/check_mk/agents/check-mk-agent-{current}-1.noarch.rpm
7070
----
7171

7272
Auf RHEL, SLES und verwandten Distributionen erfolgt die Installation des RPM-Pakets unter `root` mit dem Befehl `rpm -U`:
7373

7474
[{shell}]
7575
----
76-
{c-root} rpm -U check-mk-agent-2.2.0b1-1.noarch.rpm
76+
{c-root} rpm -U check-mk-agent-{current}-1.noarch.rpm
7777
----
7878

7979
Die Option `-U` steht übrigens für „Update“, kann aber auch eine Erstinstallation korrekt durchführen.
@@ -82,11 +82,11 @@ Die Installation des DEB-Pakets auf Debian, Ubuntu oder verwandten Distributione
8282

8383
[{shell}]
8484
----
85-
{c-root} dpkg -i check-mk-agent_2.2.0b1-1_all.deb
85+
{c-root} dpkg -i check-mk-agent_{current}-1_all.deb
8686
(Reading database ... 739920 files and directories currently installed.)
87-
Preparing to unpack .../check-mk-agent_2.2.0b1-1_all.deb ...
88-
Unpacking check-mk-agent (2.2.0b1-1) ...
89-
Setting up check-mk-agent (2.2.0b1-1) ...
87+
Preparing to unpack .../check-mk-agent_{current}-1_all.deb ...
88+
Unpacking check-mk-agent ({current}-1) ...
89+
Setting up check-mk-agent ({current}-1) ...
9090
----
9191

9292

@@ -103,7 +103,7 @@ Wir verwenden zudem `--no-overwrite-dir`, damit Berechtigungen von bereits vorha
103103

104104
[{shell-raw}]
105105
----
106-
{c-root} tar -C / --no-overwrite-dir -xvf /tmp/check-mk-agent_2.2.0b1.tar.gz
106+
{c-root} tar -C / --no-overwrite-dir -xvf /tmp/check-mk-agent_{current}.tar.gz
107107
----
108108

109109
Wenn Sie alles richtig gemacht haben, muss das Agentenskript jetzt einfach als Befehl ausführbar sein und seine typische Ausgabe erzeugen.
@@ -113,7 +113,7 @@ Das `|{nbsp}head` schneidet hier alles ab der 11. Zeile weg:
113113
----
114114
{c-root} check_mk_agent | head
115115
<<<check_mk>>>
116-
Version: 2.2.0b1
116+
Version: {current}
117117
AgentOS: linux
118118
Hostname: mycmkserver
119119
AgentDirectory: /etc/check_mk
@@ -161,7 +161,7 @@ Das `|{nbsp}head` schneidet hier alles ab der 11. Zeile weg:
161161
----
162162
{c-root} check_mk_agent | head
163163
<<<check_mk>>>
164-
Version: 2.2.0b1
164+
Version: {current}
165165
AgentOS: linux
166166
Hostname: mycmkserver
167167
AgentDirectory: /etc/check_mk
@@ -361,7 +361,7 @@ Nun können Sie sich mit `telnet` oder `nc` (`netcat`) auf TCP Port 6556 verbind
361361
----
362362
{c-omd} nc 12.34.56.78 6556
363363
<<<check_mk>>>
364-
Version: 2.2.0b1
364+
Version: {current}
365365
AgentOS: linux
366366
Hostname: myhost123
367367
AgentDirectory: /etc/check_mk
@@ -507,7 +507,7 @@ The authenticity of host 'myhost23 (10.11.12.13)' can't be established.
507507
ECDSA key fingerprint is SHA256:lWgVK+LtsMgjHUbdsA1FK12PdmVQGqaEY4TE8TEps3w.
508508
Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
509509
<<<check_mk>>>
510-
Version: 2.2.0b1
510+
Version: {current}
511511
AgentOS: linux
512512
Hostname: myhost123
513513
AgentDirectory: /etc/check_mk

‎src/common/de/agent_windows.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ Sie können Ihn mit der Taste Q verlassen:
633633
----
634634
C:\Windows\system32> "C:\Program Files (x86)\checkmk\service\check_mk_agent.exe" test | more
635635
<<<check_mk>>>
636-
Version: 2.2.0b1
636+
Version: {current}
637637
AgentOS: windows
638638
Hostname: DESKTOP-XYZA123
639639
AgentController: cmk-agent-ctl 2.2.0
@@ -729,7 +729,7 @@ Sie können Ihn mit der Taste Q verlassen:
729729
----
730730
C:\Windows\system32> "C:\Program Files (x86)\checkmk\service\cmk-agent-ctl.exe" dump | more
731731
<<<check_mk>>>
732-
Version: 2.2.0b1
732+
Version: {current}
733733
BuildDate: Mar 14 2023
734734
AgentOS: windows
735735
Hostname: DESKTOP-QVPV284

‎src/common/en/agent_linux.asciidoc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ Put `/mysite/check_mk/agents/` in front of the filename, in the following exampl
136136

137137
[{shell-raw}]
138138
----
139-
{c-root} wget http://mycmkserver/mysite/check_mk/agents/check-mk-agent-2.1.0b1-1.noarch.rpm
139+
{c-root} wget http://mycmkserver/mysite/check_mk/agents/check-mk-agent-{current}-1.noarch.rpm
140140
----
141141

142142
*Tip:* RPM even has a built-in `wget`.
143143
Here you can download and xref:install_package[install] with a single command:
144144

145145
[{shell-raw}]
146146
----
147-
{c-root} rpm -U http://mycmkserver/mysite/check_mk/agents/check-mk-agent-2.1.0b1-1.noarch.rpm
147+
{c-root} rpm -U http://mycmkserver/mysite/check_mk/agents/check-mk-agent-{current}-1.noarch.rpm
148148
----
149149

150150

@@ -182,7 +182,7 @@ The RPM package is installed under `root` with the command `rpm -U`:
182182

183183
[{shell}]
184184
----
185-
{c-root} rpm -U check-mk-agent-2.1.0b1-1.noarch.rpm
185+
{c-root} rpm -U check-mk-agent-{current}-1.noarch.rpm
186186
----
187187

188188
By the way, the `-U` option stands for 'update', but it can also perform an initial installation correctly.
@@ -192,7 +192,7 @@ The installation of the DEB package -- and an update -- is done under `root` wit
192192

193193
[{shell}]
194194
----
195-
{c-root} dpkg -i check-mk-agent_2.1.0b1-1_all.deb
195+
{c-root} dpkg -i check-mk-agent_{current}-1_all.deb
196196
(Reading database ... 739920 files and directories currently installed.)
197197
Preparing to unpack .../check-mk-agent_2.1.0b5-1_all.deb ...
198198
Unpacking check-mk-agent (2.1.0b5-1) ...
@@ -346,7 +346,7 @@ The version number should be shown in the output, for example:
346346

347347
[{shell}]
348348
----
349-
cmk-agent-ctl 2.2.0b1
349+
cmk-agent-ctl {current}
350350
----
351351

352352
In rare cases, the following error message may appear:
@@ -618,7 +618,7 @@ You can exit it with the Q key:
618618
----
619619
{c-root} check_mk_agent | less
620620
<<<check_mk>>>
621-
Version: 2.2.0b1
621+
Version: {current}
622622
AgentOS: linux
623623
Hostname: mynewhost
624624
AgentDirectory: /etc/check_mk
@@ -735,7 +735,7 @@ The Agent Controller provides its own `dump` subcommand that displays the full a
735735
----
736736
{c-root} cmk-agent-ctl dump | less
737737
<<<check_mk>>>
738-
Version: 2.2.0b1
738+
Version: {current}
739739
AgentOS: linux
740740
Hostname: mynewhost
741741
----
@@ -1273,7 +1273,7 @@ This is how you find out which DEB package is installed:
12731273
[{shell}]
12741274
----
12751275
{c-root} dpkg -l | grep check-mk-agent
1276-
ii check-mk-agent 2.1.0b1-1 all Checkmk Agent for Linux
1276+
ii check-mk-agent {current}-1 all Checkmk Agent for Linux
12771277
----
12781278

12791279
The uninstallation of the DEB package is then done using `dpkg --purge`:

‎src/common/en/agent_linux_legacy.asciidoc‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ You can download these files via the browser or use `wget` or `curl` to download
6565

6666
[{shell-raw}]
6767
----
68-
{c-root} wget http://mycmkserver/mysite/check_mk/agents/check-mk-agent-2.2.0b1-1.noarch.rpm
68+
{c-root} wget http://mycmkserver/mysite/check_mk/agents/check-mk-agent-{current}-1.noarch.rpm
6969
----
7070

7171
On RHEL, SLES and related distributions, the RPM package is installed as `root` with the command `rpm -U`:
7272

7373
[{shell}]
7474
----
75-
{c-root} rpm -U check-mk-agent-2.2.0b1-1.noarch.rpm
75+
{c-root} rpm -U check-mk-agent-{current}-1.noarch.rpm
7676
----
7777

7878
By the way, the `-U` option stands for 'update' but it can also perform an initial installation correctly.
@@ -81,11 +81,11 @@ The installation of the DEB package on Debian, Ubuntu or related distributions i
8181

8282
[{shell}]
8383
----
84-
{c-root} dpkg -i check-mk-agent_2.2.0b1-1_all.deb
84+
{c-root} dpkg -i check-mk-agent_{current}-1_all.deb
8585
(Reading database ... 739920 files and directories currently installed.)
86-
Preparing to unpack .../check-mk-agent_2.2.0b1-1_all.deb ...
87-
Unpacking check-mk-agent (2.2.0b1-1) ...
88-
Setting up check-mk-agent (2.2.0b1-1) ...
86+
Preparing to unpack .../check-mk-agent_{current}-1_all.deb ...
87+
Unpacking check-mk-agent ({current}-1) ...
88+
Setting up check-mk-agent ({current}-1) ...
8989
----
9090

9191

@@ -103,7 +103,7 @@ We also use `--no-overwrite-dir` so that permissions for already existing direct
103103

104104
[{shell-raw}]
105105
----
106-
{c-root} tar -C / --no-overwrite-dir -xvf /tmp/check-mk-agent_2.2.0b1.tar.gz
106+
{c-root} tar -C / --no-overwrite-dir -xvf /tmp/check-mk-agent_{current}.tar.gz
107107
----
108108

109109
If you have done everything correctly, the agent script should now simply be executable as a command and produce its typical output.
@@ -113,7 +113,7 @@ The `|{nbsp}head` truncates everything following the 11th line of output:
113113
----
114114
{c-root} check_mk_agent | head
115115
<<<check_mk>>>
116-
Version: 2.2.0b1
116+
Version: {current}
117117
AgentOS: linux
118118
Hostname: mycmkserver
119119
AgentDirectory: /etc/check_mk
@@ -160,7 +160,7 @@ The `|{nbsp}head` truncates everything following the 10th line of output:
160160
----
161161
{c-root} check_mk_agent | head
162162
<<<check_mk>>>
163-
Version: 2.2.0b1
163+
Version: {current}
164164
AgentOS: linux
165165
Hostname: mycmkserver
166166
AgentDirectory: /etc/check_mk
@@ -360,7 +360,7 @@ Now you can connect with `telnet` or `nc` (`netcat`) on TCP port 6556 -- first f
360360
----
361361
{c-omd} nc 12.34.56.78 6556
362362
<<<check_mk>>>
363-
Version: 2.2.0b1
363+
Version: {current}
364364
AgentOS: linux
365365
Hostname: myhost123
366366
AgentDirectory: /etc/check_mk
@@ -506,7 +506,7 @@ The authenticity of host 'myhost23 (10.11.12.13)' can't be established.
506506
ECDSA key fingerprint is SHA256:lWgVK+LtsMgjHUbdsA1FK12PdmVQGqaEY4TE8TEps3w.
507507
Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
508508
<<<check_mk>>>
509-
Version: 2.2.0b1
509+
Version: {current}
510510
AgentOS: linux
511511
Hostname: myhost123
512512
AgentDirectory: /etc/check_mk

‎src/common/en/agent_windows.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ You can exit it with the Q key:
684684
----
685685
C:\Windows\system32> "C:\Program Files (x86)\checkmk\service\cmk-agent-ctl.exe" dump | more
686686
<<<check_mk>>>
687-
Version: 2.2.0b1
687+
Version: {current}
688688
BuildDate: Mar 14 2023
689689
AgentOS: windows
690690
Hostname: DESKTOP-QVPV284

0 commit comments

Comments
 (0)