From edd6ffd712d2b7e0c16618f72d75d52980e2f0f3 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Tue, 17 Dec 2019 12:43:12 -0600 Subject: [PATCH] Reduce osh-infra-logging job scope This updates the osh-infra-logging single node job to omit the fluentbit deployment step, as having multiple logging daemonsets deployed to the single node jobs is causing IO issues. Also, it was noted that the fluentd-deployment step was missing the overrides to move the fluentd-deployment release from utilizing a daemonset to a deployment. This resulted in 3 logging daemons being deployed to a single host Change-Id: I4a0c5550e6ea6a331aab0082a975f161e65704bf Signed-off-by: Steve Wilkerson --- .../fluentd-deployment.sh} | 19 ++++-- .../multinode/135-fluentd-deployment.sh | 62 +------------------ .../osh-infra-logging/050-elasticsearch.sh | 5 +- .../osh-infra-logging/060-fluentbit.sh | 1 - ...-daemonset.sh => 060-fluentd-daemonset.sh} | 0 .../065-fluentd-deployment.sh | 1 + .../{075-kibana.sh => 070-kibana.sh} | 0 zuul.d/jobs.yaml | 7 +-- 8 files changed, 23 insertions(+), 72 deletions(-) rename tools/deployment/{osh-infra-logging/070-fluentd-deployment.sh => common/fluentd-deployment.sh} (84%) mode change 100755 => 120000 tools/deployment/multinode/135-fluentd-deployment.sh delete mode 120000 tools/deployment/osh-infra-logging/060-fluentbit.sh rename tools/deployment/osh-infra-logging/{065-fluentd-daemonset.sh => 060-fluentd-daemonset.sh} (100%) create mode 120000 tools/deployment/osh-infra-logging/065-fluentd-deployment.sh rename tools/deployment/osh-infra-logging/{075-kibana.sh => 070-kibana.sh} (100%) diff --git a/tools/deployment/osh-infra-logging/070-fluentd-deployment.sh b/tools/deployment/common/fluentd-deployment.sh similarity index 84% rename from tools/deployment/osh-infra-logging/070-fluentd-deployment.sh rename to tools/deployment/common/fluentd-deployment.sh index e911d452a..9d285236e 100755 --- a/tools/deployment/osh-infra-logging/070-fluentd-deployment.sh +++ b/tools/deployment/common/fluentd-deployment.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2017 The Openstack-Helm Authors. +# Copyright 2019 The Openstack-Helm Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain @@ -21,6 +21,8 @@ make fluentd if [ ! -d "/var/log/journal" ]; then tee /tmp/fluentd.yaml << EOF +deployment: + type: Deployment monitoring: prometheus: enabled: true @@ -42,11 +44,20 @@ helm upgrade --install fluentd ./fluentd \ --namespace=osh-infra \ --values=/tmp/fluentd.yaml else +tee /tmp/fluentd.yaml << EOF +deployment: + type: Deployment +monitoring: + prometheus: + enabled: true +pod: + replicas: + fluentd: 1 +EOF +fi helm upgrade --install fluentd ./fluentd \ --namespace=osh-infra \ - --set pod.replicas.fluentd=1 \ - --set monitoring.prometheus.enabled=true -fi + --values=/tmp/fluentd.yaml #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra diff --git a/tools/deployment/multinode/135-fluentd-deployment.sh b/tools/deployment/multinode/135-fluentd-deployment.sh deleted file mode 100755 index 9cf95e278..000000000 --- a/tools/deployment/multinode/135-fluentd-deployment.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -# Copyright 2017 The Openstack-Helm Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -xe - -#NOTE: Lint and package chart -make fluentd - -if [ ! -d "/var/log/journal" ]; then -tee /tmp/fluentd-deployment.yaml << EOF -deployment: - type: Deployment -monitoring: - prometheus: - enabled: true -pod: - mounts: - fluentbit: - fluentbit: - volumes: - - name: runlog - hostPath: - path: /run/log - volumeMounts: - - name: runlog - mountPath: /run/log -EOF -else -tee /tmp/fluentd-deployment.yaml << EOF -deployment: - type: Deployment -monitoring: - prometheus: - enabled: true -pod: - replicas: - fluentd: 1 -EOF -fi -helm upgrade --install fluentd-deployment ./fluentd \ - --namespace=osh-infra \ - --values=/tmp/fluentd-deployment.yaml - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status fluentd-deployment diff --git a/tools/deployment/multinode/135-fluentd-deployment.sh b/tools/deployment/multinode/135-fluentd-deployment.sh new file mode 120000 index 000000000..39a694b6e --- /dev/null +++ b/tools/deployment/multinode/135-fluentd-deployment.sh @@ -0,0 +1 @@ +../common/fluentd-deployment.sh \ No newline at end of file diff --git a/tools/deployment/osh-infra-logging/050-elasticsearch.sh b/tools/deployment/osh-infra-logging/050-elasticsearch.sh index 5ef995bba..b05abd45c 100755 --- a/tools/deployment/osh-infra-logging/050-elasticsearch.sh +++ b/tools/deployment/osh-infra-logging/050-elasticsearch.sh @@ -23,13 +23,14 @@ make elasticsearch tee /tmp/elasticsearch.yaml << EOF jobs: verify_repositories: - cron: "*/3 * * * *" + cron: "*/10 * * * *" monitoring: prometheus: enabled: true pod: replicas: - data: 2 + client: 1 + data: 1 master: 2 conf: elasticsearch: diff --git a/tools/deployment/osh-infra-logging/060-fluentbit.sh b/tools/deployment/osh-infra-logging/060-fluentbit.sh deleted file mode 120000 index 0ed92806a..000000000 --- a/tools/deployment/osh-infra-logging/060-fluentbit.sh +++ /dev/null @@ -1 +0,0 @@ -../common/fluentbit.sh \ No newline at end of file diff --git a/tools/deployment/osh-infra-logging/065-fluentd-daemonset.sh b/tools/deployment/osh-infra-logging/060-fluentd-daemonset.sh similarity index 100% rename from tools/deployment/osh-infra-logging/065-fluentd-daemonset.sh rename to tools/deployment/osh-infra-logging/060-fluentd-daemonset.sh diff --git a/tools/deployment/osh-infra-logging/065-fluentd-deployment.sh b/tools/deployment/osh-infra-logging/065-fluentd-deployment.sh new file mode 120000 index 000000000..39a694b6e --- /dev/null +++ b/tools/deployment/osh-infra-logging/065-fluentd-deployment.sh @@ -0,0 +1 @@ +../common/fluentd-deployment.sh \ No newline at end of file diff --git a/tools/deployment/osh-infra-logging/075-kibana.sh b/tools/deployment/osh-infra-logging/070-kibana.sh similarity index 100% rename from tools/deployment/osh-infra-logging/075-kibana.sh rename to tools/deployment/osh-infra-logging/070-kibana.sh diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 39f999167..324503521 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -131,10 +131,9 @@ - ./tools/deployment/osh-infra-logging/030-radosgw-osh-infra.sh - ./tools/deployment/osh-infra-logging/040-ldap.sh - ./tools/deployment/osh-infra-logging/050-elasticsearch.sh - - ./tools/deployment/osh-infra-logging/060-fluentbit.sh - - ./tools/deployment/osh-infra-logging/065-fluentd-daemonset.sh - - ./tools/deployment/osh-infra-logging/070-fluentd-deployment.sh - - ./tools/deployment/osh-infra-logging/075-kibana.sh + - ./tools/deployment/osh-infra-logging/060-fluentd-daemonset.sh + - ./tools/deployment/osh-infra-logging/065-fluentd-deployment.sh + - ./tools/deployment/osh-infra-logging/070-kibana.sh - ./tools/deployment/osh-infra-logging/600-kibana-selenium.sh || true - job: