Updating monitor to use new elasticsearch.

ansible/roles/haproxy/tasks/main.yml

@@ -77,12 +77,13 @@
     env:
       DOCKERBUILD: ""
     state: started
-    networks_cli_compatible: yes
-    network_mode: default
-    networks:
-      - name: newsblurnet
-    ports:
-      - "80:80"
+    network_mode: host
+    # networks:
+    #   - name: newsblurnet
+    # ports:
+    #   - "80:80"
+    #   - "443:443"
+    #   - "1936:1936"
     restart_policy: unless-stopped
     container_default_behavior: no_defaults
     command: "haproxy -f /srv/newsblur/docker/haproxy/haproxy.consul.cfg"

flask_monitor/db_monitor.py

@@ -4,7 +4,7 @@ import psycopg2
 import pymysql
 import pymongo
 import redis
-from elasticsearch import Elasticsearch
+import elasticsearch
 
 from newsblur_web import settings
 
@@ -190,7 +190,7 @@ def db_check_redis_pubsub():
 @app.route("/db_check/elasticsearch")
 def db_check_elasticsearch():
     try:
-        conn = pyes.ES(LOCAL_HOST)
+        conn = elasticsearch.Elasticsearch(LOCAL_HOST)
     except:
         abort(503)
     

flask_monitor/requirements.txt

@@ -2,7 +2,7 @@ flask==1.1.2
 pymongo==3.11.2
 psycopg2>=2,<3
 redis==3.5.3
-elasticsearch>=7.0.0,<8.0.0
+elasticsearch>=7,<8
 pymysql==0.10.1
 celery>=4,<5
 Django>=3.1,<3.2