cjones/mktxp-stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes / optimisations

Browse Source
This commit is contained in:
Arseniy Kuznetsov
2024-07-07 10:05:36 +01:00
parent d3290d8f9b
commit 9511059c9a
4 changed files with 2595 additions and 2586 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose-mktxp-stack-fs.yml
+7 -9
View File
@@ -1,5 +1,3 @@
version: '3.9'
networks: networks:
mktxp: {} mktxp: {}
@@ -16,9 +14,9 @@ services:
mktxp: mktxp:
container_name: mktxp container_name: mktxp
image: ghcr.io/akpw/mktxp:latest image: ghcr.io/akpw/mktxp:latest
user: root user: mktxp
volumes: volumes:
- './mktxp/:/root/mktxp/' - './mktxp/:/home/mktxp/mktxp/'
networks: networks:
mktxp: null mktxp: null
restart: unless-stopped restart: unless-stopped
@@ -39,7 +37,7 @@ services:
- protocol: tcp - protocol: tcp
published: 3000 published: 3000
target: 3000 target: 3000
restart: always restart: unless-stopped
volumes: volumes:
- grafana_storage:/var/lib/grafana - grafana_storage:/var/lib/grafana
- ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro
@@ -55,7 +53,7 @@ services:
- protocol: tcp - protocol: tcp
published: 3100 published: 3100
target: 3100 target: 3100
restart: always restart: unless-stopped
volumes: volumes:
- ./loki/loki-config.yml:/etc/loki/loki-config.yml - ./loki/loki-config.yml:/etc/loki/loki-config.yml
@@ -73,7 +71,7 @@ services:
ports: ports:
- published: 9090 - published: 9090
target: 9090 target: 9090
restart: always restart: unless-stopped
volumes: volumes:
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
- prometheus_storage:/prometheus - prometheus_storage:/prometheus
@@ -91,7 +89,7 @@ services:
- protocol: tcp - protocol: tcp
published: 9080 published: 9080
target: 9080 target: 9080
restart: always restart: unless-stopped
volumes: volumes:
- ./promtail/promtail-config-fs.yml:/etc/promtail/promtail-config.yml:ro - ./promtail/promtail-config-fs.yml:/etc/promtail/promtail-config.yml:ro
- mktxp-logs:/var/log:ro - mktxp-logs:/var/log:ro
@@ -111,7 +109,7 @@ services:
- protocol: tcp - protocol: tcp
published: 601 published: 601
target: 601 target: 601
restart: always restart: unless-stopped
volumes: volumes:
- ./syslog-ng/syslog-ng-fs.conf:/etc/syslog-ng/syslog-ng.conf:ro - ./syslog-ng/syslog-ng-fs.conf:/etc/syslog-ng/syslog-ng.conf:ro
- mktxp-logs:/var/log/syslog-ng - mktxp-logs:/var/log/syslog-ng
docker-compose-mktxp-stack-no-logs.yml
+4 -6
View File
@@ -1,5 +1,3 @@
version: '3.9'
networks: networks:
mktxp: {} mktxp: {}
@@ -11,9 +9,9 @@ services:
mktxp: mktxp:
container_name: mktxp container_name: mktxp
image: ghcr.io/akpw/mktxp:latest image: ghcr.io/akpw/mktxp:latest
user: root user: mktxp
volumes: volumes:
- './mktxp/:/root/mktxp/' - './mktxp/:/home/mktxp/mktxp/'
networks: networks:
mktxp: null mktxp: null
restart: unless-stopped restart: unless-stopped
@@ -34,7 +32,7 @@ services:
- protocol: tcp - protocol: tcp
published: 3000 published: 3000
target: 3000 target: 3000
restart: always restart: unless-stopped
volumes: volumes:
- grafana_storage:/var/lib/grafana - grafana_storage:/var/lib/grafana
- ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro
@@ -54,7 +52,7 @@ services:
ports: ports:
- published: 9090 - published: 9090
target: 9090 target: 9090
restart: always restart: unless-stopped
volumes: volumes:
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
- prometheus_storage:/prometheus - prometheus_storage:/prometheus
docker-compose-mktxp-stack.yml
+7 -9
View File
@@ -1,5 +1,3 @@
version: '3.9'
networks: networks:
mktxp: {} mktxp: {}
@@ -11,9 +9,9 @@ services:
mktxp: mktxp:
container_name: mktxp container_name: mktxp
image: ghcr.io/akpw/mktxp:latest image: ghcr.io/akpw/mktxp:latest
user: root user: mktxp
volumes: volumes:
- './mktxp/:/root/mktxp/' - './mktxp/:/home/mktxp/mktxp/'
networks: networks:
mktxp: null mktxp: null
restart: unless-stopped restart: unless-stopped
@@ -34,7 +32,7 @@ services:
- protocol: tcp - protocol: tcp
published: 3000 published: 3000
target: 3000 target: 3000
restart: always restart: unless-stopped
volumes: volumes:
- grafana_storage:/var/lib/grafana - grafana_storage:/var/lib/grafana
- ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources:ro
@@ -50,7 +48,7 @@ services:
- protocol: tcp - protocol: tcp
published: 3100 published: 3100
target: 3100 target: 3100
restart: always restart: unless-stopped
volumes: volumes:
- ./loki/loki-config.yml:/etc/loki/loki-config.yml - ./loki/loki-config.yml:/etc/loki/loki-config.yml
@@ -68,7 +66,7 @@ services:
ports: ports:
- published: 9090 - published: 9090
target: 9090 target: 9090
restart: always restart: unless-stopped
volumes: volumes:
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
- prometheus_storage:/prometheus - prometheus_storage:/prometheus
@@ -86,7 +84,7 @@ services:
- protocol: tcp - protocol: tcp
published: 9080 published: 9080
target: 9080 target: 9080
restart: always restart: unless-stopped
volumes: volumes:
- ./promtail/promtail-config.yml:/etc/promtail/promtail-config.yml:ro - ./promtail/promtail-config.yml:/etc/promtail/promtail-config.yml:ro
@@ -105,7 +103,7 @@ services:
- protocol: tcp - protocol: tcp
published: 601 published: 601
target: 601 target: 601
restart: always restart: unless-stopped
volumes: volumes:
- ./syslog-ng/syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf:ro - ./syslog-ng/syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf:ro
grafana/provisioning/dashboards/mikrotik/mikrotik_mktxp_exporter.json
Executable → Regular
+2577 -2562
View File
File diff suppressed because it is too large Load Diff