Commit 9abffe7c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Desecha introducción de UI, irá por libre

parent 77e3a9c0

.gitlab-ci.yml

+4 −8
Original line number Diff line number Diff line
@@ -85,11 +85,10 @@ 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} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      ES_PASS=${ES_PASS}

  environment:

    name: dev

  only:
@@ -110,11 +109,10 @@ 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} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      ES_PASS=${ES_PASS}

  environment:

    name: dev

  only:
@@ -133,11 +131,10 @@ 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} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      ES_PASS=${ES_PASS}

  environment:

    name: pro

  only:
@@ -158,11 +155,10 @@ 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} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      ES_PASS=${ES_PASS}

  environment:

    name: pro

  only:

Dockerfile

+2 −7
Original line number Diff line number Diff line
@@ -5,15 +5,10 @@ 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 --no-cache --virtual .build-deps \

		zlib-dev \

		sudo \

		build-base \

		ruby-dev && \

	sudo gem install \

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

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

	sudo gem sources --clear-all && \

	gem install --no-document fluent-plugin-elasticsearch:${ES_PLUGIN_VERSION} && \

	gem sources --clear-all && \

	apk del .build-deps

deploy/.env

+0 −1
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

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

          - fluentd

      elastic-net:

      traefik-net:

    secrets:

      - source: fluent-conf

        target: /fluentd/etc/fluent.conf
@@ -21,11 +20,6 @@ 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
@@ -45,9 +39,6 @@ networks: 
  elastic-net:

    external: true



  traefik-net:

    external: true



secrets:

  fluent-conf:

    file: ./conf/fluent.conf