From 3d3813f3bf2487b8ac1ab17cb0f765e966060cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz?= Date: Thu, 13 Feb 2025 16:22:12 +0100 Subject: [PATCH] Add dev-prod versions of the prometheus access keys variables --- ansible/roles/prometheus/templates/prometheus.yml | 4 ++-- ansible/roles/prometheus/vars/main.yml | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ansible/roles/prometheus/templates/prometheus.yml b/ansible/roles/prometheus/templates/prometheus.yml index 0eb7497..3e8fa79 100755 --- a/ansible/roles/prometheus/templates/prometheus.yml +++ b/ansible/roles/prometheus/templates/prometheus.yml @@ -223,8 +223,8 @@ scrape_configs: # Node level metrics for cluster nodes ec2_sd_configs: - - access_key: "{{prometheus_aws_access_key}}" - secret_key: "{{prometheus_aws_secret_key}}" + - access_key: "{{prometheus_aws_access_key_dev}}" + secret_key: "{{prometheus_aws_secret_key_dev}}" region: "eu-central-1" port: 9100 # should be the proxy relabel_configs: # Change the host to the proxy host with relabeling diff --git a/ansible/roles/prometheus/vars/main.yml b/ansible/roles/prometheus/vars/main.yml index 513c9b4..3e3fd35 100644 --- a/ansible/roles/prometheus/vars/main.yml +++ b/ansible/roles/prometheus/vars/main.yml @@ -151,8 +151,11 @@ blackbox_jobs: module: icmp targets: "{{ dom0_hosts | list }}" -prometheus_aws_access_key: "{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/ooni_monitoring/access_key', profile='oonidevops_user_dev') }}" -prometheus_aws_secret_key: "{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/ooni_monitoring/secret_key', profile='oonidevops_user_dev') }}" +prometheus_aws_access_key_dev: "{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/ooni_monitoring/access_key', profile='oonidevops_user_dev') }}" +prometheus_aws_secret_key_dev: "{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/ooni_monitoring/secret_key', profile='oonidevops_user_dev') }}" + +prometheus_aws_access_key_prod: "{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/ooni_monitoring/access_key', profile='oonidevops_user_prod') }}" +prometheus_aws_secret_key_prod: "{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/ooni_monitoring/secret_key', profile='oonidevops_user_prod') }}" clickhouse_proxy_host_dev: "clickhouseproxy.dev.ooni.io" clickhouse_proxy_host_prod: "clickhouseproxy.dev.ooni.io" # TODO Change for prod