From 765bc5e477bbd6b5d13855d426b3453db305f748 Mon Sep 17 00:00:00 2001
From: Sanjay Chari <schari@redhat.com>
Date: Wed, 19 Jan 2022 16:02:23 +0530
Subject: [PATCH] Add active instances collectd query

This patch adds a collectd query for only active instances.

Co-authored-by: jaison <jraju@redhat.com>
Change-Id: I82a641edf6d2120e316b7f258e39c2895fce9527
---
 .../templates/controller.collectd.conf.j2                | 9 +++++++++
 .../roles/collectd/templates/controller.collectd.conf.j2 | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
index b37ab3a2..8200d652 100644
--- a/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
+++ b/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2
@@ -264,6 +264,14 @@ PreCacheChain "PreCache"
       ValuesFrom "instances"
     </Result>
   </Query>
+  <Query instance_active_count>
+    Statement "select count(*) as instances from instances where deleted=0 and vm_state = 'active'"
+    <Result>
+      Type gauge
+      InstancePrefix "instances_active"
+      ValuesFrom "instances"
+    </Result>
+  </Query>
   <Query instance_faults_count>
     Statement "select count(*) as instance_faults from instance_faults"
     <Result>
@@ -281,6 +289,7 @@ PreCacheChain "PreCache"
     DriverOption "mysql_unix_socket" "/var/lib/mysql/mysql.sock"
     Query host_vms_count
     Query instances_count
+    Query instance_active_count
     Query instances_del_count
     Query instance_faults_count
   </Database>
diff --git a/ansible/install/roles/collectd/templates/controller.collectd.conf.j2 b/ansible/install/roles/collectd/templates/controller.collectd.conf.j2
index dc2c97c9..1ac2eee3 100644
--- a/ansible/install/roles/collectd/templates/controller.collectd.conf.j2
+++ b/ansible/install/roles/collectd/templates/controller.collectd.conf.j2
@@ -181,6 +181,14 @@ PreCacheChain "PreCache"
       ValuesFrom "instances"
     </Result>
   </Query>
+  <Query instance_active_count>
+    Statement "select count(*) as instances from instances where deleted=0 and vm_state = 'active'"
+    <Result>
+      Type gauge
+      InstancePrefix "instances_active"
+      ValuesFrom "instances"
+    </Result>
+  </Query>
   <Query instance_faults_count>
     Statement "select count(*) as instance_faults from instance_faults"
     <Result>
@@ -198,6 +206,7 @@ PreCacheChain "PreCache"
     DriverOption "mysql_unix_socket" "/var/lib/mysql/mysql.sock"
     Query host_vms_count
     Query instances_count
+    Query instance_active_count
     Query instances_del_count
     Query instance_faults_count
   </Database>