Commit cf6f775e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Añade interfaz de usuario para acceder a los logs

parent 9b51c301

.gitlab-ci.yml

+8 −4
Original line number Diff line number Diff line
@@ -85,10 +85,11 @@ deploy-supporting-branch-develop: 
    ES_HOSTS: ${DEV_ES_HOSTS}

    ES_USER: ${DEV_ES_USER}

    ES_PASS: ${DEV_ES_PASS}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

      ES_PASS=${ES_PASS} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

  only:
@@ -109,10 +110,11 @@ deploy-stable-branch-develop: 
    ES_HOSTS: ${DEV_ES_HOSTS}

    ES_USER: ${DEV_ES_USER}

    ES_PASS: ${DEV_ES_PASS}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

      ES_PASS=${ES_PASS} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

  only:
@@ -131,10 +133,11 @@ deploy-supporting-branch-production: 
    ES_HOSTS: ${PRO_ES_HOSTS}

    ES_USER: ${PRO_ES_USER}

    ES_PASS: ${PRO_ES_PASS}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

      ES_PASS=${ES_PASS} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

  only:
@@ -155,10 +158,11 @@ deploy-stable-branch-production: 
    ES_HOSTS: ${PRO_ES_HOSTS}

    ES_USER: ${PRO_ES_USER}

    ES_PASS: ${PRO_ES_PASS}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

      ES_PASS=${ES_PASS} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

  only:

Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -5,11 +5,13 @@ FROM fluent/fluentd:v${FLUENTD_VERSION} 
LABEL maintainer="info@redmic.es"



ARG ES_PLUGIN_VERSION=2.12.1

ARG UI_VERSION=1.2.1



RUN apk add --update --virtual .build-deps \

	sudo build-base ruby-dev && \

	sudo gem install \

		fluent-plugin-elasticsearch --no-rdoc --no-ri --version ${ES_PLUGIN_VERSION} && \

		fluent-plugin-elasticsearch --no-document --version ${ES_PLUGIN_VERSION} \

		fluentd-ui --no-document --version ${UI_VERSION} && \

	sudo gem sources --clear-all && \

	apk del .build-deps && \

	rm -rf \

deploy/.env

+1 −0
Original line number Diff line number Diff line 
ES_HOSTS=es-1:9200,es-2:9200

ES_USER=elastic_user

ES_PASS=changeme

UI_SUBDOMAIN=fluentd

deploy/docker-compose.yml

+9 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ services: 
        aliases:

          - fluentd

      elastic-net:

      traefik-net:

    secrets:

      - source: fluent-conf

        target: /fluentd/etc/fluent.conf
@@ -20,6 +21,11 @@ services: 
    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.docker.network: traefik-net

        traefik.frontend.rule: "Host:${UI_SUBDOMAIN}.${PUBLIC_HOSTNAME}"

        traefik.backend: fluentd

        traefik.port: "9292"

      restart_policy:

        delay: 10s

        window: 1m
@@ -39,6 +45,9 @@ networks: 
  elastic-net:

    external: true



  traefik-net:

    external: true



secrets:

  fluent-conf:

    file: ./conf/fluent.conf