Add dev-prod versions of the prometheus access keys variables

ooni · Feb 13, 2025 · 3d3813f · 3d3813f
1 parent 2c1fc4f
commit 3d3813f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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