makes the dashboard the default dashboard and adds a separate folder

This commit is contained in:
Leon Morten Richter 2023-02-12 15:56:40 +01:00
parent 38600b8cbc
commit a3c990ca83
No known key found for this signature in database
GPG key ID: DC00D426A10A6E2B
5 changed files with 15 additions and 11 deletions

1
.gitignore vendored
View file

@ -2,3 +2,4 @@ tmp
.idea/ .idea/
mktxp/mktxp.conf mktxp/mktxp.conf
.vscode .vscode
venv

View file

@ -4,12 +4,11 @@ volumes:
prometheus_data: {} prometheus_data: {}
grafana_data: {} grafana_data: {}
services: services:
# Prometheus # Prometheus
# https://github.com/stefanprodan/dockprom # https://github.com/stefanprodan/dockprom
prometheus: prometheus:
image: prom/prometheus:v2.37.0 image: prom/prometheus:v2.42.0
container_name: prometheus container_name: prometheus
volumes: volumes:
- ./prometheus:/etc/prometheus - ./prometheus:/etc/prometheus
@ -26,17 +25,18 @@ services:
# Grafana # Grafana
# https://github.com/stefanprodan/dockprom # https://github.com/stefanprodan/dockprom
grafana: grafana:
image: grafana/grafana:9.0.6 image: grafana/grafana:9.3.6
container_name: grafana container_name: grafana
volumes: volumes:
- grafana_data:/var/lib/grafana - grafana_data:/var/lib/grafana
- ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards - ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards:ro
- ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro
environment: environment:
- GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin} - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin}
- GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin} - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin}
- GF_USERS_ALLOW_SIGN_UP=false - GF_USERS_ALLOW_SIGN_UP=false
- GF_INSTALL_PLUGINS=flant-statusmap-panel - GF_INSTALL_PLUGINS=flant-statusmap-panel
- GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/mikrotik/monitor.json
restart: unless-stopped restart: unless-stopped
networks: networks:
- default - default
@ -46,9 +46,7 @@ services:
# MKTXP # MKTXP
# https://github.com/akpw/mktxp # https://github.com/akpw/mktxp
mktxp: mktxp:
# https://github.com/M0r13n/mikrotik_monitoring image: ghcr.io/akpw/mktxp:gha-4093170275
# Note: You might need to build the image yourself if not on AMD64 or ARM-v7/V8
image: leonmorten/mktxp:latest
volumes: volumes:
# Since Version v0.37 mktxp runs as single user # Since Version v0.37 mktxp runs as single user
# Prior it was root # Prior it was root

View file

@ -4,10 +4,10 @@ apiVersion: 1
providers: providers:
- name: 'Prometheus' - name: 'Prometheus'
orgId: 1 orgId: 1
folder: '' folder: 'Mikrotik Monitoring'
type: file type: file
disableDeletion: false disableDeletion: true
editable: true editable: true
allowUiUpdates: true allowUiUpdates: true
options: options:
path: /etc/grafana/provisioning/dashboards path: /etc/grafana/provisioning/dashboards/mikrotik

View file

@ -27,7 +27,10 @@
installed_packages = True # Installed packages installed_packages = True # Installed packages
dhcp = True # DHCP general metrics dhcp = True # DHCP general metrics
dhcp_lease = True # DHCP lease metrics dhcp_lease = True # DHCP lease metrics
connections = True # IP connections metrics connections = True # IP connections metrics
connection_stats = False # Open IP connections metrics
pool = True # Pool metrics pool = True # Pool metrics
interface = True # Interfaces traffic metrics interface = True # Interfaces traffic metrics
@ -47,5 +50,7 @@
user = True # Active Users metrics user = True # Active Users metrics
queue = True # Queues 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 use_comments_over_names = True # when available, forces using comments over the interfaces names