Commit 2f569e91 authored by Noel Alonso's avatar Noel Alonso
Browse files

Adapta CI a nueva versión de plantillas 

Importa nueva plantilla para la creación de imagen propia
Añade variables a deploy para poder modificar los valores desde fuera
Añade valor por defecto de image_name
Traslada docker build a docker-compose.yml
Pasa nuevas variables para la construcción
parent a6767909

.gitlab-ci.yml

+8 −10
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,20 +15,15 @@ stages: 
  - deploy



variables:

  NODE_IMAGE_TAG: '11-alpine'

  KIBANA_IMAGE_TAG: '6.5.4'

  DOCKER_BUILD_ARGS: --build-arg NODE_IMAGE_TAG=${NODE_IMAGE_TAG} --build-arg KIBANA_IMAGE_TAG=${KIBANA_IMAGE_TAG}

  STACK: elastic

  PROJECT_PARENT_NAME: elastic



.docker-operations-build:

.docker-operations:

  variables:

    GIT_SUBMODULE_STRATEGY: normal



.deploy:

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_USERNAME=${ELASTICSEARCH_USERNAME}

      ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

  environment:

    url: https://${CI_PROJECT_NAME}.${PUBLIC_HOSTNAME}

Dockerfile

+0 −4
Original line number Diff line number Diff line
@@ -17,12 +17,8 @@ FROM docker.elastic.co/kibana/kibana:${KIBANA_IMAGE_TAG} 


LABEL maintainer="info@redmic.es"



ARG SEARCH_GUARD_URL="https://search.maven.org/remotecontent?filepath=com/floragunn/search-guard-kibana-plugin/6.5.4-17/search-guard-kibana-plugin-6.5.4-17.zip"



RUN ./bin/kibana-plugin install --no-optimize ${SEARCH_GUARD_URL}



ARG LOGTRAIL_URL="https://github.com/sivasamyk/logtrail/releases/download/v0.1.30/logtrail-6.5.4-0.1.30.zip"



RUN ./bin/kibana-plugin install --no-optimize ${LOGTRAIL_URL}



COPY --from=npm-build /modules/ plugins/

deploy/.env

+14 −0
Original line number Diff line number Diff line 
TIMELION_ENABLED=true

XPACK_SECURITY_ENABLED=false

XPACK_CANVAS_ENABLED=true

XPACK_GRAPH_ENABLED=false

XPACK_ML_ENABLED=false

XPACK_APM_ENABLED=false

XPACK_INFRA_ENABLED=false

XPACK_LOGSTASH_ENABLED=false

XPACK_MONITORING_ENABLED=false

ELASTICSEARCH_URL=http://elasticsearch:9200

ELASTICSEARCH_USERNAME=user

ELASTICSEARCH_PASSWORD=pass

VEGA_ENABLEEXTERNALURLS=true

PORT=5601

NODE_IMAGE_TAG=11-alpine

KIBANA_IMAGE_TAG=6.5.4

SEARCH_GUARD_URL=https://search.maven.org/remotecontent?filepath=com/floragunn/search-guard-kibana-plugin/6.5.4-17/search-guard-kibana-plugin-6.5.4-17.zip

LOGTRAIL_URL=https://github.com/sivasamyk/logtrail/releases/download/v0.1.30/logtrail-6.5.4-0.1.30.zip

deploy/docker-compose.tmpl.yml

+37 −28
Original line number Diff line number Diff line
@@ -2,25 +2,33 @@ version: '3.5' 


services:

  kibana:

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

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

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        NODE_IMAGE_TAG:

        KIBANA_IMAGE_TAG:

        SEARCH_GUARD_URL:

        LOGTRAIL_URL:

    environment:

      - SERVER_NAME=kibana.${PUBLIC_HOSTNAME}

      - TIMELION_ENABLED=true

      - XPACK_SECURITY_ENABLED=false

      - XPACK_CANVAS_ENABLED=true

      - XPACK_GRAPH_ENABLED=false

      - XPACK_ML_ENABLED=false

      - XPACK_APM_ENABLED=false

      - XPACK_INFRA_ENABLED=false

      - XPACK_LOGSTASH_ENABLED=false

      - XPACK_MONITORING_ENABLED=false

      - ELASTICSEARCH_URL

      - ELASTICSEARCH_USERNAME

      - ELASTICSEARCH_PASSWORD

      - VEGA_ENABLEEXTERNALURLS=true

      SERVER_NAME: kibana.${PUBLIC_HOSTNAME}

      TIMELION_ENABLED:

      XPACK_SECURITY_ENABLED:

      XPACK_CANVAS_ENABLED:

      XPACK_GRAPH_ENABLED:

      XPACK_ML_ENABLED:

      XPACK_APM_ENABLED:

      XPACK_INFRA_ENABLED:

      XPACK_LOGSTASH_ENABLED:

      XPACK_MONITORING_ENABLED:

      ELASTICSEARCH_URL:

      ELASTICSEARCH_USERNAME:

      ELASTICSEARCH_PASSWORD:

      VEGA_ENABLEEXTERNALURLS:

    networks:

      - elastic-net

      - traefik-net

      elastic-net:

      traefik-net:

    configs:

      - source: logtrail-json

        target: /usr/share/kibana/plugins/logtrail/logtrail.json
@@ -28,36 +36,38 @@ services: 
        target: /usr/share/kibana/config/kibana.yml

    healthcheck:

      test: curl --silent http://localhost:${PORT}

      interval: 30s

      timeout: 1m

      retries: 3

      start_period: 2m

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-1m}

      retries: ${HEALTHCHECK_RETRIES:-10}

      start_period: ${HEALTHCHECK_START_PERIOD:-2m}

    logging:

      driver: json-file

    deploy:

      mode: replicated

      replicas: 1

      replicas: ${REPLICAS:-1}

      labels:

        traefik.frontend.rule: Host:kibana.${PUBLIC_HOSTNAME}

        traefik.backend: kibana

        traefik.port: '${PORT}'

      restart_policy:

        delay: 10s

        window: 2m

        delay: ${RESTART_DELAY:-10s}

      resources:

        limits:

          cpus: '1'

          memory: 3G

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-3G}

        reservations:

          memory: 512M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-512M}



networks:

  elastic-net:

    name: ${ELASTIC_NET_NAME:-elastic6-net}

    driver: ${ELASTIC_NET_DRIVER:-overlay}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    driver: ${TRAEFIK_NET_DRIVER:-overlay}

    external: true



configs:
@@ -68,4 +78,3 @@ configs: 
  kibana-yml:

    name: ${KIBANA_YML_NAME:-kibana-yml}

    file: ./config/kibana.yml