commit d3724dd8fcdac6a0cfd52564eca776a80acd3429
parent 606bcef1bc2217913bf018a813c1dc6e66aad79e
Author: Christian Grothoff <christian@grothoff.org>
Date: Sat, 1 Feb 2025 21:59:18 +0100
do
Diffstat:
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/playbooks/libeufin-export.yml b/playbooks/libeufin-export.yml
@@ -13,5 +13,5 @@
cmd: "unzip spec.taler-ops.ch{{ hostvars['spec.taler-ops.ch']['exportfile']['path'] }}"
chdir: "../exports/{{ hostvars['spec.taler-ops.ch']['today']['stdout'] }}"
-# FIXME: should replace spec.taler-ops.ch above with some
-# variable, and then set that variable via the inventory.
+# FIXME: should replace spec.taler-ops.ch above with {{ TARGET_HOST_NAME }}
+# somehow.
diff --git a/playbooks/setup.yml b/playbooks/setup.yml
@@ -6,9 +6,9 @@
- role: ansible-pull
- role: webserver
- role: database
+ - role: monitoring
- role: libeufin-nexus
- role: challenger
when: DEPLOY_CHALLENGER | bool
- role: exchange
- role: auditor
- - role: monitoring
diff --git a/playbooks/tops-public.yml b/playbooks/tops-public.yml
@@ -3,6 +3,8 @@
DEPLOY_CHALLENGER: true
# Main domain name.
DOMAIN_NAME: "taler-ops.ch"
+# Our internal hostname
+TARGET_HOST_NAME: "spec.taler-ops.ch"
# Use nightly Taler distro (true/false).
USE_NIGHTLY: true
# Deploy EBICS configuration (true/false).
diff --git a/roles/monitoring/files/etc/default/prometheus-postgres-exporter b/roles/monitoring/files/etc/default/prometheus-postgres-exporter
@@ -3,8 +3,8 @@
# /usr/share/doc/prometheus-postgres-exporter/README.Debian
# DATA_SOURCE_NAME='postgresql://login:password@hostname:port/'
-# DATA_SOURCE_NAME='user=prometheus host=/run/postgresql dbname=postgres'
-DATA_SOURCE_NAME='user=postgres host=/run/postgresql dbname=taler-exchange'
+DATA_SOURCE_NAME='user=prometheus host=/run/postgresql dbname=postgres'
+# DATA_SOURCE_NAME='user=prometheus host=/run/postgresql dbname=taler-exchange'
# Set the command-line arguments to pass to the server.
# Due to shell escaping, to pass backslashes for regexes, you need to double
diff --git a/roles/monitoring/tasks/main.yml b/roles/monitoring/tasks/main.yml
@@ -1,4 +1,7 @@
---
+- name: Get the list of services
+ service_facts:
+
- name: Deploy grafana signing key
copy:
src: etc/apt/keyrings/grafana.gpg