Commit 951c575d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/elastic/kibana!9
parents 03d55aaa 5ee8da1c

.gitmodules

+1 −1
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

	branch = 6.6

	ignore = dirty

Dockerfile

+5 −5
Original line number Diff line number Diff line 
ARG NODE_IMAGE_TAG="11-alpine"

ARG KIBANA_IMAGE_TAG="6.5.4"

ARG KIBANA_IMAGE_TAG="6.6.2"



FROM node:${NODE_IMAGE_TAG} AS npm-build



ARG BOWER_VERSION=1.8.8

ARG KIBANA_IMAGE_TAG=6.5.4

ARG BOWER_VERSION="1.8.8"

ARG KIBANA_IMAGE_TAG



COPY modules/ /modules/
@@ -16,8 +16,8 @@ RUN npm install -g bower@${BOWER_VERSION} && \ 


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



ARG SEARCH_GUARD_URL=https://releases.floragunn.com/search-guard-kibana-plugin-6/6.5.4-19.0/search-guard-kibana-plugin-6-6.5.4-19.0.zip

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

ARG SEARCH_GUARD_URL="https://releases.floragunn.com/search-guard-kibana-plugin-6/6.6.2-19.0/search-guard-kibana-plugin-6-6.6.2-19.0.zip"

ARG LOGTRAIL_URL="https://github.com/sivasamyk/logtrail/releases/download/v0.1.31/logtrail-6.6.2-0.1.31.zip"



LABEL maintainer="info@redmic.es"

deploy/.env

+3 −3
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ VEGA_ENABLEEXTERNALURLS=true 
PORT=5601

NODE_IMAGE_TAG=11-alpine

BOWER_VERSION=1.8.8

KIBANA_IMAGE_TAG=6.5.4

SEARCH_GUARD_URL=https://releases.floragunn.com/search-guard-kibana-plugin-6/6.5.4-19.0/search-guard-kibana-plugin-6-6.5.4-19.0.zip

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

SEARCH_GUARD_URL=https://releases.floragunn.com/search-guard-kibana-plugin-6/6.6.2-19.0/search-guard-kibana-plugin-6-6.6.2-19.0.zip

LOGTRAIL_URL=https://github.com/sivasamyk/logtrail/releases/download/v0.1.31/logtrail-6.6.2-0.1.31.zip

kibana-time-plugin @ d398e581

Compare d6dcc812 to d398e581
Original line number Diff line number Diff line 
Subproject commit d6dcc812c4b7ab453ec67fa2f4cec398e37c382a
 
Subproject commit d398e58168f5558bc428f3c3d2ec5aa55d1a80bd