From 8077db09b5e1386d29c8cb991e478d0fee14346d Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 20 Mar 2024 09:24:10 -0400
Subject: [PATCH] Fiddling with metrics server.

---
 ansible/playbooks/setup_metrics.yml         | 26 ++++++++++-----------
 ansible/roles/mongo-exporter/tasks/main.yml |  9 ++++---
 ansible/setup.yml                           |  2 +-
 docker/haproxy/haproxy.consul.cfg.j2        |  3 ++-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ansible/playbooks/setup_metrics.yml b/ansible/playbooks/setup_metrics.yml
index 59f478d3e..04b6b523c 100644
--- a/ansible/playbooks/setup_metrics.yml
+++ b/ansible/playbooks/setup_metrics.yml
@@ -8,16 +8,16 @@
     - motd_role: db
 
   roles:
-    - {role: 'base', tags: 'base'}
-    - {role: 'ufw', tags: 'ufw'}
-    - {role: 'docker', tags: 'docker'}
-    - {role: 'repo', tags: ['repo', 'pull']}
-    - {role: 'dnsmasq', tags: 'dnsmasq'}
-    - {role: 'consul', tags: 'consul'}
-    - {role: 'consul-client', tags: 'consul'}
-    - {role: 'mongo-exporter', tags: 'mongo-exporter'}
-    - {role: 'postgres-exporter', tags: 'postgres-exporter'}
-    - {role: 'redis-exporter', tags: 'redis-exporter'}
-    - {role: 'node-exporter', tags: ['node-exporter', 'metrics']}
-    - {role: 'prometheus', tags: ['prometheus', 'metrics']}
-    - {role: 'grafana', tags: ['grafana', 'metrics']}
+    # - {role: 'base', tags: 'base'}
+    # - {role: 'ufw', tags: 'ufw'}
+    # - {role: 'docker', tags: 'docker'}
+    # - {role: 'repo', tags: ['repo', 'pull']}
+    # - {role: 'dnsmasq', tags: 'dnsmasq'}
+    # - {role: 'consul', tags: 'consul'}
+    # - {role: 'consul-client', tags: 'consul'}
+    # - {role: 'mongo-exporter', tags: 'mongo-exporter'}
+    - { role: "postgres-exporter", tags: "postgres-exporter" }
+    - { role: "redis-exporter", tags: "redis-exporter" }
+    - { role: "node-exporter", tags: ["node-exporter", "metrics"] }
+    - { role: "prometheus", tags: ["prometheus", "metrics"] }
+    - { role: "grafana", tags: ["grafana", "metrics"] }
diff --git a/ansible/roles/mongo-exporter/tasks/main.yml b/ansible/roles/mongo-exporter/tasks/main.yml
index b9cf9db8b..304c3141d 100644
--- a/ansible/roles/mongo-exporter/tasks/main.yml
+++ b/ansible/roles/mongo-exporter/tasks/main.yml
@@ -1,4 +1,3 @@
-
 - name: Start mongo-exporter container
   become: yes
   docker_container:
@@ -12,9 +11,9 @@
       - name: newsblurnet
     env:
       # MONGODB_URI: 'mongodb://{{ inventory_hostname }}.node.nyc1.consul:27017/admin?'
-      MONGODB_URI: 'mongodb://{{ mongodb_username }}:{{ mongodb_password }}@{{ inventory_hostname }}.node.nyc1.consul:27017/admin?authSource=admin'
+      MONGODB_URI: "mongodb://{{ mongodb_username }}:{{ mongodb_password }}@{{ inventory_hostname }}.node.nyc1.consul:27017/admin?authSource=admin"
     ports:
-    - '9216:9216'
+      - "9216:9216"
 
 - name: Register mongo-exporter in consul
   tags: consul
@@ -24,5 +23,5 @@
     dest: /etc/consul.d/mongo-exporter.json
   notify:
     - reload consul
-- name: Command to register mongo-exporter
-  command: "consul services register /etc/consul.d/mongo-exporter.json"
+# - name: Command to register mongo-exporter
+#   command: "consul services register /etc/consul.d/mongo-exporter.json"
diff --git a/ansible/setup.yml b/ansible/setup.yml
index af6dbfeaf..c53025100 100644
--- a/ansible/setup.yml
+++ b/ansible/setup.yml
@@ -26,4 +26,4 @@
 - import_playbook: playbooks/setup_metrics.yml
   when: "'metrics' in inventory_hostname"
 - import_playbook: playbooks/setup_sentry.yml
-  when: "'sentry' in inventory_hostname"
+  when: "'sentry' in inventory_hostname or 'metrics' in inventory_hostname"
diff --git a/docker/haproxy/haproxy.consul.cfg.j2 b/docker/haproxy/haproxy.consul.cfg.j2
index 77c0097ea..d3b5b372f 100644
--- a/docker/haproxy/haproxy.consul.cfg.j2
+++ b/docker/haproxy/haproxy.consul.cfg.j2
@@ -213,6 +213,7 @@ backend postgres
     {% for host in groups.postgres %}
         server {{host}} {{host}}.node.nyc1.consul:5579
     {% endfor %}
+    server hdb-postgres-secondary hdb-redis-secondary.node.nyc1.consul:5579
 
 backend mongo
     option httpchk GET /db_check/mongo
@@ -234,7 +235,7 @@ backend db_redis_user
     {% for host in groups.redis_user %}
         server {{host}} {{host}}.node.nyc1.consul:5579
     {% endfor %}
-    server db-redis-secondary hdb-redis-secondary.node.nyc1.consul:5579
+    server hdb-redis-secondary hdb-redis-secondary.node.nyc1.consul:5579
 
 backend db_redis_story
     option httpchk GET /db_check/redis_story