Update autoupdate, remove prometeus

This commit is contained in:
Oskar Hahn 2021-07-24 07:20:14 +02:00
parent 1b2169dd45
commit cd7421b732
11 changed files with 2 additions and 55 deletions

@ -1 +1 @@
Subproject commit 88fc913cf1b8ea3454d4f664b26daec9b0ec9baf Subproject commit aea497e50068f560d54ed4a4b9ceb8695d9ac025

View File

@ -14,8 +14,6 @@ import endpoint
reverse_proxy /media/* media:8000 reverse_proxy /media/* media:8000
reverse_proxy /prometheus/* prometheus:9090
reverse_proxy client:4200 reverse_proxy client:4200
} }

View File

@ -134,10 +134,3 @@ SERVER_SETUP_PORT=
DJANGO_LOG_LEVEL= DJANGO_LOG_LEVEL=
OPENSLIDES_LOG_LEVEL= OPENSLIDES_LOG_LEVEL=
RESET_PASSWORD_VERBOSE_ERRORS= 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=

View File

@ -8,7 +8,6 @@ TARGETS=(
[server]="$(dirname "${BASH_SOURCE[0]}")/../server/docker/" [server]="$(dirname "${BASH_SOURCE[0]}")/../server/docker/"
[proxy]="$(dirname "${BASH_SOURCE[0]}")/../caddy/" [proxy]="$(dirname "${BASH_SOURCE[0]}")/../caddy/"
[autoupdate]="$(dirname "${BASH_SOURCE[0]}")/../autoupdate/" [autoupdate]="$(dirname "${BASH_SOURCE[0]}")/../autoupdate/"
[prometheus]="$(dirname "${BASH_SOURCE[0]}")/../prometheus/"
[media]="https://github.com/OpenSlides/openslides-media-service.git" [media]="https://github.com/OpenSlides/openslides-media-service.git"
[pgbouncer]="https://github.com/OpenSlides/openslides-docker-compose.git#:pgbouncer" [pgbouncer]="https://github.com/OpenSlides/openslides-docker-compose.git#:pgbouncer"
[postfix]="https://github.com/OpenSlides/openslides-docker-compose.git#:postfix" [postfix]="https://github.com/OpenSlides/openslides-docker-compose.git#:postfix"

View File

@ -32,13 +32,6 @@ services:
- ./postgresql.dev.conf:/etc/postgresql/postgresql.conf - ./postgresql.dev.conf:/etc/postgresql/postgresql.conf
command: postgres -c 'config_file=/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: autoupdate:
image: os3-autoupdate-dev image: os3-autoupdate-dev
environment: environment:

View File

@ -267,11 +267,6 @@ ifelse(read_env(`PGNODE_3_ENABLED'), 1, `'
# Override command to run more workers per task # Override command to run more workers per task
# command: ["gunicorn", "-w", "4", "--preload", "-b", # command: ["gunicorn", "-w", "4", "--preload", "-b",
# "0.0.0.0:8000", "src.mediaserver:app"] # "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: volumes:
dbdata1: dbdata1:

View File

@ -294,11 +294,6 @@ ifelse(read_env(`PGNODE_3_ENABLED'), 1, `'
# Override command to run more workers per task # Override command to run more workers per task
# command: ["gunicorn", "-w", "4", "--preload", "-b", # command: ["gunicorn", "-w", "4", "--preload", "-b",
# "0.0.0.0:8000", "src.mediaserver:app"] # "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: volumes:
dbdata1: dbdata1:

View File

@ -1,4 +1,5 @@
module github.com/OpenSlides/OpenSlides/performance module github.com/OpenSlides/OpenSlides/performance
go 1.16 go 1.16
require ( require (

View File

@ -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" ]

View File

@ -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

View File

@ -1,8 +0,0 @@
global:
evaluation_interval: 15s
scrape_configs:
- job_name: openslides3-autoupdate
static_configs:
- targets:
- autoupdate:8002