groove/mikrotik_monitoring
1
0
Fork 0
mirror of https://github.com/M0r13n/mikrotik_monitoring.git synced 2025-12-06 10:09:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #27 from M0r13n/updates

Browse source 
bump versions of Grafana, Prometheus and mktxp
This commit is contained in:
Leon Morten Richter 2024-01-27 13:48:00 +01:00 • committed by GitHub
commit 9387e100f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -99,7 +99,7 @@ Install Docker + Docker-compose (reboot required)
```bash ```bash
curl -sSL https://get.docker.com | sh curl -sSL https://get.docker.com | sh
sudo usermod -aG docker ubuntu sudo usermod -aG docker ubuntu
sudo pip3 install docker-compose sudo apt install docker-compose
sudo systemctl enable docker sudo systemctl enable docker
sudo reboot sudo reboot
``` ```

14
docker-compose.yml
View file

@ -1,14 +1,14 @@
version: "3.9" version: "3.9"
volumes: 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.42.0 image: prom/prometheus:v2.45.3
container_name: mikrotik-prometheus container_name: mikrotik-prometheus
volumes: volumes:
- ./prometheus:/etc/prometheus - ./prometheus:/etc/prometheus
@ -16,7 +16,7 @@ services:
command: command:
- '--config.file=/etc/prometheus/prometheus.yml' - '--config.file=/etc/prometheus/prometheus.yml'
- '--storage.tsdb.path=/prometheus' - '--storage.tsdb.path=/prometheus'
- '--storage.tsdb.retention.time=1y' # <= adjust the storage retention period of Prometheus - '--storage.tsdb.retention.time=1y' # <= adjust the storage retention period of Prometheus
restart: unless-stopped restart: unless-stopped
networks: networks:
- default - default
@ -26,7 +26,7 @@ services:
# Grafana # Grafana
# https://github.com/stefanprodan/dockprom # https://github.com/stefanprodan/dockprom
grafana: grafana:
image: grafana/grafana:9.3.6 image: grafana/grafana:10.3.1
container_name: mikrotik-grafana container_name: mikrotik-grafana
volumes: volumes:
- grafana_data:/var/lib/grafana - grafana_data:/var/lib/grafana
@ -47,7 +47,7 @@ services:
# MKTXP # MKTXP
# https://github.com/akpw/mktxp # https://github.com/akpw/mktxp
mktxp: mktxp:
image: ghcr.io/akpw/mktxp:gha-5421251592 image: ghcr.io/akpw/mktxp:gha-7614306238
container_name: mikrotik-mktxp container_name: mikrotik-mktxp
volumes: volumes:
# Since Version v0.37 mktxp runs as single user # Since Version v0.37 mktxp runs as single user
@ -66,7 +66,7 @@ services:
- ./nginx/nginx-selfsigned.crt:/etc/nginx/ssl/nginx-selfsigned.crt - ./nginx/nginx-selfsigned.crt:/etc/nginx/ssl/nginx-selfsigned.crt
- ./nginx/self-signed.conf:/etc/nginx/ssl/self-signed.conf - ./nginx/self-signed.conf:/etc/nginx/ssl/self-signed.conf
ports: ports:
- 80:80 # You may adjust to some unprivileged ports - 80:80 # You may adjust to some unprivileged ports
- 443:443 - 443:443
networks: networks:
- default - default

4
mktxp/mktxp.conf
View file

@ -48,9 +48,13 @@
capsman = True # CAPsMAN general metrics capsman = True # CAPsMAN general metrics
capsman_clients = True # CAPsMAN clients metrics capsman_clients = True # CAPsMAN clients metrics
kid_control_devices = False # Kid Control metrics
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) 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
check_for_updates = False # check for available ROS updates

1
prometheus/prometheus.yml
View file

@ -29,7 +29,6 @@ scrape_configs:
static_configs: static_configs:
- targets: - targets:
- 'mikrotik_exporter:9436'
- 'mktxp:49090' - 'mktxp:49090'
- job_name: 'blackbox' - job_name: 'blackbox'