Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311306

Change subject: openstack: Add basic monitoring for HTTP services
......................................................................

openstack: Add basic monitoring for HTTP services

Untested

Bug: T42022
Change-Id: If7eba7c5a459fb4836e3338083af15c497aecb0b
---
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/keystone/service.pp
M modules/openstack/manifests/nova/api.pp
M modules/openstack/manifests/nova/spiceproxy.pp
5 files changed, 25 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/311306/1

diff --git a/modules/openstack/manifests/designate/service.pp 
b/modules/openstack/manifests/designate/service.pp
index f9489e0..b63a983 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -139,7 +139,10 @@
             description  => 'designate-pool-manager process',
             nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/designate-pool-manager'",
         }
-
+        monitoring::service { 'designate-api-http':
+            description   => 'designate-api http',
+            check_command => "check_http_on_port!9001",
+        }
     } else {
         service {'designate-api':
             ensure  => stopped,
diff --git a/modules/openstack/manifests/glance/service.pp 
b/modules/openstack/manifests/glance/service.pp
index 491e325..0253a43 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -121,6 +121,11 @@
                 require => User['glancesync'],
             }
         }
+
+        monitoring::service { 'glance-api-http':
+            description   => 'glance-api http',
+            check_command => "check_http_on_port!9292",
+        }
     } else {
         service { 'glance-api':
             ensure  => stopped,
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 5ccc4a5..e5829e2 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -66,6 +66,14 @@
             description  => 'keystone process',
             nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/keystone-all'",
         }
+        monitoring::service { 'keystone-http-35357':
+            description   => 'keystone http',
+            check_command => "check_http_on_port!35357",
+        }
+        monitoring::service { 'keystone-http-5000': # v2 api is limited here
+            description   => 'keystone http',
+            check_command => "check_http_on_port!5000",
+        }
     } else {
         service { 'keystone':
             ensure  => stopped,
diff --git a/modules/openstack/manifests/nova/api.pp 
b/modules/openstack/manifests/nova/api.pp
index 7ea8888..0cfb64f 100644
--- a/modules/openstack/manifests/nova/api.pp
+++ b/modules/openstack/manifests/nova/api.pp
@@ -26,4 +26,8 @@
         description  => 'nova-api process',
         nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1: 
--ereg-argument-array '^/usr/bin/python /usr/bin/nova-api'",
     }
+    monitoring::service { 'nova-api-http':
+        description => 'nova-api http',
+        check_command => "check_http_on_port!8774",
+    }
 }
diff --git a/modules/openstack/manifests/nova/spiceproxy.pp 
b/modules/openstack/manifests/nova/spiceproxy.pp
index 58749a2..b34c1aa 100644
--- a/modules/openstack/manifests/nova/spiceproxy.pp
+++ b/modules/openstack/manifests/nova/spiceproxy.pp
@@ -37,6 +37,10 @@
             subscribe => File['/etc/nova/nova.conf'],
             require   => Package['nova-consoleauth'];
         }
+        monitoring::service { 'nova-spiceproxy-http':
+            description   => 'nova-spiceproxy http',
+            check_command => "check_http_on_port!6082",
+        }
     } else {
         service { 'nova-spiceproxy':
             ensure  => stopped,

-- 
To view, visit https://gerrit.wikimedia.org/r/311306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7eba7c5a459fb4836e3338083af15c497aecb0b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to