Skip to content

Commit 48c4e80

Browse files
mrnicegyu11mrnicegyu11
authored
Seperate dalco-staging: disable redis special handling (#976)
* wip * Add csi-s3 and have portainer use it * Change request @Hrytsuk 1GB max portainer volume size * Arch Linux Certificates Customization * Remove dalco special staging handling * remove accidental commit * remove accidental commit * Remove dalco staging special handling --------- Co-authored-by: Dustin Kaiser <[email protected]>
1 parent 4c74ef3 commit 48c4e80

File tree

10 files changed

+218
-260
lines changed

10 files changed

+218
-260
lines changed

‎services/filestash/template.env‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ S3_SECURE=${S3_SECURE}
44
MONITORING_DOMAIN=${MONITORING_DOMAIN}
55
FILESTASH_DOMAIN=filestash.${MONITORING_DOMAIN}
66
PUBLIC_NETWORK=${PUBLIC_NETWORK}
7-
MONITORED_NETWORK=${MONITORED_NETWORK}
87
FILESTASH_CONFIG_SECRET_KEY=${FILESTASH_CONFIG_SECRET_KEY}
98
PUBLIC_NETWORK=${PUBLIC_NETWORK}
109
MONITORED_NETWORK=${MONITORED_NETWORK}

‎services/monitoring/docker-compose.yml.j2‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -351,16 +351,16 @@ services:
351351
cpus: "0.5"
352352
reservations:
353353
memory: 64M
354-
cpus: "0.1"{% for _stack in MONITORED_STACK_NAMES.split(",") if _stack != "" %}
355-
{{_stack}}-postgres-exporter:
354+
cpus: "0.1"
355+
postgres-exporter:
356356
image: bitnami/postgres-exporter:0.15.0
357357
networks:
358358
- monitored
359359
environment:
360-
- DATA_SOURCE_NAME=postgresql://{{POSTGRES_USER}}:{{POSTGRES_PASSWORD}}@{{_stack + '_postgres' if 'rds.amazonaws.com' not in POSTGRES_HOST else POSTGRES_HOST}}:{{POSTGRES_PORT}}/{{POSTGRES_DB}}?sslmode=disable
360+
- DATA_SOURCE_NAME=postgresql://{{POSTGRES_USER}}:{{POSTGRES_PASSWORD}}@{{POSTGRES_HOST}}:{{POSTGRES_PORT}}/{{POSTGRES_DB}}?sslmode=disable
361361
deploy:
362362
labels:
363-
- prometheus-job={{_stack}}-postgres-exporter
363+
- prometheus-job=postgres-exporter
364364
- prometheus-port=9187
365365
placement:
366366
constraints:
@@ -372,17 +372,17 @@ services:
372372
reservations:
373373
memory: 32M
374374
cpus: "0.1"
375-
{{_stack}}-redis-exporter:
375+
redis-exporter:
376376
image: oliver006/redis_exporter:v1.62.0-alpine
377377
networks:
378378
- monitored
379379
environment:
380-
REDIS_ADDR: redis://{{_stack}}_redis:{{REDIS_PORT}}
380+
REDIS_ADDR: redis://{{REDIS_HOST}}:{{REDIS_PORT}}
381381
REDIS_EXPORTER_CHECK_KEYS: db0=user_id*client_session_id*alive,db0=user_id*client_session_id*resources,db1=project_lock*,db3=*
382382
REDIS_PASSWORD: ${REDIS_PASSWORD}
383383
deploy:
384384
labels:
385-
- prometheus-job={{_stack}}-redis-exporter
385+
- prometheus-job=redis-exporter
386386
- prometheus-port=9121
387387
placement:
388388
constraints:
@@ -393,4 +393,4 @@ services:
393393
cpus: "0.5"
394394
reservations:
395395
memory: 32M
396-
cpus: "0.1"{% endfor %}
396+
cpus: "0.1"

‎services/monitoring/pgsql_query_exporter_config.yaml.j2‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
1-
databases:{% for _stack in MONITORED_STACK_NAMES.split(",") if _stack != "" %}
2-
postgres_{{_stack}}:
3-
dsn: postgresql://{{POSTGRES_USER}}:{{MONITORED_POSTGRES_PASSWORDS.split(",")[loop.index0]}}@{{_stack + '_postgres' if 'rds.amazonaws.com' not in POSTGRES_HOST else POSTGRES_HOST}}:{{POSTGRES_PORT}}/{{POSTGRES_DB}}{% endfor %}
1+
databases:
2+
postgres:
3+
dsn: postgresql://{{POSTGRES_USER}}:{{POSTGRES_PASSWORD}}@{{POSTGRES_HOST}}:{{POSTGRES_PORT}}/{{POSTGRES_DB}}
44

5-
metrics:{% for _stack in MONITORED_STACK_NAMES.split(",") if _stack != "" %}{% for _gid in MONITORING_PROMETHEUS_PGSQL_GID_MONITORED.split(",") if _gid != "" %}
6-
osparc_{{_stack}}_members_in_gid_{{_gid}}:
5+
metrics:{% for _gid in MONITORING_PROMETHEUS_PGSQL_GID_MONITORED.split(",") if _gid != "" %}
6+
osparc_members_in_gid_{{_gid}}:
77
type: gauge
88
description: Number of users in group {{_gid}}{% endfor %}
9-
osparc_{{_stack}}_total_number_of_users:
9+
osparc_total_number_of_users:
1010
type: gauge
1111
description: Total nuber of registered users
12-
osparc_{{_stack}}_total_number_of_payment_transactions:
12+
osparc_total_number_of_payment_transactions:
1313
type: gauge
1414
description: Total number of payment transactions
15-
osparc_{{_stack}}_total_number_of_successful_payment_transactions:
15+
osparc_total_number_of_successful_payment_transactions:
1616
type: gauge
1717
description: Total number of successful payment transactions
18-
osparc_{{_stack}}_total_number_of_dollars_paid:
18+
osparc_total_number_of_dollars_paid:
1919
type: gauge
2020
description: Total number of dollars paid successfully
21-
osparc_{{_stack}}_total_number_of_credits_purchased_successfully:
21+
osparc_total_number_of_credits_purchased_successfully:
2222
type: gauge
23-
description: Total number of credits purchased successfully{% endfor %}
23+
description: Total number of credits purchased successfully
2424

2525

26-
queries:{% for _stack in MONITORED_STACK_NAMES.split(",") if _stack != "" %}{% for _gid in MONITORING_PROMETHEUS_PGSQL_GID_MONITORED.split(",") if _gid != "" %}
27-
query_{{_stack}}_members_in_gid_{{_gid}}:
26+
queries:{% for _gid in MONITORING_PROMETHEUS_PGSQL_GID_MONITORED.split(",") if _gid != "" %}
27+
query_members_in_gid_{{_gid}}:
2828
interval: 55
29-
databases: [postgres_{{_stack}}]
30-
metrics: [osparc_{{_stack}}_members_in_gid_{{_gid}}]
29+
databases: [postgres]
30+
metrics: [osparc_members_in_gid_{{_gid}}]
3131
sql: |
32-
SELECT COUNT(*) as osparc_{{_stack}}_members_in_gid_{{_gid}}
32+
SELECT COUNT(*) as osparc_members_in_gid_{{_gid}}
3333
FROM users
3434
JOIN user_to_groups ON users.id = user_to_groups.uid
3535
JOIN groups ON groups.gid = user_to_groups.gid
3636
WHERE groups.gid = {{_gid}};{% endfor %}
37-
query_{{_stack}}_total_number_of_users_excluding_guests:
37+
query_total_number_of_users_excluding_guests:
3838
interval: 55
39-
databases: [postgres_{{_stack}}]
40-
metrics: [osparc_{{_stack}}_total_number_of_users]
39+
databases: [postgres]
40+
metrics: [osparc_total_number_of_users]
4141
sql: |
42-
SELECT COUNT(*) as osparc_{{_stack}}_total_number_of_users
42+
SELECT COUNT(*) as osparc_total_number_of_users
4343
FROM users WHERE role <> 'GUEST';
44-
query_{{_stack}}_total_number_of_payment_transactions:
44+
query_total_number_of_payment_transactions:
4545
interval: 55
46-
databases: [postgres_{{_stack}}]
47-
metrics: [osparc_{{_stack}}_total_number_of_payment_transactions]
46+
databases: [postgres]
47+
metrics: [osparc_total_number_of_payment_transactions]
4848
sql: |
49-
SELECT COUNT(*) as osparc_{{_stack}}_total_number_of_payment_transactions
49+
SELECT COUNT(*) as osparc_total_number_of_payment_transactions
5050
FROM payments_transactions
51-
query_{{_stack}}_total_number_of_successful_payment_transactions:
51+
query_total_number_of_successful_payment_transactions:
5252
interval: 55
53-
databases: [postgres_{{_stack}}]
54-
metrics: [osparc_{{_stack}}_total_number_of_successful_payment_transactions]
53+
databases: [postgres]
54+
metrics: [osparc_total_number_of_successful_payment_transactions]
5555
sql: |
56-
SELECT COUNT(*) as osparc_{{_stack}}_total_number_of_successful_payment_transactions
56+
SELECT COUNT(*) as osparc_total_number_of_successful_payment_transactions
5757
FROM payments_transactions WHERE state = 'SUCCESS';
58-
query_{{_stack}}_total_number_of_dollars_paid_successfully:
58+
query_total_number_of_dollars_paid_successfully:
5959
interval: 55
60-
databases: [postgres_{{_stack}}]
61-
metrics: [osparc_{{_stack}}_total_number_of_dollars_paid]
60+
databases: [postgres]
61+
metrics: [osparc_total_number_of_dollars_paid]
6262
sql: |
63-
SELECT SUM(price_dollars) as osparc_{{_stack}}_total_number_of_dollars_paid_successfully
63+
SELECT SUM(price_dollars) as osparc_total_number_of_dollars_paid_successfully
6464
FROM payments_transactions WHERE state = 'SUCCESS';
65-
query_{{_stack}}_total_number_of_credits_purchased_successfully:
65+
query_total_number_of_credits_purchased_successfully:
6666
interval: 55
67-
databases: [postgres_{{_stack}}]
68-
metrics: [osparc_{{_stack}}_total_number_of_credits_purchased_successfully]
67+
databases: [postgres]
68+
metrics: [osparc_total_number_of_credits_purchased_successfully]
6969
sql: |
70-
SELECT SUM(osparc_credits) as osparc_{{_stack}}_total_number_of_credits_purchased_successfully
71-
FROM payments_transactions WHERE state = 'SUCCESS';{% endfor %}
70+
SELECT SUM(osparc_credits) as osparc_total_number_of_credits_purchased_successfully
71+
FROM payments_transactions WHERE state = 'SUCCESS';

‎services/monitoring/template.env‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ MONITORING_DOMAIN=${MONITORING_DOMAIN}
22
MONITORING_PROMETHEUS_RETENTION=${MONITORING_PROMETHEUS_RETENTION}
33
MONITORING_PROMETHEUS_FEDERATION_RETENTION=${MONITORING_PROMETHEUS_FEDERATION_RETENTION}
44
MONITORING_PROMETHEUS_PORT=${MONITORING_PROMETHEUS_PORT}
5-
MONITORED_STACK_NAMES=${MONITORED_STACK_NAMES}
6-
MONITORED_POSTGRES_PASSWORDS=${MONITORED_POSTGRES_PASSWORDS}
75
MINIO_PROMETHEUS_TOKEN=${MINIO_PROMETHEUS_TOKEN}
86
MACHINE_FQDN=${MACHINE_FQDN}
97
GRAFANA_CLUSTER=${GRAFANA_CLUSTER}

‎services/redis-commander/README.md‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎services/redis-commander/config.json.j2‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
{%- endmacro %}
1414
{
1515
"connections": [
16-
{#- special if for DALCO. Remove once dalco is not special case anymore #}
17-
{%- if REDIS_STAGING_DATABASES %}
18-
{%- for label in REDIS_STAGING_DATABASES.strip(',').split(',') %}
19-
{{ redis_connection(label, REDIS_STAGING_HOST, REDIS_STAGING_PORT, REDIS_STAGING_USER, REDIS_STAGING_PASSWORD, loop.index0, REDIS_STAGING_SECURE) | indent(4) }},
20-
{%- endfor %}
21-
{%- endif %}
2216
{%- if REDIS_DATABASES %}
2317
{%- for label in REDIS_DATABASES.strip(',').split(',') %}
2418
{{ redis_connection(label, REDIS_HOST, REDIS_PORT, REDIS_USER, REDIS_PASSWORD, loop.index0, REDIS_SECURE) | indent(4) }}{%- if not loop.last %},{% endif %}

‎services/redis-commander/template.env‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ REDIS_USER=${REDIS_USER}
66
REDIS_PASSWORD=${REDIS_PASSWORD}
77
REDIS_SECURE=${REDIS_SECURE}
88
REDIS_DATABASES=${REDIS_DATABASES}
9-
REDIS_STAGING_PASSWORD=${REDIS_STAGING_PASSWORD}
10-
REDIS_STAGING_DATABASES=${REDIS_STAGING_DATABASES}
11-
REDIS_STAGING_HOST=${REDIS_STAGING_HOST}
12-
REDIS_STAGING_PORT=${REDIS_STAGING_PORT}
13-
REDIS_STAGING_USER=${REDIS_STAGING_USER}
14-
REDIS_STAGING_SECURE=${REDIS_STAGING_SECURE}
159
PUBLIC_NETWORK=${PUBLIC_NETWORK}
1610
MONITORED_NETWORK=${MONITORED_NETWORK}

‎services/simcore/docker-compose.deploy.dalco.yml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
services:
2-
autoscaling:
3-
deploy:
4-
replicas: 0
5-
agent:
6-
volumes:
7-
- /docker/volumes/:/docker/volumes/
8-
postgres:
9-
labels:
10-
- "pgbackup.enable=true"
11-
deploy:
12-
placement:
13-
constraints:
14-
- node.labels.postgres == true
15-
dask-sidecar:
16-
deploy:
17-
placement:
18-
constraints:
19-
- node.role == worker
2+
autoscaling:
3+
deploy:
4+
replicas: 0
5+
agent:
6+
volumes:
7+
- /docker/volumes/:/docker/volumes/
8+
postgres:
9+
labels:
10+
- "pgbackup.enable=true"
11+
deploy:
12+
placement:
13+
constraints:
14+
- node.labels.postgres == true
15+
dask-sidecar:
16+
deploy:
17+
placement:
18+
constraints:
19+
- node.role == worker
2020

21-
traefik:
22-
command:
23-
- "--api=true"
24-
- "--api.dashboard=true"
25-
- "--ping=true"
26-
- "--entryPoints.ping.address=:9082"
27-
- "--ping.entryPoint=ping"
28-
- "--log.level=${SIMCORE_TRAEFIK_LOGLEVEL}"
29-
- "--accesslog=false"
30-
- "--metrics.prometheus=true"
31-
- "--metrics.prometheus.addEntryPointsLabels=true"
32-
- "--metrics.prometheus.addServicesLabels=true"
33-
- "--entryPoints.metrics.address=:8082"
34-
- "--metrics.prometheus.entryPoint=metrics"
35-
- "--entryPoints.http.address=:80"
36-
- "--entryPoints.http.forwardedHeaders.insecure"
37-
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
38-
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
39-
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
40-
- "--entryPoints.postgres.address=:5432"
41-
- "--entryPoints.simcore_api.address=:10081"
42-
- "--entryPoints.simcore_api.forwardedHeaders.insecure"
43-
- "--entryPoints.simcore_api.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
44-
- "--entryPoints.simcore_api.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
45-
- "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
46-
- "--entryPoints.traefik_monitor.address=:8080"
47-
- "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
48-
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
49-
- "--providers.swarm.network=${SWARM_STACK_NAME}_default"
50-
# https://github.com/traefik/traefik/issues/7886
51-
- "--providers.swarm.refreshSeconds=1"
52-
- "--providers.swarm.exposedByDefault=false"
53-
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
54-
- "--tracing=true"
55-
- "--tracing.addinternals"
56-
- "--tracing.otlp=true"
57-
- "--tracing.otlp.http=true"
58-
deploy:
59-
resources:
60-
limits:
61-
memory: 2048M
62-
cpus: '2.000'
63-
labels:
64-
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.entrypoints=${PREFIX_STACK_NAME}_postgres
65-
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.tls=false
66-
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.service=${SWARM_STACK_NAME}_postgresRoute
67-
- traefik.tcp.services.${SWARM_STACK_NAME}_postgresRoute.loadbalancer.server.port=5432
68-
- "traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.rule=ClientIP(`195.176.8.0/24`) || ClientIP(`10.0.0.0/8`) || ClientIP(`172.16.0.0/12`) || ClientIP(`192.168.0.0/16`)"
69-
wb-garbage-collector:
70-
hostname: "{{.Service.Name}}"
71-
wb-api-server:
72-
deploy:
73-
replicas: 3
74-
clusters-keeper:
75-
deploy:
76-
replicas: 0
77-
payments:
78-
deploy:
79-
replicas: 0
21+
traefik:
22+
command:
23+
- "--api=true"
24+
- "--api.dashboard=true"
25+
- "--ping=true"
26+
- "--entryPoints.ping.address=:9082"
27+
- "--ping.entryPoint=ping"
28+
- "--log.level=${SIMCORE_TRAEFIK_LOGLEVEL}"
29+
- "--accesslog=false"
30+
- "--metrics.prometheus=true"
31+
- "--metrics.prometheus.addEntryPointsLabels=true"
32+
- "--metrics.prometheus.addServicesLabels=true"
33+
- "--entryPoints.metrics.address=:8082"
34+
- "--metrics.prometheus.entryPoint=metrics"
35+
- "--entryPoints.http.address=:80"
36+
- "--entryPoints.http.forwardedHeaders.insecure"
37+
- "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
38+
- "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
39+
- "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
40+
- "--entryPoints.postgres.address=:5432"
41+
- "--entryPoints.simcore_api.address=:10081"
42+
- "--entryPoints.simcore_api.forwardedHeaders.insecure"
43+
- "--entryPoints.simcore_api.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
44+
- "--entryPoints.simcore_api.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
45+
- "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
46+
- "--entryPoints.traefik_monitor.address=:8080"
47+
- "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
48+
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
49+
- "--providers.swarm.network=${SWARM_STACK_NAME}_default"
50+
# https://github.com/traefik/traefik/issues/7886
51+
- "--providers.swarm.refreshSeconds=1"
52+
- "--providers.swarm.exposedByDefault=false"
53+
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
54+
- "--tracing=true"
55+
- "--tracing.addinternals"
56+
- "--tracing.otlp=true"
57+
- "--tracing.otlp.http=true"
58+
deploy:
59+
resources:
60+
limits:
61+
memory: 2048M
62+
cpus: "2.000"
63+
labels:
64+
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.entrypoints=postgres
65+
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.tls=false
66+
- traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.service=${SWARM_STACK_NAME}_postgresRoute
67+
- traefik.tcp.services.${SWARM_STACK_NAME}_postgresRoute.loadbalancer.server.port=5432
68+
- "traefik.tcp.routers.${SWARM_STACK_NAME}_postgresRoute.rule=ClientIP(`195.176.8.0/24`) || ClientIP(`10.0.0.0/8`) || ClientIP(`172.16.0.0/12`) || ClientIP(`192.168.0.0/16`)"
69+
wb-garbage-collector:
70+
hostname: "{{.Service.Name}}"
71+
wb-api-server:
72+
deploy:
73+
replicas: 3
74+
clusters-keeper:
75+
deploy:
76+
replicas: 0
77+
payments:
78+
deploy:
79+
replicas: 0

0 commit comments

Comments
 (0)