Ottomata has submitted this change and it was merged.
Change subject: Revert "Improve LVS check for Elasticsearch"
......................................................................
Revert "Improve LVS check for Elasticsearch"
This isn't quite what I wanted. This is the icinga check which is checking
the overall cluster status. While we could be smarter there caring about
node-level status is overkill (compare to every other definition above this)
What I want to do is adjust the RunCommands in lvs' configuration.pp
to do something along the lines of what I attempted here.
This reverts commit 73c53dbaae87ace8222dfa70d23fd792886f8490.
Change-Id: I6ea1f4f1fe030d1b72d60a38286582bc3bd15a97
---
M modules/lvs/manifests/monitor.pp
M templates/icinga/checkcommands.cfg.erb
2 files changed, 1 insertion(+), 6 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/monitor.pp b/modules/lvs/manifests/monitor.pp
index 3050ab9..89a2b79 100644
--- a/modules/lvs/manifests/monitor.pp
+++ b/modules/lvs/manifests/monitor.pp
@@ -16,7 +16,7 @@
lvs::monitor_service_http { "ms-fe.pmtpa.wmnet": ip_address =>
"10.2.1.27", check_command =>
"check_http_lvs!ms-fe.pmtpa.wmnet!/monitoring/backend" }
lvs::monitor_service_http { "ms-fe.eqiad.wmnet": ip_address =>
"10.2.2.27", check_command =>
"check_http_lvs!ms-fe.eqiad.wmnet!/monitoring/backend" }
lvs::monitor_service_http { "parsoid.svc.eqiad.wmnet": ip_address =>
"10.2.2.28", check_command => "check_http_on_port!8000", contact_group =>
"admins,parsoid" }
- lvs::monitor_service_http { "search.svc.eqiad.wmnet": ip_address =>
"10.2.2.30", check_command =>
"check_http_url_on_port_with_string!$host!9200!/_nodes/$host!$host",
contact_group => "admins" }
+ lvs::monitor_service_http { "search.svc.eqiad.wmnet": ip_address =>
"10.2.2.30", check_command => "check_http_on_port!9200", contact_group =>
"admins" }
lvs::monitor_service_custom { "search-pool1.svc.eqiad.wmnet": ip_address
=> "10.2.2.11", port => 8123, description => "LVS Lucene", check_command =>
"check_lucene" }
lvs::monitor_service_custom { "search-pool2.svc.eqiad.wmnet": ip_address
=> "10.2.2.12", port => 8123, description => "LVS Lucene", check_command =>
"check_lucene" }
diff --git a/templates/icinga/checkcommands.cfg.erb
b/templates/icinga/checkcommands.cfg.erb
index d2d1924..ababda4 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -294,11 +294,6 @@
command_line $USER1$/check_http -H $ARG1$ -I $HOSTADDRESS$ -u $ARG2$
}
-define command{
- command_name check_http_url_on_port_with_string
- command_line $USER1$/check_http -H $ARG1$ -I $HOSTADDRESS$ -p $ARG2$
-u $ARG3$ -s $ARG4$
- }
-
define command {
command_name check_https_url
command_line $USER1$/check_http -H $ARG1$ -S -I $HOSTADDRESS$ -u
$ARG2$
--
To view, visit https://gerrit.wikimedia.org/r/114504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ea1f4f1fe030d1b72d60a38286582bc3bd15a97
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
