Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386267 )
Change subject: gerrit: skip gerrit-ssh monitoring if on slave
......................................................................
gerrit: skip gerrit-ssh monitoring if on slave
Since Idbc1654033fb075ededd the gerrit-sshd is
not enabled anymore if on a slave.
So we also have to skip the Icinga check for that
if on slave.
Change-Id: I7acd9643087ccb9e473d64a266856d833d655cd2
---
M modules/profile/manifests/gerrit/server.pp
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/386267/1
diff --git a/modules/profile/manifests/gerrit/server.pp
b/modules/profile/manifests/gerrit/server.pp
index 7569dd0..1c64147 100644
--- a/modules/profile/manifests/gerrit/server.pp
+++ b/modules/profile/manifests/gerrit/server.pp
@@ -27,10 +27,12 @@
default => true,
}
- monitoring::service { 'gerrit_ssh':
- description => 'SSH access',
- check_command => "check_ssh_port_ip!29418!${ipv4}",
- contact_group => 'admins,gerrit',
+ if !$slave {
+ monitoring::service { 'gerrit_ssh':
+ description => 'SSH access',
+ check_command => "check_ssh_port_ip!29418!${ipv4}",
+ contact_group => 'admins,gerrit',
+ }
}
include ::base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/386267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7acd9643087ccb9e473d64a266856d833d655cd2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
