Commit 5333c86a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza configuraciones de despliegue

See merge request redmic-project/elastic/kibana!1
parents 32c82d08 bdc99f66

.env

0 → 100644
+3 −0
Original line number Diff line number Diff line 
PORT=5601

ELASTICSEARCH_URL=es-1

ELASTICSEARCH_PORT=9200

.gitlab-ci.yml

0 → 100644
+56 −0
Original line number Diff line number Diff line 
image: docker:stable



stages:

  - deploy



variables:

  IMAGE_NAME: docker.elastic.co/kibana/kibana

  IMAGE_TAG: '5.6.5'



deploy-dev:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: elastic

    SERVICES_TO_CHECK: elastic_${CI_PROJECT_NAME}

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

    ELASTIC_USER_PASS: ${DEV_ELASTIC_ADMIN_PASS}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      ELASTIC_USER_PASS=${ELASTIC_USER_PASS} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://kibana.${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

  when: manual



deploy-pro:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: elastic

    SERVICES_TO_CHECK: elastic_${CI_PROJECT_NAME}

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

    ELASTIC_USER_PASS: ${PRO_ELASTIC_ADMIN_PASS}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      ELASTIC_USER_PASS=${ELASTIC_USER_PASS} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://kibana.${PRO_PUBLIC_HOSTNAME}

  only:

    - master

  when: manual

docker-compose.dev.yml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  kibana:

    ports:

      - target: ${PORT}

        published: ${PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: Host:kibana.${PUBLIC_HOSTNAME}

        traefik.backend: kibana

      restart_policy:

        delay: 1m

        window: 2m

      resources:

        limits:

          cpus: '0.5'

          memory: 1G

        reservations:

          memory: 820M

docker-compose.prod.yml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  kibana:

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: Host:kibana.${PUBLIC_HOSTNAME}

        traefik.backend: kibana

      placement:

        constraints:

          - node.role == worker

      restart_policy:

        delay: 1m

        window: 2m

      resources:

        limits:

          cpus: '0.5'

          memory: 1G

        reservations:

          memory: 820M

docker-compose.tmpl.yml

+11 −8
Original line number Diff line number Diff line
@@ -2,15 +2,18 @@ version: '3.5' 


services:

  kibana:

    image: docker.elastic.co/kibana/kibana:5.6.5

    ports:

      - 5601:5601



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

    environment:

      SERVER_NAME: kibana.redmic.net

      ELASTICSEARCH_URL: http://elasticsearch:9200

      ELASTICSEARCH_PASSWORD: ${DEV_ELASTIC_ADMIN_PASS}

      SERVER_NAME: kibana.${PUBLIC_HOSTNAME}

      ELASTICSEARCH_URL: http://${ELASTICSEARCH_URL}:${ELASTICSEARCH_PORT}

      ELASTICSEARCH_PASSWORD: "${ELASTIC_USER_PASS}"

    networks:

      - elastic-net

      - traefik-net



networks:

  elastic-net:

    external: true



  traefik-net:

    external: true