Commit 73289c31 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Simplifica búsqueda de nodos y limpia código

See merge request redmic-project/elastic/elasticsearch!13
parents b1553334 bb835f68

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ deploy-pro: 
  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

    STATUS_CHECK_DELAY: '120'

    STATUS_CHECK_DELAY: '60'

    STATUS_CHECK_INTERVAL: '20'

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: elastic

Dockerfile

+1 −3
Original line number Diff line number Diff line
@@ -10,10 +10,8 @@ ENV ES_CLUSTER_NAME="clustername" \ 
	ES_NODE_INGEST="true" \

	ES_BOOTSTRAP_MEMORY_LOCK="true" \

	ES_INDICES_QUERY_BOOL_MAX_CLAUSE_COUNT=30000 \

	ES_NETWORK_HOST="0.0.0.0" \

	ES_NETWORK_BIND_HOST="0.0.0.0" \

	ES_NETWORK_PUBLISH_HOST="_eth0_" \

	ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=2 \

	ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1 \

	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
@@ -14,6 +14,7 @@ services: 
    environment:

      - ES_CLUSTER_NAME=elasticsearch_dev

      - ES_NODE_NAME=node-1

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=elasticsearch

    ulimits:

      memlock:

        soft: -1

docker-compose.prod.yml

+1 −4
Original line number Diff line number Diff line
@@ -7,15 +7,12 @@ services: 
        aliases:

          - es-{{.Task.Slot}}

    environment:

      - SWARM_MODE=true

      - DISCOVERY_DELAY=90

      - SERVICE_NAME={{.Service.Name}}

      - ES_CLUSTER_NAME=redmic

      - ES_NODE_NAME={{.Service.Name}}-{{.Task.Slot}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=tasks.{{.Service.Name}}

    deploy:

      mode: replicated

      replicas: 3

      endpoint_mode: dnsrr

      placement:

        constraints:

          - node.role == worker

docker-compose.tmpl.yml

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

      - ES_BOOTSTRAP_MEMORY_LOCK=true

      - ES_JAVA_OPTS=-Xms2g -Xmx2g -Djava.security.policy=file:///usr/share/elasticsearch/config/grovy-classes_whitelist.policy

      - ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1

      - ES_PLUGINS

      - OLD_ELASTIC_ADMIN_PASS

      - ELASTIC_ADMIN_PASS