From 9316c2a2d8fc0000fee05e2e9e0b3106a44c90bf Mon Sep 17 00:00:00 2001
From: Guillaume Thouvenin <gthouvenin@mirantis.com>
Date: Wed, 10 Feb 2016 13:53:19 +0100
Subject: [PATCH] Don't report status for deleted services

Change-Id: I619457c30235bc0085227ab2ccc3c2b2b9636b72
Closes-Bug: #1542418
Closes-Bug: #1531541
(cherry picked from commit 5864deb16442bd803287e03a8b166af447331c0e)
---
 .../lma_collector/templates/collectd_dbi_services.conf.erb  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployment_scripts/puppet/modules/lma_collector/templates/collectd_dbi_services.conf.erb b/deployment_scripts/puppet/modules/lma_collector/templates/collectd_dbi_services.conf.erb
index 6f104f4be..2dde9c337 100644
--- a/deployment_scripts/puppet/modules/lma_collector/templates/collectd_dbi_services.conf.erb
+++ b/deployment_scripts/puppet/modules/lma_collector/templates/collectd_dbi_services.conf.erb
@@ -1,7 +1,7 @@
 <Plugin dbi>
 <% if @type == 'services' %>
   <Query "services_down">
-    Statement "select concat_ws('.', 'services', replace(replace(s1.binary, 'nova-', ''), 'cinder-', ''), 'down') as metric, count(s2.id) as value from services s1 left outer join services s2 on s1.id = s2.id and s1.disabled=0 and s1.deleted=0 and timestampdiff(SECOND,s1.updated_at,utc_timestamp())><%= @downtime %> group by s1.binary;"
+    Statement "select concat_ws('.', 'services', replace(replace(s1.binary, 'nova-', ''), 'cinder-', ''), 'down') as metric, count(s2.id) as value from (select * from services where deleted=0) s1 left outer join services s2 on s1.id = s2.id and s1.disabled=0 and timestampdiff(SECOND,s1.updated_at,utc_timestamp())><%= @downtime %> group by s1.binary;"
     MinVersion 50000
     <Result>
       Type "gauge"
@@ -10,7 +10,7 @@
     </Result>
   </Query>
   <Query "services_up">
-    Statement "select concat_ws('.', 'services', replace(replace(s1.binary, 'nova-', ''), 'cinder-', ''), 'up') as metric, count(s2.id) as value from services s1 left outer join services s2 on s1.id = s2.id and s1.disabled=0 and s1.deleted=0 and timestampdiff(SECOND,s1.updated_at,utc_timestamp())<=<%= @downtime %> group by s1.binary;"
+    Statement "select concat_ws('.', 'services', replace(replace(s1.binary, 'nova-', ''), 'cinder-', ''), 'up') as metric, count(s2.id) as value from (select * from services where deleted=0) s1 left outer join services s2 on s1.id = s2.id and s1.disabled=0 and timestampdiff(SECOND,s1.updated_at,utc_timestamp())<=<%= @downtime %> group by s1.binary;"
     MinVersion 50000
     <Result>
       Type "gauge"
@@ -19,7 +19,7 @@
     </Result>
   </Query>
   <Query "services_disabled">
-    Statement "select concat_ws('.', 'services', replace(replace(s1.binary, 'nova-', ''), 'cinder-', ''), 'disabled') as metric, count(s2.id) as value from services s1 left outer join services s2 on s1.id = s2.id and s2.disabled = 1 and s1.deleted=0 group by s1.binary;"
+    Statement "select concat_ws('.', 'services', replace(replace(s1.binary, 'nova-', ''), 'cinder-', ''), 'disabled') as metric, count(s2.id) as value from (select * from services where deleted=0) s1 left outer join services s2 on s1.id = s2.id and s2.disabled = 1 group by s1.binary;"
     MinVersion 50000
     <Result>
       Type "gauge"