Commit 3b90d1cd authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Recupera opciones de red y check de salud

See merge request redmic-project/elastic/elasticsearch!30
parents f5e2abd1 1922eaaa

Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ ENV ES_CLUSTER_NAME="clustername" \ 
	ES_BOOTSTRAP_MEMORY_LOCK="true" \

	ES_INDICES_QUERY_BOOL_MAX_CLAUSE_COUNT=30000 \

	ES_NETWORK_HOST="0.0.0.0" \

	ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1 \

	ES_NETWORK_BIND_HOST="0.0.0.0" \

	ES_NETWORK_PUBLISH_HOST="_eth0_" \

	ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=2 \

	ES_PATH="/usr/share/elasticsearch"



ENV ES_DATA_PATH="${ES_PATH}/data"

docker-compose.dev.yml

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ services: 
    environment:

      - ES_CLUSTER_NAME=elasticsearch_dev

      - ES_NODE_NAME=node-1

      - ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=elasticsearch

    ulimits:

      memlock:

docker-compose.prod.yml

+0 −3
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ services: 
      - ES_CLUSTER_NAME=redmic

      - ES_NODE_NAME={{.Service.Name}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['elasticsearch-1', 'elasticsearch-2', 'elasticsearch-3']

      - ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=2

    deploy:

      mode: replicated

      replicas: 1
@@ -23,7 +22,6 @@ services: 
      - ES_CLUSTER_NAME=redmic

      - ES_NODE_NAME={{.Service.Name}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['elasticsearch-1', 'elasticsearch-2', 'elasticsearch-3']

      - ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=2

    deploy:

      mode: replicated

      replicas: 1
@@ -40,7 +38,6 @@ services: 
      - ES_CLUSTER_NAME=redmic

      - ES_NODE_NAME={{.Service.Name}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['elasticsearch-1', 'elasticsearch-2', 'elasticsearch-3']

      - ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=2

    deploy:

      mode: replicated

      replicas: 1

docker-compose.tmpl.yml

+18 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ services: 
      - ELASTIC_USER

      - ELASTIC_USER_PASS

      - ELASTIC_USER_ROLE

    healthcheck:

      test: curl -sSf -u "${ELASTIC_USER}:${ELASTIC_USER_PASS}" http://localhost:${PORT1}/_cluster/health > /dev/null

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m



  elasticsearch-2:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
@@ -36,6 +42,12 @@ services: 
      - ELASTIC_USER

      - ELASTIC_USER_PASS

      - ELASTIC_USER_ROLE

    healthcheck:

      test: curl -sSf -u "${ELASTIC_USER}:${ELASTIC_USER_PASS}" http://localhost:${PORT1}/_cluster/health > /dev/null

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m



  elasticsearch-3:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
@@ -54,6 +66,12 @@ services: 
      - ELASTIC_USER

      - ELASTIC_USER_PASS

      - ELASTIC_USER_ROLE

    healthcheck:

      test: curl -sSf -u "${ELASTIC_USER}:${ELASTIC_USER_PASS}" http://localhost:${PORT1}/_cluster/health > /dev/null

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m



networks:

  elastic-net: