Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/125186
Change subject: Move check_rp_filter_disabled check to role::lvs
......................................................................
Move check_rp_filter_disabled check to role::lvs
nrpe checks should defined in the role classes anyway, plus the previous
setup actually implemented then on the icinga host and not the actual
LVS servers
Change-Id: I8f528babbd89c341d4ba3015f93c7c17fdadb16f
---
M manifests/role/lvs.pp
M modules/lvs/manifests/monitor.pp
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/125186/1
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index a130b0b..cd75768 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -5,6 +5,11 @@
class role::lvs::balancer {
system::role { "role::lvs::balancer": description => "LVS balancer" }
+ $rp_args = inline_template('<%= @interfaces.split(",").map{|x|
"net.conf.ipv4.#{x}.rp_filter=0"}.join(",") %>')
+ nrpe::monitor_service { 'check_rp_filter_disabled':
+ description => 'Check rp_filter disabled',
+ nrpe_command => "/usr/lib/nagios/plugins/check_sysctl ${rp_args}",
+ }
$cluster = "lvs"
include lvs::configuration
diff --git a/modules/lvs/manifests/monitor.pp b/modules/lvs/manifests/monitor.pp
index a9d8490..3b1a499 100644
--- a/modules/lvs/manifests/monitor.pp
+++ b/modules/lvs/manifests/monitor.pp
@@ -139,9 +139,4 @@
ip_address => $ip['mobile']['ulsfo']['mobilelb6'],
uri => "en.m.wikipedia.org!/wiki/Main_Page";
}
- $rp_args = inline_template('<%= @interfaces.split(",").map{|x|
"net.conf.ipv4.#{x}.rp_filter=0"}.join(",") %>')
- nrpe::monitor_service { 'check_rp_filter_disabled':
- description => 'Check rp_filter disabled',
- nrpe_command => "/usr/lib/nagios/plugins/check_sysctl ${rp_args}",
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/125186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f528babbd89c341d4ba3015f93c7c17fdadb16f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
