[PATCH compass-ci 1/2] container/kibana: upgrade and addition

31 Mar 2021

1. upgrade from 7.6.2 to 7.11.1
2. add a new kibana for data.
   one display log and one display data
3. delete logtrail plugin
   because it don't support in new kibana version

Signed-off-by: Wu Zhende <wuzhende666@163.com>
---
 container/kibana-logging/Dockerfile    | 12 ++++++++
 container/kibana-logging/build         | 16 ++++++++++
 container/kibana-logging/start         | 31 +++++++++++++++++++
 container/kibana-logging/start-depends |  1 +
 container/kibana/Dockerfile            | 10 -------
 container/kibana/build                 |  8 ++---
 container/kibana/logtrail.json         | 41 --------------------------
 container/kibana/start                 | 14 ++++-----
 container/kibana/start-depends         |  2 +-
 9 files changed, 72 insertions(+), 63 deletions(-)
 create mode 100644 container/kibana-logging/Dockerfile
 create mode 100755 container/kibana-logging/build
 create mode 100755 container/kibana-logging/start
 create mode 100755 container/kibana-logging/start-depends
 delete mode 100644 container/kibana/logtrail.json

diff --git a/container/kibana-logging/Dockerfile b/container/kibana-logging/Dockerfile
new file mode 100644
index 0000000..970eb5a
--- /dev/null
+++ b/container/kibana-logging/Dockerfile
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: MulanPSL-2.0+
+# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+
+ARG BASE_IMAGE
+
+FROM ${BASE_IMAGE}
+
+# docker image borrowed from hub.docker.com/r/gagara/kibana-oss-arm64
+
+MAINTAINER Wu Zhende <wuzhende666@163.com>
+
+RUN sed -i 's/server.host: "0"/server.host: "0.0.0.0"/' config/kibana.yml
diff --git a/container/kibana-logging/build b/container/kibana-logging/build
new file mode 100755
index 0000000..9c75aeb
--- /dev/null
+++ b/container/kibana-logging/build
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# SPDX-License-Identifier: MulanPSL-2.0+
+# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+# frozen_string_literal: true
+
+require_relative '../defconfig'
+
+docker_skip_rebuild "kibana:7.11.1"
+
+BASE_IMAGE_DICT = {
+  'aarch64' => 'jamesgarside/kibana:7.11.1',
+  'x86_64' => 'kibana:7.11.1' }.freeze
+
+BASE_IMAGE = BASE_IMAGE_DICT[%x(arch).chomp]
+
+system "docker build -t kibana:7.11.1 --build-arg BASE_IMAGE=#{BASE_IMAGE} ."
diff --git a/container/kibana-logging/start b/container/kibana-logging/start
new file mode 100755
index 0000000..f2169a6
--- /dev/null
+++ b/container/kibana-logging/start
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# SPDX-License-Identifier: MulanPSL-2.0+
+# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+# frozen_string_literal: true
+
+require 'set'
+require_relative '../defconfig.rb'
+
+names = Set.new %w[
+  LOGGING_ES_HOST
+  LOGGING_ES_PORT
+]
+
+defaults = relevant_defaults(names)
+LOGGING_ES_HOST = defaults['LOGGING_ES_HOST'] || '172.17.0.1'
+LOGGING_ES_PORT = defaults['LOGGING_ES_PORT'] || '9202'
+
+docker_rm 'kibana-logging'
+
+cmd = %W[
+  docker run
+  --restart=always
+  --name kibana-logging
+  -v /etc/localtime:/etc/localtime:ro
+  -d
+  -e ELASTICSEARCH_HOSTS=http://#{LOGGING_ES_HOST}:#{LOGGING_ES_PORT}
+  -p 20000:5601
+  kibana:7.11.1
+]
+
+system(*cmd)
diff --git a/container/kibana-logging/start-depends b/container/kibana-logging/start-depends
new file mode 100755
index 0000000..66c1996
--- /dev/null
+++ b/container/kibana-logging/start-depends
@@ -0,0 +1 @@
+logging-es
diff --git a/container/kibana/Dockerfile b/container/kibana/Dockerfile
index 60b889d..970eb5a 100644
--- a/container/kibana/Dockerfile
+++ b/container/kibana/Dockerfile
@@ -10,13 +10,3 @@ FROM ${BASE_IMAGE}
 MAINTAINER Wu Zhende <wuzhende666@163.com>
 
 RUN sed -i 's/server.host: "0"/server.host: "0.0.0.0"/' config/kibana.yml
-
-USER root
-RUN yum -y install wget \
-    && wget https://github.com/sivasamyk/logtrail/releases/download/v0.1.31/logtrail-7.6... -O /logtrail-7.6.2-0.1.31.zip
-
-USER 1090
-RUN ./bin/kibana-plugin install file:///logtrail-7.6.2-0.1.31.zip \
-    && rm -rf /tmp/logtrail-7.6.2-0.1.31.zip
-
-COPY --chown=1090:1090 logtrail.json /usr/share/kibana/plugins/logtrail/logtrail.json
diff --git a/container/kibana/build b/container/kibana/build
index 9a1fb6d..9c75aeb 100755
--- a/container/kibana/build
+++ b/container/kibana/build
@@ -5,12 +5,12 @@
 
 require_relative '../defconfig'
 
-docker_skip_rebuild "kibana:7.6.2"
+docker_skip_rebuild "kibana:7.11.1"
 
 BASE_IMAGE_DICT = {
-  'aarch64' => 'gagara/kibana-oss-arm64:7.6.2',
-  'x86_64' => 'kibana:7.6.2' }.freeze
+  'aarch64' => 'jamesgarside/kibana:7.11.1',
+  'x86_64' => 'kibana:7.11.1' }.freeze
 
 BASE_IMAGE = BASE_IMAGE_DICT[%x(arch).chomp]
 
-system "docker build -t kibana:7.6.2 --build-arg BASE_IMAGE=#{BASE_IMAGE} ."
+system "docker build -t kibana:7.11.1 --build-arg BASE_IMAGE=#{BASE_IMAGE} ."
diff --git a/container/kibana/logtrail.json b/container/kibana/logtrail.json
deleted file mode 100644
index c63f2ac..0000000
--- a/container/kibana/logtrail.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "version": 2,
-    "index_patterns": [{
-        "es": {
-            "default_index": "*",
-            "allow_url_parameter": false,
-            "timezone": "CST"
-        },
-        "tail_interval_in_seconds": 10,
-        "es_index_time_offset_in_seconds": 0,
-        "display_timezone": "CST",
-        "display_timestamp_format": "YYYY MMM DD HH:mm:ss",
-        "max_buckets": 500,
-        "nested_objects": false,
-        "default_time_range_in_days": 30,
-        "max_hosts": 100,
-        "max_events_to_keep_in_viewer": 10000,
-        "default_search": "",
-        "fields": {
-            "mapping": {
-		"timestamp": "time",
-		"display_timestamp" : "time",
-                "hostname": "container_name",
-                "program": "tags",
-                "message": "log"
-            },
-            "message_format": "{{{log}}}",
-            "keyword_suffix": "keyword"
-        },
-        "color_mapping": {
-            "field": "level",
-            "mapping": {
-                "ERROR": "#FF0000",
-                "WARN": "#FFEF96",
-                "DEBUG": "#B5E7A0",
-                "TRACE": "#CFE0E8",
-                "INFO": "#339999"
-            }
-        }
-    }]
-}
diff --git a/container/kibana/start b/container/kibana/start
index 26a4944..ac74ecc 100755
--- a/container/kibana/start
+++ b/container/kibana/start
@@ -7,13 +7,13 @@ require 'set'
 require_relative '../defconfig.rb'
 
 names = Set.new %w[
-  LOGGING_ES_HOST
-  LOGGING_ES_PORT
+  ES_HOST
+  ES_PORT
 ]
 
 defaults = relevant_defaults(names)
-LOGGING_ES_HOST = defaults['LOGGING_ES_HOST'] || '172.17.0.1'
-LOGGING_ES_PORT = defaults['LOGGING_ES_PORT'] || '9202'
+ES_HOST = defaults['ES_HOST'] || '172.17.0.1'
+ES_PORT = defaults['ES_PORT'] || '9200'
 
 docker_rm 'kibana'
 
@@ -23,9 +23,9 @@ cmd = %W[
   --name kibana
   -v /etc/localtime:/etc/localtime:ro
   -d
-  -e ELASTICSEARCH_HOSTS=http://#{LOGGING_ES_HOST}:#{LOGGING_ES_PORT}
-  -p 20000:5601
-  kibana:7.6.2
+  -e ELASTICSEARCH_HOSTS=http://#{ES_HOST}:#{ES_PORT}
+  -p 20014:5601
+  kibana:7.11.1
 ]
 
 system(*cmd)
diff --git a/container/kibana/start-depends b/container/kibana/start-depends
index 66c1996..8357fca 100755
--- a/container/kibana/start-depends
+++ b/container/kibana/start-depends
@@ -1 +1 @@
-logging-es
+es
-- 
2.23.0

    

Wu Zhende

tags

participants (1)