From bc54e72fd3e102d79656a7a8f805701def73d1d9 Mon Sep 17 00:00:00 2001
From: Scott Huang <scott.huang@att.com>
Date: Wed, 8 Aug 2018 15:53:00 +0000
Subject: [PATCH] Monitor Cinder API and Scheduler

Change-Id: I159facb491d9a722d8c067ead25c470f00b83939
---
 nagios/values.yaml     | 12 ++++++++++++
 prometheus/values.yaml | 16 ++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/nagios/values.yaml b/nagios/values.yaml
index 1bf936544..207cb1dff 100644
--- a/nagios/values.yaml
+++ b/nagios/values.yaml
@@ -557,6 +557,18 @@ conf:
           service_description: "API_swift"
           check_command: check_prom_alert!swift_api_availability!CRITICAL- Swift API at {url} is not available!OK- Swift API is available
           check_interval: 60
+      - check_cinder_api:
+          use: notifying_service
+          hostgroup_name: prometheus-hosts
+          service_description: "API_cinder"
+          check_command: check_prom_alert!os_cinder_api_availability!CRITICAL- Cinder API at {url} is not available!OK- Cinder API is available
+          check_interval: 60
+      - check_service_cinder_scheduler:
+          use: notifying_service
+          hostgroup_name: prometheus-hosts
+          service_description: "Service_cinder-scheduler"
+          check_command: check_prom_alert!os_cinder_scheduler_availability!CRITICAL- Cinder scheduler is not available!OK- Cinder scheduler is available
+          check_interval: 60
       - check_service_nova_compute:
           use: notifying_service
           hostgroup_name: prometheus-hosts
diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index 4ce4115d3..8f07e7e70 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -1454,6 +1454,22 @@ conf:
             annotations:
               description: 'Swift API is not available at {{$labels.url}} for more than 5 minutes'
               summary: 'Swift API is not available at {{$labels.url}}'
+          - alert: os_cinder_api_availability
+            expr:  openstack_check_cinder_api != 1
+            for: 5m
+            labels:
+              severity: page
+            annotations:
+              description: 'Cinder API is not available at {{$labels.url}} for more than 5 minutes'
+              summary: 'Cinder API is not available at {{$labels.url}}'
+          - alert: os_cinder_scheduler_availability
+            expr:  openstack_services_cinder_cinder_scheduler != 1
+            for: 5m
+            labels:
+              severity: page
+            annotations:
+              description: 'Cinder scheduler is not available for more than 5 minutes'
+              summary: 'Cinder scheduler is not available'
           - alert: os_nova_compute_disabled
             expr:  services_nova_compute_disabled_total > 0
             for: 5m