From 2937f7f465293d0b1dea9ff3e533057fb1010689 Mon Sep 17 00:00:00 2001 From: Nick Lang Date: Tue, 23 Jun 2020 13:17:47 -0600 Subject: [PATCH 1/3] Bump kibana to 7.8.0 --- Dockerfile | 6 +++--- Jenkinsfile | 2 +- README.md | 6 +++--- bin/kibana-docker | 35 ++++++++++++++++------------------- config/kibana.yml | 2 +- download.json | 6 +++--- 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/Dockerfile b/Dockerfile index 820174c..6ef686d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,12 @@ ARG BASE_TAG=8.2 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} EXPOSE 5601 -RUN yum update --setopt=tsflags=nodocs -y && yum install -y tar gzip fontconfig freetype shadow-utils && yum clean all +RUN yum update --disablerepo="*" --enablerepo="*ubi-8*" --setopt=tsflags=nodocs -y && yum install -y --disablerepo="*" --enablerepo="*ubi-8*" tar gzip fontconfig freetype shadow-utils && yum clean all RUN mkdir /usr/share/kibana WORKDIR /usr/share/kibana -ARG TARBALL=kibana-7.6.1-linux-x86_64.tar.gz +ARG TARBALL=kibana-7.8.0-linux-x86_64.tar.gz COPY --chown=1000:0 ${TARBALL} . @@ -57,7 +57,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.6.1" 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.8.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 d71bca6..eb27f6c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: '7.6.1') +dccscrPipeline(version: '7.8.0') diff --git a/README.md b/README.md index 0348de2..0266829 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ https://www.elastic.co/products/kibana. ### Installation instructions -Please follow the documentation on [running Kibana on Docker](https://www.elastic.co/guide/en/kibana/7.6/docker.html). +Please follow the documentation on [running Kibana on Docker](https://www.elastic.co/guide/en/kibana/7.8/docker.html). ### Where to file issues and PRs @@ -30,9 +30,9 @@ visiting [Elastic Community](https://www.elastic.co/community). This software is governed by the [Elastic -License](https://github.com/elastic/elasticsearch/blob/7.6/licenses/ELASTIC-LICENSE.txt), +License](https://github.com/elastic/elasticsearch/blob/7.8/licenses/ELASTIC-LICENSE.txt), and includes the full set of [free features](https://www.elastic.co/subscriptions). View the detailed release notes -[here](https://www.elastic.co/guide/en/elasticsearch/reference/7.6/es-release-notes.html). +[here](https://www.elastic.co/guide/en/elasticsearch/reference/7.8/es-release-notes.html). diff --git a/bin/kibana-docker b/bin/kibana-docker index ff69186..bed04a3 100755 --- a/bin/kibana-docker +++ b/bin/kibana-docker @@ -72,6 +72,22 @@ kibana_vars=( map.tilemap.options.minZoom map.tilemap.options.subdomains map.tilemap.url + monitoring.cluster_alerts.email_notifications.email_address + monitoring.enabled + monitoring.kibana.collection.enabled + monitoring.kibana.collection.interval + monitoring.ui.container.elasticsearch.enabled + monitoring.ui.container.logstash.enabled + monitoring.ui.elasticsearch.password + monitoring.ui.elasticsearch.pingTimeout + monitoring.ui.elasticsearch.hosts + monitoring.ui.elasticsearch.username + monitoring.ui.elasticsearch.logFetchCount + monitoring.ui.elasticsearch.ssl.certificateAuthorities + monitoring.ui.elasticsearch.ssl.verificationMode + monitoring.ui.enabled + monitoring.ui.max_bucket_size + monitoring.ui.min_interval_seconds newsfeed.enabled ops.interval path.data @@ -161,25 +177,6 @@ kibana_vars=( xpack.infra.sources.default.metricAlias xpack.license_management.enabled xpack.ml.enabled - xpack.monitoring.cluster_alerts.email_notifications.email_address - xpack.monitoring.elasticsearch.password - xpack.monitoring.elasticsearch.pingTimeout - xpack.monitoring.elasticsearch.hosts - xpack.monitoring.elasticsearch.username - xpack.monitoring.elasticsearch.logFetchCount - xpack.monitoring.elasticsearch.ssl.certificateAuthorities - xpack.monitoring.elasticsearch.ssl.verificationMode - xpack.monitoring.enabled - xpack.monitoring.kibana.collection.enabled - xpack.monitoring.kibana.collection.interval - xpack.monitoring.max_bucket_size - xpack.monitoring.min_interval_seconds - xpack.monitoring.node_resolver - xpack.monitoring.report_stats - xpack.monitoring.elasticsearch.pingTimeout - xpack.monitoring.ui.container.elasticsearch.enabled - xpack.monitoring.ui.container.logstash.enabled - xpack.monitoring.ui.enabled xpack.reporting.capture.browser.autoDownload xpack.reporting.capture.browser.chromium.disableSandbox xpack.reporting.capture.browser.chromium.inspect diff --git a/config/kibana.yml b/config/kibana.yml index 448501f..bd41a30 100644 --- a/config/kibana.yml +++ b/config/kibana.yml @@ -6,4 +6,4 @@ server.name: kibana server.host: "0" elasticsearch.hosts: [ "http://elasticsearch:9200" ] -xpack.monitoring.ui.container.elasticsearch.enabled: true +monitoring.ui.container.elasticsearch.enabled: true diff --git a/download.json b/download.json index 24082a3..3712809 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "resources": [ { - "url": "https://artifacts.elastic.co/downloads/kibana/kibana-7.6.1-linux-x86_64.tar.gz", - "filename": "kibana-7.6.1-linux-x86_64.tar.gz", + "url": "https://artifacts.elastic.co/downloads/kibana/kibana-7.8.0-linux-x86_64.tar.gz", + "filename": "kibana-7.8.0-linux-x86_64.tar.gz", "validation": { "type": "sha512", - "value": "9739e9521f699dcade3c3ae548fe1b9325de0d94856b7c1ff1426bd58a70db8eb7d25b128d8b8ade68f9797b873c827263ea7678aba48eb384394302606db688" + "value": "3c9ffbbfe56b66226ff62740cbe8eae83e43b07a1e3aec2ca845398c7d4418fd9c3cf67bebf5d9dd77c285468265c23c46080762cd90df070cd03ebe92b3ebef" } }, { -- GitLab From 7f90192ff0ac2ce7354fddc04bbd5dae60e06957 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 24 Jun 2020 18:16:26 +0000 Subject: [PATCH 2/3] Update Dockerfile --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6ef686d..2c4481e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,10 @@ ARG BASE_TAG=8.2 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} EXPOSE 5601 -RUN yum update --disablerepo="*" --enablerepo="*ubi-8*" --setopt=tsflags=nodocs -y && yum install -y --disablerepo="*" --enablerepo="*ubi-8*" tar gzip fontconfig freetype shadow-utils && yum clean all +#RUN yum update --disablerepo="*" --enablerepo="*ubi-8*" --setopt=tsflags=nodocs -y && yum install -y --disablerepo="*" --enablerepo="*ubi-8*" tar gzip fontconfig freetype shadow-utils && yum clean all + +RUN yum update --setopt=tsflags=nodocs -y && yum install -y --disablerepo="*" --enablerepo="*ubi-8*" tar gzip fontconfig freetype shadow-utils && yum clean all + RUN mkdir /usr/share/kibana WORKDIR /usr/share/kibana -- GitLab From 5d27706a80e2b8c94ff8fb9650d3c0b0644b701b Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Wed, 24 Jun 2020 18:39:47 +0000 Subject: [PATCH 3/3] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c4481e..182bd5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ EXPOSE 5601 #RUN yum update --disablerepo="*" --enablerepo="*ubi-8*" --setopt=tsflags=nodocs -y && yum install -y --disablerepo="*" --enablerepo="*ubi-8*" tar gzip fontconfig freetype shadow-utils && yum clean all -RUN yum update --setopt=tsflags=nodocs -y && yum install -y --disablerepo="*" --enablerepo="*ubi-8*" tar gzip fontconfig freetype shadow-utils && yum clean all +RUN yum update --setopt=tsflags=nodocs -y && yum install -y tar gzip fontconfig freetype shadow-utils && yum clean all RUN mkdir /usr/share/kibana -- GitLab