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

Merge branch 'dev' into 'master' 

Separa nodos de elastic en servicios

See merge request redmic-project/elastic/elasticsearch!27
parents bcba4904 8dce371b

.gitlab-ci.yml

+4 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ deploy-dev: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    SERVICE: ${CI_PROJECT_NAME}-1

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -116,7 +116,7 @@ deploy-supporting-branch: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    SERVICE: ${CI_PROJECT_NAME}-1

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -149,7 +149,8 @@ deploy-pro: 
    STATUS_CHECK_DELAY: '60'

    STATUS_CHECK_INTERVAL: '10'

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    SERVICE: elastic

    SERVICES_TO_CHECK: elastic_${CI_PROJECT_NAME}-1 elastic_${CI_PROJECT_NAME}-2 elastic_${CI_PROJECT_NAME}-3

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

docker-compose.dev.yml

+3 −7
Original line number Diff line number Diff line 
version: '3.5'



services:

  elasticsearch:

    container_name: elasticsearch

  elasticsearch-1:

    container_name: elasticsearch-1

    restart: on-failure:3

    networks:

      elastic-net:

        aliases:

          - es-1

    ports:

      - ${PORT1}:${PORT1}

      - ${PORT2}:${PORT2}
@@ -21,5 +17,5 @@ services: 
        hard: -1



volumes:

  elasticsearch-vol:

  elasticsearch-1-vol:

    name: elasticsearch-vol

docker-compose.prod.yml

+55 −10
Original line number Diff line number Diff line 
version: '3.5'



services:

  elasticsearch:

    networks:

      elastic-net:

        aliases:

          - es-{{.Task.Slot}}

  elasticsearch-1:

    environment:

      - ES_CLUSTER_NAME=redmic

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

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['tasks.{{.Service.Name}}']

      - ES_NODE_NAME={{.Service.Name}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['${SERVICE}']

    deploy:

      mode: replicated

      replicas: 3

      replicas: 1

      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid == 1

      restart_policy:

        condition: on-failure

        max_attempts: 3



  elasticsearch-2:

    environment:

      - ES_CLUSTER_NAME=redmic

      - ES_NODE_NAME={{.Service.Name}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['${SERVICE}']

    deploy:

      mode: replicated

      replicas: 1

      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid == 2

      restart_policy:

        condition: on-failure

        max_attempts: 3



  elasticsearch-3:

    environment:

      - ES_CLUSTER_NAME=redmic

      - ES_NODE_NAME={{.Service.Name}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['${SERVICE}']

    deploy:

      mode: replicated

      replicas: 1

      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid == 3

      restart_policy:

        condition: on-failure

        max_attempts: 3



volumes:

  elasticsearch-vol:

    name: "elasticsearch-{{.Task.Slot}}-vol"

  elasticsearch-1-vol:

    name: "elasticsearch-1-vol"

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 25

      ebstype: gp2



  elasticsearch-2-vol:

    name: "elasticsearch-2-vol"

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 25

      ebstype: gp2



  elasticsearch-3-vol:

    name: "elasticsearch-3-vol"

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

docker-compose.tmpl.yml

+42 −2
Original line number Diff line number Diff line 
version: '3.5'



services:

  elasticsearch:

  elasticsearch-1:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    networks:

      elastic-net:

        aliases:

          - es-1

    volumes:

      - elasticsearch-1-vol:/usr/share/elasticsearch/data

    environment:

      - ES_BOOTSTRAP_MEMORY_LOCK=true

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

      - ES_PLUGINS

      - OLD_ELASTIC_ADMIN_PASS

      - ELASTIC_ADMIN_PASS

      - ELASTIC_USER

      - ELASTIC_USER_PASS

      - ELASTIC_USER_ROLE



  elasticsearch-2:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    networks:

      elastic-net:

        aliases:

          - es-2

    volumes:

      - elasticsearch-2-vol:/usr/share/elasticsearch/data

    environment:

      - ES_BOOTSTRAP_MEMORY_LOCK=true

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

      - ES_PLUGINS

      - OLD_ELASTIC_ADMIN_PASS

      - ELASTIC_ADMIN_PASS

      - ELASTIC_USER

      - ELASTIC_USER_PASS

      - ELASTIC_USER_ROLE



  elasticsearch-3:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    networks:

      elastic-net:

        aliases:

          - es-3

    volumes:

      - elasticsearch-vol:/usr/share/elasticsearch/data

      - elasticsearch-3-vol:/usr/share/elasticsearch/data

    environment:

      - ES_BOOTSTRAP_MEMORY_LOCK=true

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