diff --git a/ansible/inventories/digital_ocean.yml b/ansible/inventories/digital_ocean.yml index fcfbbf64d..0acbf18c4 100644 --- a/ansible/inventories/digital_ocean.yml +++ b/ansible/inventories/digital_ocean.yml @@ -29,7 +29,7 @@ groups: elasticsearch: inventory_hostname.startswith('db-elasticsearch') redis: inventory_hostname.startswith('db-redis') postgres: inventory_hostname.startswith('db-postgres') - mongo: inventory_hostname.startswith('db-mongo') + mongo: inventory_hostname.startswith('db-mongo') and not inventory_hostname.startswith('db-mongo-analytics') mongo_analytics: inventory_hostname.startswith('db-mongo-analytics') consul: inventory_hostname.startswith('db-consul') metrics: inventory_hostname.startswith('db-metrics') diff --git a/ansible/roles/mongo/tasks/main.yml b/ansible/roles/mongo/tasks/main.yml index 7a7e71cf3..cee0ac1d9 100644 --- a/ansible/roles/mongo/tasks/main.yml +++ b/ansible/roles/mongo/tasks/main.yml @@ -91,14 +91,14 @@ hostname: "{{ inventory_hostname }}" restart_policy: unless-stopped networks_cli_compatible: yes - network_mode: host - # network_mode: default - # networks: - # - name: newsblurnet - # aliases: - # - mongo - # ports: - # - "27017:27017" + # network_mode: host + network_mode: default + networks: + - name: newsblurnet + aliases: + - mongo + ports: + - "27017:27017" command: --config /etc/mongod.conf volumes: - /mnt/{{ inventory_hostname | regex_replace('db-|-', '') }}:/data/db diff --git a/ansible/roles/mongo/templates/mongo.analytics.conf b/ansible/roles/mongo/templates/mongo.analytics.conf index 21cef4e0c..01e1b080a 100644 --- a/ansible/roles/mongo/templates/mongo.analytics.conf +++ b/ansible/roles/mongo/templates/mongo.analytics.conf @@ -27,9 +27,9 @@ net: processManagement: timeZoneInfo: /usr/share/zoneinfo -# security: -# keyFile: /srv/newsblur/config/mongodb_keyfile.key -# authorization: enabled +security: + keyFile: /srv/newsblur/config/mongodb_keyfile.key + authorization: enabled # transitionToAuth: true operationProfiling: diff --git a/docker/haproxy/haproxy.consul.cfg.j2 b/docker/haproxy/haproxy.consul.cfg.j2 index 61331edfd..1ee58e647 100644 --- a/docker/haproxy/haproxy.consul.cfg.j2 +++ b/docker/haproxy/haproxy.consul.cfg.j2 @@ -172,14 +172,14 @@ backend mongo {% for host in groups.mongo %} server {{host}} {{host}}.node.nyc1.consul:5579 {% endfor %} -{# + backend mongo_analytics - option httpchk GET /db_check/mongo + option httpchk GET /db_check/mongo_analytics default-server check inter 2000ms resolvers consul resolve-prefer ipv4 resolve-opts allow-dup-ip init-addr none {% for host in groups.mongo_analytics %} server {{host}} {{host}}.node.nyc1.consul:5579 {% endfor %} -#} + backend db_redis_user option httpchk GET /db_check/redis server db-redis-user db-redis-user.node.nyc1.consul:5579 check inter 2000ms resolvers consul resolve-opts allow-dup-ip init-addr none diff --git a/flask_monitor/db_monitor.py b/flask_monitor/db_monitor.py index 819699dfc..b4cc5bc38 100644 --- a/flask_monitor/db_monitor.py +++ b/flask_monitor/db_monitor.py @@ -109,7 +109,7 @@ def db_check_mongo(): @app.route("/db_check/mongo_analytics") def db_check_mongo_analytics(): try: - client = pymongo.MongoClient(f"mongodb://{settings.MONGO_DB['username']}:{settings.MONGO_DB['password']}@{settings.SERVER_NAME}/?authSource=admin") + client = pymongo.MongoClient(f"mongodb://{settings.MONGO_ANALYTICS_DB['username']}:{settings.MONGO_ANALYTICS_DB['password']}@{settings.SERVER_NAME}/?authSource=admin") db = client.nbanalytics except: abort(503)