From a3c990ca831c49b565278ad3106a8ea03a9809b8 Mon Sep 17 00:00:00 2001
From: Leon Morten Richter <github@leonmortenrichter.de>
Date: Sun, 12 Feb 2023 15:56:40 +0100
Subject: [PATCH] makes the dashboard the default dashboard and adds a separate
 folder

---
 .gitignore                                         |  1 +
 docker-compose.yml                                 | 14 ++++++--------
 grafana/provisioning/dashboards/dashboard.yml      |  6 +++---
 .../dashboards/{ => mikrotik}/monitor.json         |  0
 mktxp/mktxp.conf                                   |  5 +++++
 5 files changed, 15 insertions(+), 11 deletions(-)
 rename grafana/provisioning/dashboards/{ => mikrotik}/monitor.json (100%)

diff --git a/.gitignore b/.gitignore
index 40eb730..6aea240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ tmp
 .idea/
 mktxp/mktxp.conf
 .vscode
+venv
diff --git a/docker-compose.yml b/docker-compose.yml
index 8f0768e..28972cc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,12 +4,11 @@ volumes:
     prometheus_data: {}
     grafana_data: {}
 
-
 services:
   # Prometheus
   # https://github.com/stefanprodan/dockprom
   prometheus:
-    image: prom/prometheus:v2.37.0
+    image: prom/prometheus:v2.42.0
     container_name: prometheus
     volumes:
       - ./prometheus:/etc/prometheus
@@ -26,17 +25,18 @@ services:
   # Grafana
   # https://github.com/stefanprodan/dockprom
   grafana:
-    image: grafana/grafana:9.0.6
+    image: grafana/grafana:9.3.6
     container_name: grafana
     volumes:
       - grafana_data:/var/lib/grafana
-      - ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards
-      - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
+      - ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards:ro
+      - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro
     environment:
       - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin}
       - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin}
       - GF_USERS_ALLOW_SIGN_UP=false
       - GF_INSTALL_PLUGINS=flant-statusmap-panel
+      - GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/mikrotik/monitor.json
     restart: unless-stopped
     networks:
       - default
@@ -46,9 +46,7 @@ services:
   # MKTXP
   # https://github.com/akpw/mktxp
   mktxp:
-    # https://github.com/M0r13n/mikrotik_monitoring
-    # Note: You might need to build the image yourself if not on AMD64 or ARM-v7/V8
-    image: leonmorten/mktxp:latest
+    image: ghcr.io/akpw/mktxp:gha-4093170275
     volumes:
       # Since Version v0.37 mktxp runs as single user
       # Prior it was root
diff --git a/grafana/provisioning/dashboards/dashboard.yml b/grafana/provisioning/dashboards/dashboard.yml
index fd381ee..f151a2e 100644
--- a/grafana/provisioning/dashboards/dashboard.yml
+++ b/grafana/provisioning/dashboards/dashboard.yml
@@ -4,10 +4,10 @@ apiVersion: 1
 providers:
   - name: 'Prometheus'
     orgId: 1
-    folder: ''
+    folder: 'Mikrotik Monitoring'
     type: file
-    disableDeletion: false
+    disableDeletion: true
     editable: true
     allowUiUpdates: true
     options:
-      path: /etc/grafana/provisioning/dashboards
\ No newline at end of file
+      path: /etc/grafana/provisioning/dashboards/mikrotik
diff --git a/grafana/provisioning/dashboards/monitor.json b/grafana/provisioning/dashboards/mikrotik/monitor.json
similarity index 100%
rename from grafana/provisioning/dashboards/monitor.json
rename to grafana/provisioning/dashboards/mikrotik/monitor.json
diff --git a/mktxp/mktxp.conf b/mktxp/mktxp.conf
index 6e7d7f4..161816b 100644
--- a/mktxp/mktxp.conf
+++ b/mktxp/mktxp.conf
@@ -27,7 +27,10 @@
     installed_packages = True       # Installed packages
     dhcp = True                     # DHCP general metrics
     dhcp_lease = True               # DHCP lease metrics
+
     connections = True              # IP connections metrics
+    connection_stats = False        # Open IP connections metrics 
+
     pool = True                     # Pool metrics
     interface = True                # Interfaces traffic metrics
     
@@ -47,5 +50,7 @@
 
     user = True                     # Active Users metrics
     queue = True                    # Queues metrics
+    
+    remote_dhcp_entry = None        # An MKTXP entry for remote DHCP info resolution (capsman/wireless)
 
     use_comments_over_names = True  # when available, forces using comments over the interfaces names