diff --git a/doc/source/install/developer/deploy-with-ceph.rst b/doc/source/install/developer/deploy-with-ceph.rst index 1658ea16f..91aabc8e4 100644 --- a/doc/source/install/developer/deploy-with-ceph.rst +++ b/doc/source/install/developer/deploy-with-ceph.rst @@ -119,6 +119,19 @@ Alternatively, this step can be performed by running the script directly: ./tools/deployment/developer/ceph/080-node-exporter.sh +Deploy Process Exporter +^^^^^^^^^^^^^^^^^^^^^^^ + +.. literalinclude:: ../../../../tools/deployment/developer/ceph/085-process-exporter.sh + :language: shell + :lines: 1,17- + +Alternatively, this step can be performed by running the script directly: + +.. code-block:: shell + + ./tools/deployment/developer/ceph/085-process-exporter.sh + Deploy OpenStack Exporter ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/source/install/developer/deploy-with-nfs.rst b/doc/source/install/developer/deploy-with-nfs.rst index c6b9bc023..3b6cb96b5 100644 --- a/doc/source/install/developer/deploy-with-nfs.rst +++ b/doc/source/install/developer/deploy-with-nfs.rst @@ -106,6 +106,19 @@ Alternatively, this step can be performed by running the script directly: ./tools/deployment/developer/nfs/080-node-exporter.sh +Deploy Process Exporter +^^^^^^^^^^^^^^^^^^^^^^^ + +.. literalinclude:: ../../../../tools/deployment/developer/nfs/085-process-exporter.sh + :language: shell + :lines: 1,17- + +Alternatively, this step can be performed by running the script directly: + +.. code-block:: shell + + ./tools/deployment/developer/nfs/085-process-exporter.sh + Deploy OpenStack Exporter ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/source/install/multinode.rst b/doc/source/install/multinode.rst index 80930f7b3..9b631218d 100644 --- a/doc/source/install/multinode.rst +++ b/doc/source/install/multinode.rst @@ -119,6 +119,19 @@ Alternatively, this step can be performed by running the script directly: ./tools/deployment/multinode/080-node-exporter.sh +Deploy Process Exporter +^^^^^^^^^^^^^^^^^^^^^^^ + +.. literalinclude:: ../../../tools/deployment/multinode/085-process-exporter.sh + :language: shell + :lines: 1,17- + +Alternatively, this step can be performed by running the script directly: + +.. code-block:: shell + + ./tools/deployment/multinode/085-process-exporter.sh + Deploy OpenStack Exporter ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/playbooks/osh-infra-dev-deploy-ceph.yaml b/playbooks/osh-infra-dev-deploy-ceph.yaml index 5f74dc3a5..2e0bb1ee4 100644 --- a/playbooks/osh-infra-dev-deploy-ceph.yaml +++ b/playbooks/osh-infra-dev-deploy-ceph.yaml @@ -84,6 +84,12 @@ ./tools/deployment/developer/ceph/080-node-exporter.sh args: chdir: "{{ zuul.project.src_dir }}" + - name: Deploy Process Exporter + shell: | + set -xe; + ./tools/deployment/developer/ceph/085-process-exporter.sh + args: + chdir: "{{ zuul.project.src_dir }}" - name: Deploy Prometheus OpenStack Exporter shell: | set -xe; diff --git a/playbooks/osh-infra-dev-deploy-nfs.yaml b/playbooks/osh-infra-dev-deploy-nfs.yaml index 38542a1a0..885ca1380 100644 --- a/playbooks/osh-infra-dev-deploy-nfs.yaml +++ b/playbooks/osh-infra-dev-deploy-nfs.yaml @@ -78,6 +78,12 @@ ./tools/deployment/developer/nfs/080-node-exporter.sh args: chdir: "{{ zuul.project.src_dir }}" + - name: Deploy Process Exporter + shell: | + set -xe; + ./tools/deployment/developer/nfs/085-process-exporter.sh + args: + chdir: "{{ zuul.project.src_dir }}" - name: Deploy Prometheus OpenStack Exporter shell: | set -xe; diff --git a/playbooks/osh-infra-multinode-deploy.yaml b/playbooks/osh-infra-multinode-deploy.yaml index ad2c820ac..89a4f3b07 100644 --- a/playbooks/osh-infra-multinode-deploy.yaml +++ b/playbooks/osh-infra-multinode-deploy.yaml @@ -68,6 +68,12 @@ ./tools/deployment/multinode/080-node-exporter.sh args: chdir: "{{ zuul.project.src_dir }}" + - name: Deploy Process Exporter + shell: | + set -xe; + ./tools/deployment/multinode/085-process-exporter.sh + args: + chdir: "{{ zuul.project.src_dir }}" - name: Deploy Prometheus OpenStack Exporter shell: | set -xe; diff --git a/tools/deployment/common/085-process-exporter.sh b/tools/deployment/common/085-process-exporter.sh new file mode 100755 index 000000000..fa2bf674c --- /dev/null +++ b/tools/deployment/common/085-process-exporter.sh @@ -0,0 +1,30 @@ +#!/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-process-exporter + +#NOTE: Deploy command +helm upgrade --install prometheus-process-exporter \ + ./prometheus-process-exporter --namespace=kube-system + +#NOTE: Wait for deploy +./tools/deployment/common/wait-for-pods.sh kube-system + +#NOTE: Validate Deployment info +helm status prometheus-process-exporter diff --git a/tools/deployment/developer/ceph/085-process-exporter.sh b/tools/deployment/developer/ceph/085-process-exporter.sh new file mode 120000 index 000000000..9f7da289f --- /dev/null +++ b/tools/deployment/developer/ceph/085-process-exporter.sh @@ -0,0 +1 @@ +../../common/085-process-exporter.sh \ No newline at end of file diff --git a/tools/deployment/developer/nfs/085-process-exporter.sh b/tools/deployment/developer/nfs/085-process-exporter.sh new file mode 120000 index 000000000..9f7da289f --- /dev/null +++ b/tools/deployment/developer/nfs/085-process-exporter.sh @@ -0,0 +1 @@ +../../common/085-process-exporter.sh \ No newline at end of file diff --git a/tools/deployment/multinode/085-process-exporter.sh b/tools/deployment/multinode/085-process-exporter.sh new file mode 120000 index 000000000..f043da32b --- /dev/null +++ b/tools/deployment/multinode/085-process-exporter.sh @@ -0,0 +1 @@ +../common/085-process-exporter.sh \ No newline at end of file