Commit 2a72ac2e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza detalles de CI y deploy, nombra config

See merge request redmic-project/log/fluent-bit!2
parents 36d92c25 80620257

.gitlab-ci.yml

+3 −12
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest 


variables:

  DOCKER_DRIVER: overlay2

  STACK: log

  SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

  IMAGE_TAG: latest



services:

  - docker:dind
@@ -13,9 +16,6 @@ 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:
@@ -30,9 +30,6 @@ 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:
@@ -45,9 +42,6 @@ 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:
@@ -62,9 +56,6 @@ 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:

deploy/.env

0 → 100644
+1 −0
Original line number Diff line number Diff line 
PORT=24224

deploy/conf/fluent-bit.conf

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

+6 −5
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ services: 
    networks:

      - log-net

    ports:

      - target: 24224

        published: 24224

      - target: ${PORT}

        published: ${PORT}

        mode: host

    configs:

      - source: fluent-bit-conf
@@ -24,14 +24,15 @@ services: 
          cpus: '0.1'

          memory: 64M

        reservations:

          memory: 52M

          memory: 16M



networks:

  log-net:

    name: log-net

    name: ${LOG_NET_NAME:-log-net}

    driver: overlay

    attachable: true

    attachable: ${LOG_NET_ATTACHABLE:-true}



configs:

  fluent-bit-conf:

    name: ${FLUENT_BIT_CONF_NAME:-fluent-bit-conf}

    file: ./conf/fluent-bit.conf