From bf96d21d20e9991394992ee90e7ecb5ccee5d6e0 Mon Sep 17 00:00:00 2001
From: Tom <392513+tborychowski@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:06:03 +0000
Subject: [PATCH 1/4] fixes #5

---
 apps/bookmarks/shaarli.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apps/bookmarks/shaarli.md b/apps/bookmarks/shaarli.md
index c24c73c..e27cf74 100644
--- a/apps/bookmarks/shaarli.md
+++ b/apps/bookmarks/shaarli.md
@@ -7,6 +7,20 @@ Not too bad. Just stores & tags links, nothing more.
 ![Screenshot](shaarli.png)
 
 
+## Prerequisite
+Because of the permission issues with using directory mounts instead of named volumes, the two folders need to be created before running the container:
+```sh
+mkdir cache data
+```
+and their permissions must be changed to be writable by the shaarli user (Uid 100, Gid 101). The simplest and most convenient (but a bit less secure) is to change permissions to 777 (rwx for all):
+```sh
+chmod 777 cache/ data/
+```
+alternatively folders' owner can be changed to the UID 100:
+```sh
+sudo chown 100:101 cache/ data/
+```
+
 ## docker-compose.yml
 ```yml
 ---

From e63f43ba12934f6cec500cf387c04c482db279a1 Mon Sep 17 00:00:00 2001
From: ogghi <schmidt@linux.com>
Date: Thu, 7 Jan 2021 20:19:33 +0100
Subject: [PATCH 2/4] Added checkMK monitoring tool (#6)

* Added checkMK monitoring tool

* Added missing file :)

Co-authored-by: David Schmidt <david.schmidt@virtamed.com>
---
 README.md                |  1 +
 apps/monitors/checkmk.md | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 apps/monitors/checkmk.md

diff --git a/README.md b/README.md
index 66d6276..9a1009d 100644
--- a/README.md
+++ b/README.md
@@ -164,6 +164,7 @@ So, without further ado, here's the current list:
 - [Dockprom](apps/monitors/dockprom.md)
 - [PhpServerMonitor](apps/monitors/php-server-monitor.md)
 - [Statping](apps/monitors/statping.md)
+- [CheckMK](apps/monitors/checkmk.md)
 
 ### Other, not-fully tested
 - [Staytus](https://github.com/adamcooke/staytus) 🔗 - service status is updated manually!
diff --git a/apps/monitors/checkmk.md b/apps/monitors/checkmk.md
new file mode 100644
index 0000000..d4dfc60
--- /dev/null
+++ b/apps/monitors/checkmk.md
@@ -0,0 +1,40 @@
+# CheckMK
+
+- Pretty complete solution for whole infrastructure monitoring
+- Based on Nagios 
+
+<br>
+
+- [Homepage](https://checkmk.com/)
+- [Github repo](https://github.com/tribe29/checkMK)
+- [DockerHub repo](https://hub.docker.com/r/checkmk/check-mk-raw)
+
+
+## docker-compose.yml
+```yml
+---
+version: '3.6'
+
+services:
+  checkmk:
+    container_name: checkmk
+    image: checkmk/check-mk-raw
+    tmpfs:
+      - /opt/omd/sites/cmk/tmp:uid=1000,gid=1000
+    ulimits:
+      nofile: 1024
+    volumes:
+      - ./monitoring:/omd/sites
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "8080:5000"
+    restart: unless-stopped
+    networks:
+      checkmk_network:
+
+networks:
+    checkmk_network:
+```
+
+- and go to http://localhost:8080/cmk/check_mk/
+- You will find the provisional password for the cmkadmin account in the logs that are written for this container

From 868081e873336ca6f6b90d6e4b25627a6044cb6a Mon Sep 17 00:00:00 2001
From: Tom <392513+tborychowski@users.noreply.github.com>
Date: Fri, 8 Jan 2021 10:41:16 +0000
Subject: [PATCH 3/4] Update checkmk.md

---
 apps/monitors/checkmk.md | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/apps/monitors/checkmk.md b/apps/monitors/checkmk.md
index d4dfc60..0a44e25 100644
--- a/apps/monitors/checkmk.md
+++ b/apps/monitors/checkmk.md
@@ -17,24 +17,18 @@ version: '3.6'
 
 services:
   checkmk:
-    container_name: checkmk
     image: checkmk/check-mk-raw
-    tmpfs:
-      - /opt/omd/sites/cmk/tmp:uid=1000,gid=1000
+    container_name: checkmk    
+    restart: unless-stopped
     ulimits:
       nofile: 1024
-    volumes:
-      - ./monitoring:/omd/sites
-      - /etc/localtime:/etc/localtime:ro
     ports:
-      - "8080:5000"
-    restart: unless-stopped
-    networks:
-      checkmk_network:
-
-networks:
-    checkmk_network:
+      - "3123:5000"
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - ./monitoring:/omd/sites
 ```
 
-- and go to http://localhost:8080/cmk/check_mk/
-- You will find the provisional password for the cmkadmin account in the logs that are written for this container
+- Open http://localhost:8080/cmk/check_mk/ 
+- Username is `cmkadmin`
+- Password is written in the logs when the container starts the first time, so just run `docker-compose logs` after starting the container

From 3fb3b3e9497ed7037084c43a255bba51bc892641 Mon Sep 17 00:00:00 2001
From: Tom <392513+tborychowski@users.noreply.github.com>
Date: Fri, 8 Jan 2021 10:46:46 +0000
Subject: [PATCH 4/4] Update checkmk.md

---
 apps/monitors/checkmk.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/monitors/checkmk.md b/apps/monitors/checkmk.md
index 0a44e25..0f39e91 100644
--- a/apps/monitors/checkmk.md
+++ b/apps/monitors/checkmk.md
@@ -2,6 +2,8 @@
 
 - Pretty complete solution for whole infrastructure monitoring
 - Based on Nagios 
+- Complex UI (not very intuitive)
+- Requires "some" learning & setup and doesn't do anything out of the box
 
 <br>