Compare commits
No commits in common. "5d1f750b598fb10ed171885ca30af9bb981756fd" and "1fde2cc5157ad08243dc91bc18d0c9ca6990000e" have entirely different histories.
5d1f750b59
...
1fde2cc515
8 changed files with 27 additions and 94 deletions
|
@ -6,7 +6,6 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- web
|
- web
|
||||||
- grafana
|
- grafana
|
||||||
- monitoring
|
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.grafana.rule=Host(`monitoring.${DOMAIN}`)"
|
- "traefik.http.routers.grafana.rule=Host(`monitoring.${DOMAIN}`)"
|
||||||
|
@ -30,7 +29,7 @@ services:
|
||||||
- GF_DATABASE_NAME=grafana
|
- GF_DATABASE_NAME=grafana
|
||||||
- GF_DATABASE_USER=${POSTGRES_USER}
|
- GF_DATABASE_USER=${POSTGRES_USER}
|
||||||
- GF_DATABASE_PASSWORD=${POSTGRES_PASSWORD}
|
- GF_DATABASE_PASSWORD=${POSTGRES_PASSWORD}
|
||||||
- GF_INSTALL_PLUGINS=flant-statusmap-panel,redis-datasource
|
- GF_INSTALL_PLUGINS=flant-statusmap-panel
|
||||||
depends_on:
|
depends_on:
|
||||||
- influxdb
|
- influxdb
|
||||||
- grafanadb
|
- grafanadb
|
||||||
|
@ -56,8 +55,6 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- web
|
- web
|
||||||
- monitoring
|
|
||||||
- grafana
|
|
||||||
environment:
|
environment:
|
||||||
- INFLUXDB_MONITOR_STORE_ENABLED=false
|
- INFLUXDB_MONITOR_STORE_ENABLED=false
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -75,19 +72,6 @@ services:
|
||||||
- "docker.group=monitoring"
|
- "docker.group=monitoring"
|
||||||
|
|
||||||
|
|
||||||
prometheus:
|
|
||||||
image: prom/prometheus
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- grafana
|
|
||||||
- monitoring
|
|
||||||
- web # also used to get traefik metrics
|
|
||||||
volumes:
|
|
||||||
- ./prometheus.yml:/etc/prometheus/prometheus.yml
|
|
||||||
- ${VOLUMES_PATH}/prometheus:/prometheus
|
|
||||||
labels:
|
|
||||||
- "docker.group=monitoring"
|
|
||||||
|
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
# here starts data collection
|
# here starts data collection
|
||||||
|
@ -114,10 +98,11 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- influxdb
|
- influxdb
|
||||||
|
|
||||||
|
|
||||||
telegraf_net:
|
telegraf_net:
|
||||||
image: telegraf:${TELEGRAF_VERSION}
|
image: telegraf:${TELEGRAF_VERSION}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- ./.env # set environments into container
|
||||||
volumes:
|
volumes:
|
||||||
- ./telegraf_net.conf:/etc/telegraf/telegraf.conf:ro
|
- ./telegraf_net.conf:/etc/telegraf/telegraf.conf:ro
|
||||||
networks:
|
networks:
|
||||||
|
@ -128,7 +113,6 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- influxdb
|
- influxdb
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
grafana:
|
grafana:
|
||||||
monitoring:
|
monitoring:
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
# my global config
|
|
||||||
global:
|
|
||||||
scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
|
|
||||||
evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
|
|
||||||
# scrape_timeout is set to the global default (10s).
|
|
||||||
|
|
||||||
# Alertmanager configuration
|
|
||||||
alerting:
|
|
||||||
alertmanagers:
|
|
||||||
- static_configs:
|
|
||||||
- targets:
|
|
||||||
# - alertmanager:9093
|
|
||||||
|
|
||||||
# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
|
|
||||||
rule_files:
|
|
||||||
# - "first_rules.yml"
|
|
||||||
# - "second_rules.yml"
|
|
||||||
|
|
||||||
# A scrape configuration containing exactly one endpoint to scrape:
|
|
||||||
# Here it's Prometheus itself.
|
|
||||||
scrape_configs:
|
|
||||||
# The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
|
|
||||||
|
|
||||||
- job_name: "prometheus"
|
|
||||||
# metrics_path defaults to '/metrics'
|
|
||||||
# scheme defaults to 'http'.
|
|
||||||
static_configs:
|
|
||||||
- targets: ["localhost:9090"]
|
|
||||||
|
|
||||||
- job_name: "traefik"
|
|
||||||
scrape_interval: 5s
|
|
||||||
static_configs:
|
|
||||||
- targets: ["traefik:8080"]
|
|
||||||
|
|
||||||
- job_name: "grafana"
|
|
||||||
static_configs:
|
|
||||||
- targets: ["grafana:3000"]
|
|
|
@ -82,7 +82,10 @@
|
||||||
# urls = ["udp://127.0.0.1:8089"]
|
# urls = ["udp://127.0.0.1:8089"]
|
||||||
# urls = ["http://127.0.0.1:8086"]
|
# urls = ["http://127.0.0.1:8086"]
|
||||||
|
|
||||||
urls = ["http://influxdb:8086"]
|
## HTTP Basic Auth
|
||||||
|
username = "${INFLUXDB_HTTP_BASIC_AUTH_USER}"
|
||||||
|
password = "${INFLUXDB_HTTP_BASIC_AUTH_PASSWORD}"
|
||||||
|
urls = ["https://influxdb.florianzirker.de"] # required
|
||||||
|
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
5
nextcloud/crontab
Executable file → Normal file
5
nextcloud/crontab
Executable file → Normal file
|
@ -1,3 +1,4 @@
|
||||||
*/5 * * * * php -f /var/www/html/cron.php
|
*/5 * * * * php -f /var/www/html/cron.php
|
||||||
|
1,11,21,31,41,51 * * * * php -f /var/www/html/occ files:cleanup
|
||||||
|
2,12,22,32,42,52 * * * * php -f /var/www/html/occ files:scan --all
|
||||||
|
#3,13,23,33,43,53 * * * * php -f /var/www/html/occ preview:pre-generate
|
||||||
|
|
|
@ -57,12 +57,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- ${VOLUMES_PATH}/nextcloud_html:/var/www/html
|
- ${VOLUMES_PATH}/nextcloud_html:/var/www/html
|
||||||
- ${VOLUMES_PATH}/nextcloud_data:/var/www/html/data
|
- ${VOLUMES_PATH}/nextcloud_data:/var/www/html/data
|
||||||
# If I mount my crontab into the container crond is not working any more :(
|
- $PWD/crontab:/var/spool/cron/crontabs/www-data:ro
|
||||||
# docker log should print 11110001 lines
|
|
||||||
# https://github.com/nextcloud/docker/issues/1775
|
|
||||||
# https://github.com/nextcloud/docker/issues/1695
|
|
||||||
# build own cron image?
|
|
||||||
# - $PWD/crontab:/var/spool/cron/crontabs/www-data
|
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
|
@ -120,12 +115,11 @@ services:
|
||||||
|
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis
|
image: redis:alpine
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: redis-server --requirepass ${REDIS_HOST_PASSWORD}
|
command: redis-server --requirepass ${REDIS_HOST_PASSWORD}
|
||||||
networks:
|
networks:
|
||||||
- nextcloud
|
- nextcloud
|
||||||
- monitoring
|
|
||||||
volumes:
|
volumes:
|
||||||
- ${VOLUMES_PATH}/nextcloud_redis:/data
|
- ${VOLUMES_PATH}/nextcloud_redis:/data
|
||||||
labels:
|
labels:
|
||||||
|
@ -183,12 +177,6 @@ services:
|
||||||
- LETS_ENCRYPT_ENABLED=false
|
- LETS_ENCRYPT_ENABLED=false
|
||||||
- EXPORT_URL=http://drawio-export:8000/
|
- EXPORT_URL=http://drawio-export:8000/
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
|
||||||
test: curl -f http://localhost:8080 || exit 1
|
|
||||||
interval: 1m30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 5
|
|
||||||
start_period: 20s
|
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.drawio.rule=Host(`drawio.${DOMAIN}`)"
|
- "traefik.http.routers.drawio.rule=Host(`drawio.${DOMAIN}`)"
|
||||||
|
@ -203,5 +191,3 @@ networks:
|
||||||
external: true
|
external: true
|
||||||
nextcloud:
|
nextcloud:
|
||||||
mariadb:
|
mariadb:
|
||||||
monitoring:
|
|
||||||
external: true
|
|
||||||
|
|
|
@ -29,10 +29,6 @@ services:
|
||||||
- "--certificatesresolvers.netcup.acme.dnschallenge.delayBeforeCheck=900"
|
- "--certificatesresolvers.netcup.acme.dnschallenge.delayBeforeCheck=900"
|
||||||
- "--certificatesresolvers.netcup.acme.email=${LETSENCRYPT_MAIL}"
|
- "--certificatesresolvers.netcup.acme.email=${LETSENCRYPT_MAIL}"
|
||||||
- "--certificatesresolvers.netcup.acme.storage=/letsencrypt/acme.json"
|
- "--certificatesresolvers.netcup.acme.storage=/letsencrypt/acme.json"
|
||||||
- "--metrics.prometheus=true"
|
|
||||||
- "--metrics.prometheus.addEntryPointsLabels=true"
|
|
||||||
- "--metrics.prometheus.addRoutersLabels=true"
|
|
||||||
- "--metrics.prometheus.addServicesLabels=true"
|
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
|
@ -69,17 +65,17 @@ services:
|
||||||
privileged: true
|
privileged: true
|
||||||
|
|
||||||
|
|
||||||
whoami:
|
# whoami:
|
||||||
image: containous/whoami
|
# image: containous/whoami
|
||||||
networks:
|
# networks:
|
||||||
- web
|
# - web
|
||||||
labels:
|
# labels:
|
||||||
- "traefik.enable=true"
|
# - "traefik.enable=true"
|
||||||
- "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)"
|
# - "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)"
|
||||||
- "traefik.http.routers.whoami.entrypoints=websecure"
|
# - "traefik.http.routers.whoami.entrypoints=websecure"
|
||||||
- "traefik.http.routers.whoami.tls.certresolver=netcup"
|
# - "traefik.http.routers.whoami.tls.certresolver=netcup"
|
||||||
- "docker.group=proxy"
|
# - "docker.group=proxy"
|
||||||
restart: unless-stopped
|
# restart: unless-stopped
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#/bin/bash/
|
#/bin/bash/
|
||||||
|
|
||||||
for dir in ./*/ ; do
|
for dir in ./*/ ; do
|
||||||
( cd "$dir" && echo "[Building $dir]" && docker compose build --pull );
|
(cd "$dir" && echo "[$dir]" && docker compose build);
|
||||||
done
|
done
|
||||||
|
|
||||||
for dir in ./*/ ; do
|
for dir in ./*/ ; do
|
||||||
( cd "$dir" && echo "[Pulling $dir]" && docker compose pull --ignore-buildable );
|
(cd "$dir" && echo "[$dir]" && docker compose pull);
|
||||||
done
|
done
|
||||||
|
|
|
@ -5,9 +5,9 @@ function up {
|
||||||
(cd "$1" && echo "[$1]" && docker compose up -d "${@:2}");
|
(cd "$1" && echo "[$1]" && docker compose up -d "${@:2}");
|
||||||
}
|
}
|
||||||
|
|
||||||
up proxy --scale whoami=3;
|
up proxy;
|
||||||
up monitoring;
|
up monitoring;
|
||||||
up nextcloud --scale app=5 --scale web=3;
|
up nextcloud --scale app=3 --scale web=2;
|
||||||
up gitea;
|
up gitea;
|
||||||
up wallabag;
|
up wallabag;
|
||||||
up www;
|
up www;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue