diff --git a/Dockerfile b/Dockerfile index 820174c9d32a92f54e593d05dcb55889bad16512..182bd5cdf88ed3e23c4cbdf7e688ee4014ee4115 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,15 @@ 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 --setopt=tsflags=nodocs -y && yum install -y 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 +60,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 d71bca6c65728b96c3f29ee206289153c59e34a1..eb27f6c3a970c24c581ec620b43a1ab16d63d491 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 0348de2a5b9608afcd2ae365ea9955f458d5a670..026682977ee9b524c6d2fef553e98005ed43ac5e 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 ff691868e7ca1cfcc918ad5af597e7bc73260525..bed04a3eafd281bdf87bedfaaff0514571e4659e 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 448501fa256f12064f6d1094d42e215a39d3051f..bd41a3013aff292081eecb5a5b52c5b9e346af08 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 24082a3aca8b4994e934793a1720053429e6b1a2..3712809650b42db605e0155b17038feee0a15a2a 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" } }, {