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

Merge branch 'feature-search-guard' into 'feature-v6.5.x' 

Feature search guard

See merge request redmic-project/elastic/kibana!2
parents 3f114b2a 93170765

.dockerignore

+1 −0
Original line number Diff line number Diff line 
*

!modules

.gitlab-ci.yml

+32 −14
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ image: docker:stable 


variables:

  DOCKER_DRIVER: overlay2

  NODE_IMAGE_TAG: '11-alpine'

  KIBANA_IMAGE_TAG: '6.5.4'

  STACK: elastic

  SERVICES_TO_CHECK: elastic_${CI_PROJECT_NAME}

  IMAGE_NAME: ${CI_REGISTRY_IMAGE}
@@ -17,6 +19,8 @@ services: 


docker-build-commit-non-master-branches:

  stage: package

  variables:

    GIT_SUBMODULE_STRATEGY: normal

  tags:

    - oagdev

  only:
@@ -25,18 +29,24 @@ docker-build-commit-non-master-branches: 
    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - >

      docker build --build-arg NODE_IMAGE_TAG=${NODE_IMAGE_TAG} --build-arg KIBANA_IMAGE_TAG=${KIBANA_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-commit-master-branch:

  stage: package

  variables:

    GIT_SUBMODULE_STRATEGY: normal

  tags:

    - oagdev

  only:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - >

      docker build --build-arg NODE_IMAGE_TAG=${NODE_IMAGE_TAG} --build-arg KIBANA_IMAGE_TAG=${KIBANA_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-tag-already-built-image:
@@ -72,17 +82,19 @@ container-scanning: 


deploy-supporting-branch-develop:

  stage: deploy

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

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    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}

  environment:

    name: dev

    url: https://kibana.${DEV_PUBLIC_HOSTNAME}
@@ -94,17 +106,19 @@ deploy-supporting-branch-develop: 


deploy-stable-branch-develop:

  stage: deploy

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

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    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}

  environment:

    name: dev

    url: https://kibana.${DEV_PUBLIC_HOSTNAME}
@@ -114,17 +128,19 @@ deploy-stable-branch-develop: 


deploy-supporting-branch-production:

  stage: deploy

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

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    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}

  environment:

    name: pro

    url: https://kibana.${PRO_PUBLIC_HOSTNAME}
@@ -136,17 +152,19 @@ deploy-supporting-branch-production: 


deploy-stable-branch-production:

  stage: deploy

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

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    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}

  environment:

    name: pro

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

.gitmodules

0 → 100644
+5 −0
Original line number Diff line number Diff line 
[submodule "modules/kibana-time-plugin"]

	path = modules/kibana-time-plugin

	url = https://github.com/nreese/kibana-time-plugin.git

	branch = master

	ignore = dirty

Dockerfile

+23 −4
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_TAG="6.5.0"

ARG NODE_IMAGE_TAG="11-alpine"

ARG KIBANA_IMAGE_TAG="6.5.4"



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

FROM node:${NODE_IMAGE_TAG} AS npm-build



ARG KIBANA_IMAGE_TAG



COPY modules/ /modules/



WORKDIR /modules/kibana-time-plugin



RUN npm install -g bower && \

	bower --allow-root install && \

	npm --no-git-tag-version version ${KIBANA_IMAGE_TAG}



FROM docker.elastic.co/kibana/kibana:${KIBANA_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.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}



RUN ./bin/kibana-plugin install ${LOGTRAIL_URL}
 
COPY --from=npm-build /modules/ plugins/

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