Commit d02432e1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Instala plugin search-guard y configura deploy

parent 3f114b2a

.gitlab-ci.yml

+16 −4
Original line number Diff line number Diff line
@@ -77,12 +77,15 @@ deploy-supporting-branch-develop: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    ELASTICSEARCH_URL: ${DEV_ELASTICSEARCH_URL}

    ELASTICSEARCH_USERNAME: ${DEV_ELASTICSEARCH_USERNAME}

    ELASTICSEARCH_PASSWORD: ${DEV_ELASTICSEARCH_PASSWORD}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

  script:

    - >

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

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}

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

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

  environment:

    name: dev

    url: https://kibana.${DEV_PUBLIC_HOSTNAME}
@@ -99,12 +102,15 @@ deploy-stable-branch-develop: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    ELASTICSEARCH_URL: ${DEV_ELASTICSEARCH_URL}

    ELASTICSEARCH_USERNAME: ${DEV_ELASTICSEARCH_USERNAME}

    ELASTICSEARCH_PASSWORD: ${DEV_ELASTICSEARCH_PASSWORD}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

  script:

    - >

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

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}

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

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

  environment:

    name: dev

    url: https://kibana.${DEV_PUBLIC_HOSTNAME}
@@ -119,12 +125,15 @@ deploy-supporting-branch-production: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    ELASTICSEARCH_URL: ${PRO_ELASTICSEARCH_URL}

    ELASTICSEARCH_USERNAME: ${PRO_ELASTICSEARCH_USERNAME}

    ELASTICSEARCH_PASSWORD: ${PRO_ELASTICSEARCH_PASSWORD}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${PRO_UI_AUTH}

  script:

    - >

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

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}

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

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

  environment:

    name: pro

    url: https://kibana.${PRO_PUBLIC_HOSTNAME}
@@ -141,12 +150,15 @@ deploy-stable-branch-production: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    ELASTICSEARCH_URL: ${PRO_ELASTICSEARCH_URL}

    ELASTICSEARCH_USERNAME: ${PRO_ELASTICSEARCH_USERNAME}

    ELASTICSEARCH_PASSWORD: ${PRO_ELASTICSEARCH_PASSWORD}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${PRO_UI_AUTH}

  script:

    - >

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

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}

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

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

  environment:

    name: pro

    url: https://kibana.${PRO_PUBLIC_HOSTNAME}

Dockerfile

+6 −2
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_TAG="6.5.0"

ARG PARENT_IMAGE_TAG="6.5.1"



FROM docker.elastic.co/kibana/kibana:${PARENT_IMAGE_TAG}



LABEL maintainer="info@redmic.es"



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

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



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



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



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

deploy/.env

+2 −0
Original line number Diff line number Diff line 
ELASTICSEARCH_URL=http://elasticsearch:9200

ELASTICSEARCH_USERNAME=user

ELASTICSEARCH_PASSWORD=pass

PORT=5601

deploy/docker-compose.tmpl.yml

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ services: 
    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - SERVER_NAME=kibana.${PUBLIC_HOSTNAME}

      - XPACK_SECURITY_ENABLED=false

      - XPACK_SPACES_ENABLED=false

      - ELASTICSEARCH_URL

      - ELASTICSEARCH_USERNAME

      - ELASTICSEARCH_PASSWORD

    networks:

      - elastic-net

      - traefik-net
@@ -13,7 +17,7 @@ services: 
      - source: logtrail-json

        target: /usr/share/kibana/plugins/logtrail/logtrail.json

    healthcheck:

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

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

      interval: 30s

      timeout: 10s

      retries: 3