From 1e40765d88610934574c0b4e5669a83a6b505c6b Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Wed, 23 Jan 2019 08:39:45 -0600 Subject: [PATCH] OSH-Infra: Update multinode and aio-monitoring/logging jobs This proposes moving the multinode job to a periodic job to match the approach used in the openstack-helm repo. This also adds the openstack-exporter to the aio monitoring job as it was previously missing. This also proposes moving the aio-logging and aio-monitoring jobs to voting Change-Id: Idcd4544e03facdcd2430683b66bd80c79e73a372 --- tools/deployment/common/openstack-exporter.sh | 41 ++++++++++++++++++ .../multinode/090-openstack-exporter.sh | 42 +------------------ .../100-openstack-exporter.sh | 1 + .../{100-grafana.sh => 110-grafana.sh} | 0 .../{110-nagios.sh => 120-nagios.sh} | 0 zuul.d/jobs.yaml | 5 ++- zuul.d/project.yaml | 11 +++-- 7 files changed, 51 insertions(+), 49 deletions(-) create mode 100755 tools/deployment/common/openstack-exporter.sh mode change 100755 => 120000 tools/deployment/multinode/090-openstack-exporter.sh create mode 120000 tools/deployment/osh-infra-monitoring/100-openstack-exporter.sh rename tools/deployment/osh-infra-monitoring/{100-grafana.sh => 110-grafana.sh} (100%) rename tools/deployment/osh-infra-monitoring/{110-nagios.sh => 120-nagios.sh} (100%) diff --git a/tools/deployment/common/openstack-exporter.sh b/tools/deployment/common/openstack-exporter.sh new file mode 100755 index 000000000..1a4bb3eee --- /dev/null +++ b/tools/deployment/common/openstack-exporter.sh @@ -0,0 +1,41 @@ +#!/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 prometheus-openstack-exporter + +#NOTE: Deploy command +tee /tmp/prometheus-openstack-exporter.yaml << EOF +manifests: + job_ks_user: false +dependencies: + static: + prometheus_openstack_exporter: + jobs: null + services: null +EOF +helm upgrade --install prometheus-openstack-exporter \ + ./prometheus-openstack-exporter \ + --namespace=openstack \ + --values=/tmp/prometheus-openstack-exporter.yaml + +#NOTE: Wait for deploy +./tools/deployment/common/wait-for-pods.sh openstack + +#NOTE: Validate Deployment info +helm status prometheus-openstack-exporter diff --git a/tools/deployment/multinode/090-openstack-exporter.sh b/tools/deployment/multinode/090-openstack-exporter.sh deleted file mode 100755 index 1a4bb3eee..000000000 --- a/tools/deployment/multinode/090-openstack-exporter.sh +++ /dev/null @@ -1,41 +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 prometheus-openstack-exporter - -#NOTE: Deploy command -tee /tmp/prometheus-openstack-exporter.yaml << EOF -manifests: - job_ks_user: false -dependencies: - static: - prometheus_openstack_exporter: - jobs: null - services: null -EOF -helm upgrade --install prometheus-openstack-exporter \ - ./prometheus-openstack-exporter \ - --namespace=openstack \ - --values=/tmp/prometheus-openstack-exporter.yaml - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status prometheus-openstack-exporter diff --git a/tools/deployment/multinode/090-openstack-exporter.sh b/tools/deployment/multinode/090-openstack-exporter.sh new file mode 120000 index 000000000..2389a3bec --- /dev/null +++ b/tools/deployment/multinode/090-openstack-exporter.sh @@ -0,0 +1 @@ +../common/openstack-exporter.sh \ No newline at end of file diff --git a/tools/deployment/osh-infra-monitoring/100-openstack-exporter.sh b/tools/deployment/osh-infra-monitoring/100-openstack-exporter.sh new file mode 120000 index 000000000..2389a3bec --- /dev/null +++ b/tools/deployment/osh-infra-monitoring/100-openstack-exporter.sh @@ -0,0 +1 @@ +../common/openstack-exporter.sh \ No newline at end of file diff --git a/tools/deployment/osh-infra-monitoring/100-grafana.sh b/tools/deployment/osh-infra-monitoring/110-grafana.sh similarity index 100% rename from tools/deployment/osh-infra-monitoring/100-grafana.sh rename to tools/deployment/osh-infra-monitoring/110-grafana.sh diff --git a/tools/deployment/osh-infra-monitoring/110-nagios.sh b/tools/deployment/osh-infra-monitoring/120-nagios.sh similarity index 100% rename from tools/deployment/osh-infra-monitoring/110-nagios.sh rename to tools/deployment/osh-infra-monitoring/120-nagios.sh diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index fc08bacc5..95b331d03 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -157,8 +157,9 @@ - ./tools/deployment/osh-infra-monitoring/070-kube-state-metrics.sh - ./tools/deployment/osh-infra-monitoring/080-node-exporter.sh - ./tools/deployment/osh-infra-monitoring/090-process-exporter.sh - - ./tools/deployment/osh-infra-monitoring/100-grafana.sh - - ./tools/deployment/osh-infra-monitoring/110-nagios.sh + - ./tools/deployment/osh-infra-monitoring/100-openstack-exporter.sh + - ./tools/deployment/osh-infra-monitoring/110-grafana.sh + - ./tools/deployment/osh-infra-monitoring/120-nagios.sh - ./tools/deployment/osh-infra-monitoring/grafana-selenium.sh - ./tools/deployment/osh-infra-monitoring/prometheus-selenium.sh - ./tools/deployment/osh-infra-monitoring/nagios-selenium.sh diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 09eccded5..b53387e2f 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -19,11 +19,8 @@ check: jobs: - openstack-helm-lint - - openstack-helm-infra-five-ubuntu - - openstack-helm-infra-aio-logging: - voting: false - - openstack-helm-infra-aio-monitoring: - voting: false + - openstack-helm-infra-aio-logging + - openstack-helm-infra-aio-monitoring - openstack-helm-infra-aio-network-policy: voting: false - openstack-helm-infra-openstack-support @@ -35,12 +32,14 @@ gate: jobs: - openstack-helm-lint - - openstack-helm-infra-five-ubuntu + - openstack-helm-infra-aio-logging + - openstack-helm-infra-aio-monitoring - openstack-helm-infra-openstack-support - openstack-helm-infra-kubernetes-keystone-auth periodic: jobs: - openstack-helm-infra-tenant-ceph + - openstack-helm-infra-five-ubuntu experimental: jobs: #NOTE(srwilkers): Make fedora job experimental until issues resolved