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

Fix prometheus.yml.j2 indentation and worker ids for stream writers

Browse Source 
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2105
This commit is contained in:
Slavi Pantaleev 2022-09-15 12:46:41 +03:00
parent 800267b182
commit b07fd76830
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/matrix-prometheus/templates/prometheus.yml.j2
View File

@ -32,17 +32,17 @@ scrape_configs:
static_configs: static_configs:
- targets: {{ matrix_prometheus_scraper_synapse_targets|to_json }} - targets: {{ matrix_prometheus_scraper_synapse_targets|to_json }}
labels: labels:
instance: {{ matrix_domain }} instance: {{ matrix_domain | to_json }}
job: master job: master
index: 0 index: 0
{% for worker in matrix_prometheus_scraper_synapse_workers_enabled_list %} {% for worker in matrix_prometheus_scraper_synapse_workers_enabled_list %}
{% if worker.metrics_port != 0 %} {% if worker.metrics_port != 0 %}
- targets: ['{{ worker.name }}:{{ worker.metrics_port }}'] - targets: ['{{ worker.name }}:{{ worker.metrics_port }}']
labels: labels:
instance: {{ matrix_domain }} instance: {{ matrix_domain | to_json }}
worker_id: {{ worker.id }} worker_id: {{ worker.id | to_json }}
job: {{ worker.type }} job: {{ worker.type | to_json }}
app: {{ worker.app }} app: {{ worker.app | to_json }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}

2
roles/matrix-synapse/tasks/synapse/workers/init.yml
View File

@ -20,7 +20,7 @@
- name: Build stream writer workers - name: Build stream writer workers
ansible.builtin.set_fact: ansible.builtin.set_fact:
worker: worker:
id: "stream-writer-{{ item }}-{{ item.stream }}" id: "stream-writer-{{ idx }}-{{ item.stream }}"
# Names must not include understores. Certain stream writer streams (to_device, account_data, ..) do, so we fix them up. # Names must not include understores. Certain stream writer streams (to_device, account_data, ..) do, so we fix them up.
name: "matrix-synapse-worker-stream-writer-{{ idx }}-{{ item.stream | replace('_', '-') }}" name: "matrix-synapse-worker-stream-writer-{{ idx }}-{{ item.stream | replace('_', '-') }}"
type: 'stream_writer' type: 'stream_writer'