mirror of
https://github.com/M0r13n/mikrotik_monitoring.git
synced 2025-12-06 10:09:31 +00:00
Merge pull request #27 from M0r13n/updates
bump versions of Grafana, Prometheus and mktxp
This commit is contained in:
commit
9387e100f5
4 changed files with 25 additions and 22 deletions
|
|
@ -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
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ 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
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue