Merge "Add openstack-exporter to aio-monitoring & openstack-support jobs"

tools/deployment/openstack-support/110-openstack-exporter.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# 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
+#    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
+: ${OSH_EXTRA_HELM_ARGS:=""}
+helm upgrade --install prometheus-openstack-exporter \
+    ./prometheus-openstack-exporter \
+    --namespace=openstack \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_OS_EXPORTER}
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+helm status prometheus-openstack-exporter

zuul.d/jobs.yaml

@@ -159,6 +159,7 @@
         - ./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-openstack-exporter.sh
         - ./tools/deployment/osh-infra-monitoring/110-grafana.sh
         - ./tools/deployment/osh-infra-monitoring/120-nagios.sh
         - ./tools/deployment/osh-infra-monitoring/130-postgresql.sh
@@ -247,6 +248,7 @@
         - ./tools/deployment/openstack-support/080-setup-client.sh
         - ./tools/deployment/openstack-support/090-keystone.sh
         - ./tools/deployment/openstack-support/100-ceph-radosgateway.sh
+        - ./tools/deployment/openstack-support/110-openstack-exporter.sh
 
 - job:
     name: openstack-helm-infra-five-ubuntu