finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for exposing metrics for Synapse workers

Browse Source
This commit is contained in:
Slavi Pantaleev
2024-01-12 12:15:40 +02:00
parent 22f5f0ba75
commit 41a52945d6
11 changed files with 159 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
roles/custom/matrix-synapse/templates/synapse/labels.j2
View File

@ -48,6 +48,16 @@ traefik.http.routers.matrix-synapse-client-root.tls.certResolver={{ matrix_synap
#}
{#
#########################################################################
# #
# Matrix-related labels #
# See: `matrix_synapse_container_labels_matrix_related_labels_enabled` #
# #
#########################################################################
#}
{% if matrix_synapse_container_labels_matrix_related_labels_enabled %}
{#
Client-API (/_matrix)
#}
@ -172,6 +182,17 @@ traefik.http.routers.matrix-synapse-federation-api.tls.certResolver={{ matrix_sy
/Federation-API (/_matrix)
#}
{#
#########################################################################
# #
# /Matrix-related labels #
# See: `matrix_synapse_container_labels_matrix_related_labels_enabled` #
# #
#########################################################################
#}
{% endif %}
{#
Metrics (e.g. /metrics/synapse/main-process)
#}
@ -205,11 +226,6 @@ traefik.http.routers.matrix-synapse-metrics.tls={{ matrix_synapse_container_labe
traefik.http.routers.matrix-synapse-metrics.tls.certResolver={{ matrix_synapse_container_labels_metrics_traefik_tls_certResolver }}
{% endif %}
{% if matrix_synapse_container_labels_metrics_middleware_basic_auth_enabled %}
traefik.http.routers.matrix-synapse-metrics.middlewares=matrix-synapse-metrics-basic-auth
traefik.http.middlewares.matrix-synapse-metrics-basic-auth.basicauth.users={{ matrix_synapse_container_labels_metrics_middleware_basic_auth_users }}
{% endif %}
{% endif %}
{#
/Metrics (e.g. /metrics/synapse/main-process)

1
roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2
View File

@ -42,6 +42,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
{% for volume in matrix_synapse_container_additional_volumes %}
--mount type={{ volume.type | default('bind' if '/' in volume.src else 'volume') }},src={{ volume.src }},dst={{ volume.dst }}{{ (',' + volume.options) if volume.options else '' }} \
{% endfor %}
--label-file={{ matrix_synapse_base_path }}/{{ matrix_synapse_worker_labels_file_name }} \
{% for arg in matrix_synapse_container_arguments %}
{{ arg }} \
{% endfor %}

51
roles/custom/matrix-synapse/templates/synapse/worker-labels.j2 Normal file
View File

@ -0,0 +1,51 @@
{% if matrix_synapse_worker_container_labels_traefik_enabled %}
traefik.enable=true
{% if matrix_synapse_worker_container_labels_traefik_docker_network %}
traefik.docker.network={{ matrix_synapse_worker_container_labels_traefik_docker_network }}
{% endif %}
traefik.http.services.{{ matrix_synapse_worker_container_name }}-metrics.loadbalancer.server.port={{ matrix_synapse_worker_details.metrics_port }}
{#
Metrics (e.g. /metrics/synapse/__WORKER_ID__)
#}
{% if matrix_synapse_worker_container_labels_metrics_enabled %}
{% set metrics_middlewares = [] %}
{% if matrix_synapse_worker_container_labels_metrics_middleware_basic_auth_enabled %}
{% set metrics_middlewares = metrics_middlewares + [matrix_synapse_worker_container_name + '-metrics-basic-auth'] %}
traefik.http.middlewares.{{ matrix_synapse_worker_container_name }}-metrics-basic-auth.basicauth.users={{ matrix_synapse_worker_container_labels_metrics_middleware_basic_auth_users }}
{% endif %}
{% set metrics_middlewares = metrics_middlewares + [matrix_synapse_worker_container_name + '-metrics-replacepath'] %}
traefik.http.middlewares.{{ matrix_synapse_worker_container_name }}-metrics-replacepath.replacepath.path=/_synapse/metrics
traefik.http.routers.{{ matrix_synapse_worker_container_name }}-metrics.rule={{ matrix_synapse_worker_container_labels_metrics_traefik_rule | replace('__WORKER_ID__', matrix_synapse_worker_details.id) }}
{% if metrics_middlewares | length > 0 %}
traefik.http.routers.{{ matrix_synapse_worker_container_name }}-metrics.middlewares={{ metrics_middlewares | join(',') }}
{% endif %}
{% if matrix_synapse_worker_container_labels_metrics_traefik_priority | int > 0 %}
traefik.http.routers.{{ matrix_synapse_worker_container_name }}-metrics.priority={{ matrix_synapse_worker_container_labels_metrics_traefik_priority }}
{% endif %}
traefik.http.routers.{{ matrix_synapse_worker_container_name }}-metrics.service={{ matrix_synapse_worker_container_name }}-metrics
traefik.http.routers.{{ matrix_synapse_worker_container_name }}-metrics.entrypoints={{ matrix_synapse_worker_container_labels_metrics_traefik_entrypoints }}
traefik.http.routers.{{ matrix_synapse_worker_container_name }}-metrics.tls={{ matrix_synapse_worker_container_labels_metrics_traefik_tls | to_json }}
{% if matrix_synapse_worker_container_labels_metrics_traefik_tls %}
traefik.http.routers.{{ matrix_synapse_worker_container_name }}-metrics.tls.certResolver={{ matrix_synapse_worker_container_labels_metrics_traefik_tls_certResolver }}
{% endif %}
{% endif %}
{#
/Metrics (e.g. /metrics/synapse/__WORKER_ID__)
#}
{% endif %}
{{ matrix_synapse_worker_container_labels_additional_labels }}