From cd7421b732cd034bf9433ba990e650e8b629ebe2 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 24 Jul 2021 07:20:14 +0200 Subject: [PATCH] Update autoupdate, remove prometeus --- autoupdate | 2 +- caddy/Caddyfile | 2 -- docker/.env | 7 ------- docker/build.sh | 1 - docker/docker-compose.dev.yml | 7 ------- docker/docker-compose.yml.m4 | 5 ----- docker/docker-stack.yml.m4 | 5 ----- performance/go.mod | 1 + prometheus/Dockerfile | 9 --------- prometheus/prometheus.dev.yml | 10 ---------- prometheus/prometheus.yml | 8 -------- 11 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 prometheus/Dockerfile delete mode 100644 prometheus/prometheus.dev.yml delete mode 100644 prometheus/prometheus.yml diff --git a/autoupdate b/autoupdate index 88fc913cf..aea497e50 160000 --- a/autoupdate +++ b/autoupdate @@ -1 +1 @@ -Subproject commit 88fc913cf1b8ea3454d4f664b26daec9b0ec9baf +Subproject commit aea497e50068f560d54ed4a4b9ceb8695d9ac025 diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 9863f2f22..df025ad45 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -14,8 +14,6 @@ import endpoint reverse_proxy /media/* media:8000 - reverse_proxy /prometheus/* prometheus:9090 - reverse_proxy client:4200 } diff --git a/docker/.env b/docker/.env index 24d6772f8..66d82c7ab 100644 --- a/docker/.env +++ b/docker/.env @@ -134,10 +134,3 @@ SERVER_SETUP_PORT= DJANGO_LOG_LEVEL= OPENSLIDES_LOG_LEVEL= RESET_PASSWORD_VERBOSE_ERRORS= - -# Optional services -# ----------------- -# If enabled, Prometheus will be accessible at /prometheus/ without any -# built-in access controls! Please make sure to use it in a controlled -# development environment or to set up access controls independently. -PROMETHEUS_ENABLED= diff --git a/docker/build.sh b/docker/build.sh index 6a8bad38a..b408806fb 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -8,7 +8,6 @@ TARGETS=( [server]="$(dirname "${BASH_SOURCE[0]}")/../server/docker/" [proxy]="$(dirname "${BASH_SOURCE[0]}")/../caddy/" [autoupdate]="$(dirname "${BASH_SOURCE[0]}")/../autoupdate/" - [prometheus]="$(dirname "${BASH_SOURCE[0]}")/../prometheus/" [media]="https://github.com/OpenSlides/openslides-media-service.git" [pgbouncer]="https://github.com/OpenSlides/openslides-docker-compose.git#:pgbouncer" [postfix]="https://github.com/OpenSlides/openslides-docker-compose.git#:postfix" diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 7ab1be5e0..9fbd8f163 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -32,13 +32,6 @@ services: - ./postgresql.dev.conf:/etc/postgresql/postgresql.conf command: postgres -c 'config_file=/etc/postgresql/postgresql.conf' - prometheus: - image: prom/prometheus:v2.24.0 - volumes: - - ../prometheus/prometheus.dev.yml:/etc/prometheus/prometheus.yml - ports: - - 9090:9090 - autoupdate: image: os3-autoupdate-dev environment: diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4 index 2a8054ddf..ed650a212 100644 --- a/docker/docker-compose.yml.m4 +++ b/docker/docker-compose.yml.m4 @@ -267,11 +267,6 @@ ifelse(read_env(`PGNODE_3_ENABLED'), 1, `' # Override command to run more workers per task # command: ["gunicorn", "-w", "4", "--preload", "-b", # "0.0.0.0:8000", "src.mediaserver:app"] -ifelse(read_env(`PROMETHEUS_ENABLED'), 1, `' - prometheus: - image: ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/openslides-prometheus:latest - networks: - - back) volumes: dbdata1: diff --git a/docker/docker-stack.yml.m4 b/docker/docker-stack.yml.m4 index bd5ae0c51..ded264794 100644 --- a/docker/docker-stack.yml.m4 +++ b/docker/docker-stack.yml.m4 @@ -294,11 +294,6 @@ ifelse(read_env(`PGNODE_3_ENABLED'), 1, `' # Override command to run more workers per task # command: ["gunicorn", "-w", "4", "--preload", "-b", # "0.0.0.0:8000", "src.mediaserver:app"] -ifelse(read_env(`PROMETHEUS_ENABLED'), 1, `' - prometheus: - image: ifenvelse(`DEFAULT_DOCKER_REGISTRY', openslides)/openslides-prometheus:latest - networks: - - back) volumes: dbdata1: diff --git a/performance/go.mod b/performance/go.mod index af7774e03..920babab1 100644 --- a/performance/go.mod +++ b/performance/go.mod @@ -1,4 +1,5 @@ module github.com/OpenSlides/OpenSlides/performance + go 1.16 require ( diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile deleted file mode 100644 index 27c8a52db..000000000 --- a/prometheus/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM prom/prometheus:v2.24.0 - -ADD prometheus.yml /etc/prometheus/ - -CMD [ "--config.file=/etc/prometheus/prometheus.yml", \ - "--storage.tsdb.path=/prometheus", \ - "--web.console.libraries=/usr/share/prometheus/console_libraries", \ - "--web.console.templates=/usr/share/prometheus/consoles", \ - "--web.external-url=http://localhost:9090/prometheus" ] diff --git a/prometheus/prometheus.dev.yml b/prometheus/prometheus.dev.yml deleted file mode 100644 index 7b042a771..000000000 --- a/prometheus/prometheus.dev.yml +++ /dev/null @@ -1,10 +0,0 @@ -global: - scrape_interval: 5s - scrape_timeout: 5s - evaluation_interval: 15s - -scrape_configs: -- job_name: openslides3-autoupdate - static_configs: - - targets: - - autoupdate:8002 diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml deleted file mode 100644 index c7f7b9a1b..000000000 --- a/prometheus/prometheus.yml +++ /dev/null @@ -1,8 +0,0 @@ -global: - evaluation_interval: 15s - -scrape_configs: -- job_name: openslides3-autoupdate - static_configs: - - targets: - - autoupdate:8002