From e92ad707857526f6ba1217f754cb38ae2463fb17 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Thu, 12 Nov 2020 18:39:43 -0800 Subject: [PATCH] Upgrade Kibana to 7.10.0 Signed-off-by: Tyler Smalley --- Dockerfile | 8 ++++---- Jenkinsfile | 2 +- download.json | 6 +++--- scripts/kibana-docker | 16 ++++++++++------ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0aee5b2..03620ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,8 @@ RUN yum update --setopt=tsflags=nodocs -y && \ RUN mkdir /usr/share/kibana WORKDIR /usr/share/kibana -COPY --chown=1000:0 kibana-7.9.2-linux-x86_64.tar.gz . -RUN tar --strip-components=1 -zxf kibana-7.9.2-linux-x86_64.tar.gz +COPY --chown=1000:0 kibana-7.10.0-linux-x86_64.tar.gz . +RUN tar --strip-components=1 -zxf kibana-7.10.0-linux-x86_64.tar.gz # Ensure that group permissions are the same as user permissions. # This will help when relying on GID-0 to run Kibana, rather than UID-1000. # OpenShift does this, for example. @@ -31,7 +31,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} EXPOSE 5601 RUN yum update --setopt=tsflags=nodocs -y && \ - yum install -y fontconfig freetype shadow-utils && \ + yum install -y fontconfig freetype shadow-utils libnss3.so && \ yum clean all COPY LICENSE /licenses/elastic-kibana @@ -66,7 +66,7 @@ RUN find / -xdev -perm -4000 -exec chmod u-s {} + RUN groupadd --gid 1000 kibana && useradd --uid 1000 --gid 1000 --home-dir /usr/share/kibana --no-create-home kibana USER kibana -LABEL org.label-schema.schema-version="1.0" org.label-schema.vendor="Elastic" org.label-schema.name="kibana" org.label-schema.version="7.9.2" org.label-schema.url="https://www.elastic.co/products/kibana" org.label-schema.vcs-url="https://github.com/elastic/kibana" org.label-schema.license="Elastic License" license="Elastic License" +LABEL org.label-schema.schema-version="1.0" org.label-schema.vendor="Elastic" org.label-schema.name="kibana" org.label-schema.version="7.10.0" org.label-schema.url="https://www.elastic.co/products/kibana" org.label-schema.vcs-url="https://github.com/elastic/kibana" org.label-schema.license="Elastic License" license="Elastic License" ENTRYPOINT ["/usr/local/bin/dumb-init", "--"] diff --git a/Jenkinsfile b/Jenkinsfile index 1913f29..f60d67a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: '7.9.2') +dccscrPipeline(version: '7.10.0') diff --git a/download.json b/download.json index 7885611..4dc3748 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "resources": [ { - "url": "https://artifacts.elastic.co/downloads/kibana/kibana-7.9.2-linux-x86_64.tar.gz", - "filename": "kibana-7.9.2-linux-x86_64.tar.gz", + "url": "https://artifacts.elastic.co/downloads/kibana/kibana-7.10.0-linux-x86_64.tar.gz", + "filename": "kibana-7.10.0-linux-x86_64.tar.gz", "validation": { "type": "sha512", - "value": "79d7b836a93b496fa9dc58d3d2286ca6f6ad4d5c66558047a24841085b41c8beeae2a4f68a8883013b93e3036e029f76ebcb6e30080fc0b1979377b1f6d2b19a" + "value": "385fe5d875ba074e0931a1e9ebbac8e3d91d300ca478f589da06b01c68e4694c5953a538afd6c385bdccec0f0d3cda1a5dc39f1b56e41d584cdcab8fba466677" } }, { diff --git a/scripts/kibana-docker b/scripts/kibana-docker index b69fd8b..f8d5bd7 100755 --- a/scripts/kibana-docker +++ b/scripts/kibana-docker @@ -8,16 +8,18 @@ # # eg. Setting the environment variable: # -# ELASTICSEARCH_STARTUPTIMEOUT=60 +# ELASTICSEARCH_LOGQUERIES=true # # will cause Kibana to be invoked with: # -# --elasticsearch.startupTimeout=60 +# --elasticsearch.logQueries=true kibana_vars=( console.enabled console.proxyConfig console.proxyFilter + ops.cGroupOverrides.cpuPath + ops.cGroupOverrides.cpuAcctPath cpu.cgroup.path.override cpuacct.cgroup.path.override csp.rules @@ -28,7 +30,6 @@ kibana_vars=( elasticsearch.logQueries elasticsearch.password elasticsearch.pingTimeout - elasticsearch.preserveHost elasticsearch.requestHeadersWhitelist elasticsearch.requestTimeout elasticsearch.shardTimeout @@ -45,7 +46,6 @@ kibana_vars=( elasticsearch.ssl.truststore.path elasticsearch.ssl.truststore.password elasticsearch.ssl.verificationMode - elasticsearch.startupTimeout elasticsearch.username i18n.locale interpreter.enableInVisualize @@ -93,6 +93,7 @@ kibana_vars=( path.data pid.file regionmap + security.showInsecureClusterWarning server.basePath server.customResponseHeaders server.compression.enabled @@ -133,6 +134,7 @@ kibana_vars=( tilemap.url timelion.enabled vega.enableExternalUrls + xpack.actions.proxyUrl xpack.apm.enabled xpack.apm.serviceMapEnabled xpack.apm.ui.enabled @@ -159,6 +161,7 @@ kibana_vars=( xpack.code.security.gitHostWhitelist xpack.code.security.gitProtocolWhitelist xpack.encryptedSavedObjects.encryptionKey + xpack.encryptedSavedObjects.keyRotation.decryptionOnlyKeys xpack.graph.enabled xpack.graph.canEditDrillDownUrls xpack.graph.savePolicy @@ -235,10 +238,12 @@ kibana_vars=( xpack.security.enabled xpack.security.encryptionKey xpack.security.loginAssistanceMessage + xpack.security.sameSiteCookies xpack.security.secureCookies xpack.security.sessionTimeout xpack.security.session.idleTimeout xpack.security.session.lifespan + xpack.security.session.cleanupInterval xpack.security.loginAssistanceMessage xpack.security.loginHelp xpack.security.public.protocol @@ -283,5 +288,4 @@ umask 0002 # Therefore, we set this value here so that cgroup statistics are # available for the container this process will run in. -exec /usr/share/kibana/bin/kibana --cpu.cgroup.path.override=/ --cpuacct.cgroup.path.override=/ ${longopts} "$@" - +exec /usr/share/kibana/bin/kibana --ops.cGroupOverrides.cpuPath=/ --ops.cGroupOverrides.cpuAcctPath=/ ${longopts} "$@" \ No newline at end of file -- GitLab