Commit 36d92c25 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Define ruta de configuración correctamente

See merge request redmic-project/log/fluent-bit!1
parents f092c9b0 2f45174e

.gitignore

0 → 100644
+0 −0

Empty file added.

.gitlab-ci.yml

0 → 100644
+74 −0
Original line number Diff line number Diff line 
stages:

  - deploy



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



variables:

  DOCKER_DRIVER: overlay2



services:

  - docker:dind



deploy-supporting-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: log

    SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

    IMAGE_TAG: latest

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG}

  environment:

    name: dev

  only:

    - branches

  except:

    - master

  when: manual



deploy-stable-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: log

    SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

    IMAGE_TAG: latest

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG}

  environment:

    name: dev

  only:

    - master

  when: manual



deploy-supporting-branch-production:

  stage: deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: log

    SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

    IMAGE_TAG: latest

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG}

  environment:

    name: pro

  only:

    - branches

  except:

    - master

  when: manual



deploy-stable-branch-production:

  stage: deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: log

    SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

    IMAGE_TAG: latest

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG}

  environment:

    name: pro

  only:

    - master

  when: manual

deploy/conf/fluent-bit.conf

0 → 100644
+15 −0
Original line number Diff line number Diff line 
[SERVICE]

	Flush 5

	Daemon off

	Log_Level debug



[INPUT]

	Name forward

	Listen 0.0.0.0

	Port 24224



[OUTPUT]

	Name forward

	Match *

	Host fluentd

	Port 24224

deploy/docker-compose.yml

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



services:

  fluent-bit:

    image: fluent/fluent-bit:${IMAGE_TAG:-latest}

    networks:

      - log-net

    ports:

      - target: 24224

        published: 24224

        mode: host

    configs:

      - source: fluent-bit-conf

        target: /fluent-bit/etc/fluent-bit.conf

    logging:

      driver: json-file

    deploy:

      mode: global

      restart_policy:

        delay: 5s

        window: 30s

      resources:

        limits:

          cpus: '0.1'

          memory: 64M

        reservations:

          memory: 52M



networks:

  log-net:

    name: log-net

    driver: overlay

    attachable: true



configs:

  fluent-bit-conf:

    file: ./conf/fluent-bit.conf