Commit 8af4ddbb authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/log/fluentd!12
parents 8175a113 544020fc

.gitignore

deleted100644 → 0
+0 −0

Empty file deleted.

.gitlab-ci.yml

+7 −8
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ include: 
  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-custom-image.yml'



stages:

  - package
@@ -12,13 +15,9 @@ stages: 
  - deploy



variables:

  FLUENTD_VERSION: '1.3'

  ES_PLUGIN_VERSION: '3.5.0'

  DOCKER_BUILD_ARGS: --build-arg FLUENTD_VERSION=${FLUENTD_VERSION} --build-arg ES_PLUGIN_VERSION=${ES_PLUGIN_VERSION}

  STACK: log

  PROJECT_PARENT_NAME: log



.deploy:

  script:

    - >

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

      ES_PASS=${ES_PASS}
 
  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

deploy/.env

+2 −0
Original line number Diff line number Diff line
@@ -2,3 +2,5 @@ LOG_LEVEL=warn 
ES_HOSTS=es-1:9200,es-2:9200,es-3:9200

ES_USER=user

ES_PASS=pass

FLUENTD_VERSION=1.3

ES_PLUGIN_VERSION=3.5.0

deploy/docker-compose.tmpl.yml

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


services:

  fluentd:

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

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/log/fluentd}:${IMAGE_TAG:-latest}

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        FLUENTD_VERSION:

        ES_PLUGIN_VERSION:

    environment:

      LOG_LEVEL:

      ES_HOSTS:

      ES_USER:

      ES_PASS:

    networks:

      - log-net

      - elastic-net

      log-net:

      elastic-net:

    configs:

      - source: fluent-conf

        target: /fluentd/etc/fluent.conf
@@ -18,26 +24,26 @@ services: 
      driver: json-file

    deploy:

      mode: replicated

      replicas: 1

      replicas: ${REPLICAS:-1}

      restart_policy:

        delay: 10s

        window: 1m

        delay: ${RESTART_DELAY:-10s}

      resources:

        limits:

          cpus: '1'

          memory: 256M

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

        reservations:

          cpus: '0.1'

          memory: 128M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}



networks:

  log-net:

    name: ${LOG_NET_NAME:-log-net}

    driver: overlay

    driver: ${LOG_NET_DRIVER:-overlay}

    attachable: ${LOG_NET_ATTACHABLE:-true}



  elastic-net:

    name: ${ELASTIC_NET_NAME:-elastic6-net}

    driver: ${ELASTIC_NET_DRIVER:-overlay}

    external: true



configs: