Module: check_mk
Branch: master
Commit: 18596cebe64747bc56c6b28fa50ec93889cc69c6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18596cebe64747…
Author: Tom Baerwinkel <tb(a)mathias-kettner.de>
Date: Mon Oct 15 11:30:25 2018 +0200
6413 FIX Availability: don't try to merge completely disconnected intervals
If the option "Ignore intervals shorter or equal X sec" was used an exception
occured if intervals should be merged that were completely disconnected.
Disconnected intervals occur e.g. if the a host/service is outside of
the host/service period.
Change-Id: Ie89aa4ba70c3c0fab44cbaa7a7ad3b40776ff186
---
.werks/6413 | 14 ++++++++++++++
cmk/gui/availability.py | 1 +
2 files changed, 15 insertions(+)
diff --git a/.werks/6413 b/.werks/6413
new file mode 100644
index 0000000..0e6ce1b
--- /dev/null
+++ b/.werks/6413
@@ -0,0 +1,14 @@
+Title: Availability: don't try to merge completely disconnected intervals
+Level: 1
+Component: reporting
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1539594354
+
+If the option "Ignore intervals shorter or equal X sec" was used an exception
+occured if intervals should be merged that were completely disconnected.
+Disconnected intervals occur e.g. if the a host/service is outside of
+the host/service period.
diff --git a/cmk/gui/availability.py b/cmk/gui/availability.py
index cfb8851..cb115f6 100644
--- a/cmk/gui/availability.py
+++ b/cmk/gui/availability.py
@@ -1100,6 +1100,7 @@ def melt_short_intervals(entries, duration, dont_merge):
need_merge = False
while n < len(entries) - 1:
if entries[n][0]["duration"] <= duration and \
+ (entries[n-1][0]["until"] == entries[n][0]["from"] or entries[n][0]["until"] == entries[n+1][0]["from"]) and \
entries[n-1][1] == entries[n+1][1]:
entries[n] = (entries[n][0], entries[n-1][1])
need_merge = True
Module: check_mk
Branch: master
Commit: aa76601dfe1bd160972294ec6ebcd7c6aa1b4dbd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa76601dfe1bd1…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Fri Oct 12 15:02:06 2018 +0200
made docker documentation better readable
and additionally fixed a typo in a command
Change-Id: I746daacce4d0fa33b50509207149f7ccd3db036f
---
docker/README.asciidoc | 40 +++++++++++++++++++++++++++-------------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/docker/README.asciidoc b/docker/README.asciidoc
index 9e1bb4b..53dbc66 100644
--- a/docker/README.asciidoc
+++ b/docker/README.asciidoc
@@ -29,30 +29,44 @@ The Check_MK GUI should now be reachable via
The initial password of the initial administrative account `cmkadmin`
will be written to the container logs (see
-`docker container monitoring logs`). You can customize this during
+`docker container logs monitoring`). You can customize this during
container creation if you like, see below.
Details about the arguments used above:
[cols="20%,80%",options="header",]
|=======================================================================
-|Argument |Description
-|`-p 8080:5000` |The sites web server listens on port 5000 by default. With this
- example it is opened at port 8080 of the node. You may also use
- port 80 here in case you don't have another process listening on
- 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 you site ID (see
+
+|Option
+|Description
+
+|`-p 8080:5000`
+|The sites web server listens on port 5000 by default. With this
+example it is opened at port 8080 of the node. You may also use
+port 80 here in case you don't have another process listening on
+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.
-|`-v /omd/sites` |
-This makes all site data be persisted even when the container is
+
+|`-v /omd/sites`
+|This makes all site data be persisted even when the container is
destroyed. In case you don't use this you will loose all you
configuration and monitoring data.
-|`--name monitoring` | The name of the container. It must be unique per docker node. All examples below use
+
+|`--name monitoring`
+|The name of the container. It must be unique per docker node. All examples below use
this name. In case you change this you will have to use your custom name
e.g. during update.
-|`-v /etc/localtime:/etc/localtime` | Make the container use the same local time (timezone) config as your docker node.
-|`--restart always` | Always restart the container if it stops.
+
+|`-v /etc/localtime:/etc/localtime`
+| Make the container use the same local time (timezone) config as your docker node.
+
+|`--restart always`
+| Always restart the container if it stops.
+
|=======================================================================
[[use-packages-from-our-website]]