Module: check_mk
Branch: master
Commit: 1dece38cc51b112cb6fde7c46634b30c28b3f0c5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dece38cc51b11…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Wed Nov 14 06:50:23 2018 +0100
mk_jolokia: use correct instance port
The port is used as default instance name.
Make sure it is the actual port of the instance,
not the default port.
E.g.: If a user configures a server at port 8443 and
gives no instance name, it should default to "8443"
-- not to "8080".
Change-Id: I74ed198279b56f717b48b173338af8ff223ca2ad
---
agents/plugins/mk_jolokia | 3 ---
1 file changed, 3 deletions(-)
diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia
index 94b697b..8b95504 100755
--- a/agents/plugins/mk_jolokia
+++ b/agents/plugins/mk_jolokia
@@ -436,9 +436,6 @@ def yield_configured_instances():
if os.path.exists(conffile):
execfile(conffile)
- if instance is None:
- instance = str(port)
-
default_config = {
"protocol": protocol,
"server": server,
Module: check_mk
Branch: master
Commit: 991203361f1ec025c1fbea14735face3061c8de2
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=991203361f1ec0…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Wed Nov 14 10:28:30 2018 +0100
Changed the help for CMK as docker
the tmpfs option is unstable at the moment and not working on every distribution
Change-Id: Ie60f37b00d43abe17c19f4e1fce6c6cb1678ad41
---
docker/README.asciidoc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/docker/README.asciidoc b/docker/README.asciidoc
index 53dbc66..f5cf071 100644
--- a/docker/README.asciidoc
+++ b/docker/README.asciidoc
@@ -21,7 +21,7 @@ Quick start
You can start a Check_MK container like this:
....
-docker container run -dit -p 8080:5000 --tmpfs /omd/sites/cmk/tmp -v /omd/sites --name monitoring -v /etc/localtime:/etc/localtime --restart always checkmk/check-mk-raw:1.5.0p5
+docker container run -dit -p 8080:5000 -v /omd/sites --name monitoring -v /etc/localtime:/etc/localtime --restart always checkmk/check-mk-raw:1.5.0p5
....
The Check_MK GUI should now be reachable via
@@ -49,7 +49,9 @@ it. For more flexible options or HTTPS have a look below
|`--tmpfs /omd/sites/cmk/tmp`
|For best performance you should mount a
tmpfs at the sites `tmp` directory. In case you rename your site ID (see
-below for details), you will have to change this path.
+below for details), you will have to change this path. This option seems
+to be unstable and not working for some distributions. Therefore it is not included
+in our example command, although we recommend it for best performance.
|`-v /omd/sites`
|This makes all site data be persisted even when the container is
