logs.nimbus: use docker compose setup for elasticsearch

https://github.com/status-im/infra-role-elasticsearch/commit/567f32ac

Signed-off-by: Jakub Sokołowski <jakub@status.im>

ansible/group_vars/dash.nimbus.yml

@@ -1,4 +1,8 @@
 ---
+# ElasticSearch LB needs a bit
+swap_file_path: '/main.swap'
+swap_file_size_mb: 2048
+
 # CloudFlare Origin certificates
 origin_certs:
   - domain: 'status.im'
@@ -8,14 +12,19 @@ origin_certs:
 
 # Kibana Dashboard
 kibana_domain: 'nimbus-logs.infra.status.im'
-kibana_version: '7.14.2'
-kibana_cont_name: kibana
+kibana_service_name: 'kibana'
+kibana_docker_network_name: '{{ kibana_service_name }}'
+kibana_cont_name: '{{ kibana_service_name }}'
+kibana_cont_tag: '7.17.0'
 kibana_cont_port: 5601
+kiban_es_lb_addr: '{{ es_lb_cont_name }}'
+kiban_es_lb_port: '{{ es_lb_api_port }}'
 
 # oauth access
 oauth_domain: '{{ kibana_domain }}'
 oauth_cont_name: '{{ kibana_cont_name }}-oauth'
-oauth_upstream_cont: '{{ kibana_cont_name }}'
+oauth_cont_networks: [{name: '{{ kibana_docker_network_name }}'}]
+oauth_upstream_name: '{{ kibana_cont_name }}'
 oauth_upstream_port: '{{ kibana_cont_port }}'
 oauth_public_port: 443
 oauth_local_port: 8090
@@ -24,8 +33,10 @@ oauth_id: '{{ lookup("bitwarden", "nimbus/kibana/oauth", field="client-id") }}'
 oauth_secret: '{{ lookup("bitwarden", "nimbus/kibana/oauth", field="secret") }}'
 
 # ElasticSearch Load Balancer
-es_lb_image: 'elasticsearch:7.14.2'
-es_lb_cont_name: elasticsearch-lb
+es_lb_service_name: 'elasticsearch'
+es_lb_docker_network_name: '{{ kibana_docker_network_name }}'
+es_lb_cont_name: '{{ es_lb_service_name }}-lb'
+es_lb_cont_tag: '7.17.0'
 es_lb_data_center: do-ams3
 es_lb_cluster_name: 'nimbus-logs-search'
 es_lb_cluster_dc: 'he-eu-hel1'

ansible/group_vars/logs.nimbus.yml

@@ -11,6 +11,9 @@ swap_file_path: '/main.swap'
 swap_file_size_mb: 2048
 
 # ElasticSearch Cluster
+es_service_name: 'elasticsearch'
+es_cluster_name: 'nimbus-logs-search'
+es_docker_network_name: '{{ es_service_name }}'
 es_master_nodes: |
   {{ ansible_play_hosts
    | map('extract', hostvars)
@@ -21,8 +24,6 @@ es_master_nodes: |
      addr: ansible_local.wireguard.vpn_ip,
      port: to_string(es_node_port)
    }') }}
-es_cluster_name: 'nimbus-logs-search'
-es_cont_name: 'elasticsearch'
 
 es_image: 'elasticsearch:7.14.2'
 es_api_port: 9200
@@ -41,12 +42,14 @@ es_jvm_min_heap: '{{ es_jvm_mem | int }}m'
 es_jvm_max_heap: '{{ es_jvm_mem | int }}m'
 
 # ElasticSearch HQ
-es_hq_lb_cont_name: '{{ es_cont_name }}'
+es_hq_cont_enabled: true
+es_hq_cont_port: 5000
 
 # oauth access
 oauth_domain: 'nimbus-es.infra.status.im'
 oauth_cont_name: '{{ es_hq_cont_name }}-oauth'
-oauth_upstream_cont: '{{ es_hq_cont_name }}'
+oauth_cont_networks: [{name: '{{ es_docker_network_name }}'}]
+oauth_upstream_name: 'hq'
 oauth_upstream_port: '{{ es_hq_cont_port }}'
 oauth_public_port: 443
 oauth_local_port: 8090

ansible/logs.yml

@@ -19,8 +19,6 @@
       tags: origin-certs
     - role: elasticsearch
       tags: elasticsearch
-    - role: elasticsearch-hq
-      tags: elasticsearch-hq
     - role: oauth-proxy
       tags: oauth-proxy
     - role: nginx
@@ -50,6 +48,8 @@
               port: to_string(ServiceMeta.cluster_port)
             }') }}
   roles:
+    - role: swap-file
+      tags: swap-file
     - role: elasticsearch-lb
       tags: elasticsearch-lb
     - role: logclean-job

ansible/requirements.yml

@@ -16,17 +16,17 @@
 
 - name: infra-role-bootstrap-linux
   src: git@github.com:status-im/infra-role-bootstrap-linux.git
-  version: 7d2646cad4046e20b02628f4efc1e2b87deef773
+  version: c5f6f1c59d91f50f647def54c8b5b32998465912
   scm: git
 
 - name: infra-role-bootstrap-windows
   src: git@github.com:status-im/infra-role-bootstrap-windows.git
-  version: 9cd9c24cec4c4a9eb8b0c080ad352d83486d1c58
+  version: cf9df32cfed59f4e7cc93f36b3fd8795d46fedde
   scm: git
 
 - name: infra-role-bootstrap-macos
   src: git@github.com:status-im/infra-role-bootstrap-macos.git
-  version: 3c46cb38d6ba9d6d79ce31fdb3877b9dfd1fb621
+  version: 39182e507379eac63111916767006383899b0827
   scm: git
 
 - name: infra-role-wireguard
@@ -81,17 +81,12 @@
 
 - name: kibana
   src: git@github.com:status-im/infra-role-kibana.git
-  version: cb2cbb374199f5b2b627cc3d2bc9fb325bca82c1
+  version: c996858afae7effa7984403917827e79c732b957
   scm: git
 
 - name: elasticsearch
   src: git@github.com:status-im/infra-role-elasticsearch.git
-  version: f38d712b12e205d245cc692b6e99049acaf9401e
-  scm: git
-
-- name: elasticsearch-hq
-  src: git@github.com:status-im/infra-role-elasticsearch-hq.git
-  version: a92df1ac36c9a8e86fabefb54e24fe33d572ce10
+  version: f7391551f8d834731d8ece3eec91a2075d093973
   scm: git
 
 - name: elasticsearch-lb