Closed
Bug 1100560
Opened 10 years ago
Closed 10 years ago
Please remove all nagios checks for aws puppet masters
Categories
(Infrastructure & Operations :: RelOps: General, task)
Infrastructure & Operations
RelOps: General
Tracking
(Not tracked)
RESOLVED
FIXED
People
(Reporter: rail, Assigned: dustin)
References
Details
(Whiteboard: [kanban:engops:https://mozilla.kanbanize.com/ctrl_board/6/4141] )
... for the following hosts: releng-puppet1.srv.releng.use1.mozilla.com releng-puppet2.srv.releng.use1.mozilla.com releng-puppet1.srv.releng.usw2.mozilla.com releng-puppet2.srv.releng.usw2.mozilla.com They are almost dead. :) Thanks in advance!
|
||
Updated•10 years ago
|
Whiteboard: [kanban:engops:https://mozilla.kanbanize.com/ctrl_board/6/4141]
|
Assignee | |
Updated•10 years ago
|
Assignee: relops → dustin
|
|
Assignee | |
Comment 1•10 years ago
|
||
diff --git a/modules/nagios/manifests/releng/hostgroups.pp b/modules/nagios/manifests/releng/hostgroups.pp
index f67837b..996f615 100644
--- a/modules/nagios/manifests/releng/hostgroups.pp
+++ b/modules/nagios/manifests/releng/hostgroups.pp
@@ -133,22 +133,16 @@ class nagios::releng::hostgroups {
alias => 'releng switch gear'
},
'scl3-production-buildbot-masters' => {
alias => "production buildbot masters in SCL3"
},
'scl3-puppetagain-masters' => {
alias => "puppetagain masters in SCL3"
},
- 'use1-puppetagain-masters' => {
- alias => "puppetagain masters in USE1"
- },
- 'usw2-puppetagain-masters' => {
- alias => "puppetagain masters in USW2"
- },
'seamicro-admin' => {
alias => "Seamicro Management server",
},
'selfserve-agents' => {
alias => 'selfserve-agent servers'
},
'signing-servers' => {
alias => 'signing servers'
diff --git a/modules/nagios/manifests/releng/scl3.pp b/modules/nagios/manifests/releng/scl3.pp
index c49c38d..8828eda 100644
--- a/modules/nagios/manifests/releng/scl3.pp
+++ b/modules/nagios/manifests/releng/scl3.pp
@@ -2361,40 +2361,16 @@ class nagios::releng::scl3 {
},
'releng-puppet2.srv.releng.scl3.mozilla.com' => {
parents => 'fw1.private.releng.scl3.mozilla.net',
contact_groups => 'build',
hostgroups => [
'scl3-puppetagain-masters'
]
},
- 'releng-puppet1.srv.releng.use1.mozilla.com' => {
- contact_groups => 'build',
- hostgroups => [
- 'use1-puppetagain-masters'
- ]
- },
- 'releng-puppet2.srv.releng.use1.mozilla.com' => {
- contact_groups => 'build',
- hostgroups => [
- 'use1-puppetagain-masters'
- ]
- },
- 'releng-puppet1.srv.releng.usw2.mozilla.com' => {
- contact_groups => 'build',
- hostgroups => [
- 'usw2-puppetagain-masters'
- ]
- },
- 'releng-puppet2.srv.releng.usw2.mozilla.com' => {
- contact_groups => 'build',
- hostgroups => [
- 'usw2-puppetagain-masters'
- ]
- },
'slavealloc.pvt.build.mozilla.org' => {
contact_groups => 'build',
hostgroups => [
'slave-allocs-build'
]
},
'buildapi.pvt.build.mozilla.org' => {
contact_groups => 'build',
diff --git a/modules/nagios/manifests/releng/services.pp b/modules/nagios/manifests/releng/services.pp
index 751e2c6..a24e6f7 100644
--- a/modules/nagios/manifests/releng/services.pp
+++ b/modules/nagios/manifests/releng/services.pp
@@ -58,18 +58,16 @@ class nagios::releng::services {
hostgroups => $::fqdn ? {
'nagios1.private.releng.scl3.mozilla.com' => [
'cruncher',
'dev-buildbot-masters',
'mac-partner-repack',
'pxe-servers',
'scl3-production-buildbot-masters',
'scl3-puppetagain-masters',
- 'use1-puppetagain-masters',
- 'usw2-puppetagain-masters',
'stage-servers',
'use1-production-buildbot-masters',
'usw2-production-buildbot-masters'
],
default => [
]
}
},
@@ -283,18 +281,16 @@ class nagios::releng::services {
'dev-buildbot-masters',
'foopy-servers',
'mac-signing-servers',
'mac-partner-repack',
'mobile-imaging',
'pxe-servers',
'scl3-production-buildbot-masters',
'scl3-puppetagain-masters',
- 'use1-puppetagain-masters',
- 'usw2-puppetagain-masters',
'signing-servers',
'stage-servers',
'use1-production-buildbot-masters',
'usw2-production-buildbot-masters'
],
default => [
]
}
@@ -812,46 +808,40 @@ class nagios::releng::services {
},
'puppet-tcp' => {
service_description => "TCP 8140",
contact_groups => 'build',
check_command => 'check_tcp!8140',
hostgroups => $::fqdn ? {
'nagios1.private.releng.scl3.mozilla.com' => [
'scl3-puppetagain-masters',
- 'use1-puppetagain-masters',
- 'usw2-puppetagain-masters'
],
default => [
]
}
},
'puppetagain-http' => {
service_description => "HTTP",
contact_groups => 'build',
check_command => 'check_http_only!/repos/',
hostgroups => $::fqdn ? {
'nagios1.private.releng.scl3.mozilla.com' => [
'scl3-puppetagain-masters',
- 'use1-puppetagain-masters',
- 'usw2-puppetagain-masters'
],
default => [
]
}
},
'puppetagain-https' => {
service_description => "HTTPS",
contact_groups => 'build',
check_command => 'check_https_only!/repos/',
hostgroups => $::fqdn ? {
'nagios1.private.releng.scl3.mozilla.com' => [
'scl3-puppetagain-masters',
- 'use1-puppetagain-masters',
- 'usw2-puppetagain-masters'
],
default => [
]
}
},
'panda-relay-snmp-mem' => {
service_description => "Memory",
notification_options => 'w,c,r,u',
@@ -1447,18 +1437,16 @@ class nagios::releng::services {
service_description => 'Puppetmaster CA Certs',
check_command => 'check_puppetmaster_certs',
normal_check_interval => 60,
notification_interval => 60,
contact_groups => 'build',
hostgroups => $::fqdn ? {
'nagios1.private.releng.scl3.mozilla.com' => [
'scl3-puppetagain-masters',
- 'use1-puppetagain-masters',
- 'usw2-puppetagain-masters'
],
default => [
]
}
},
'check-buildbot-age' => {
service_description => 'buildbot masters age',
check_command => 'check_buildbot_age',Status: NEW → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
You need to log in
before you can comment on or make changes to this bug.
Description
•