Ottomata has submitted this change and it was merged.
Change subject: Disable webrequest partition checks in icinga
......................................................................
Disable webrequest partition checks in icinga
nsca passive checks don't work properly when nsca server is older than
what is provided in Trusty.
See: T76414
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670373
Change-Id: Ib56dd1b818d40708cd6a475e509e07d11964676f
---
M manifests/role/analytics/refinery.pp
M modules/cassandra
2 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/refinery.pp
b/manifests/role/analytics/refinery.pp
index 271c20a..f88b9fa 100644
--- a/manifests/role/analytics/refinery.pp
+++ b/manifests/role/analytics/refinery.pp
@@ -99,6 +99,14 @@
# For webrequest imports, the Oozie job that is responsible
# for adding Hive partitions and checking data integrity
# is responsible for triggering these passive checks.
+#
+# NOTE: These are disasbled due to nsca not working
+# properly between versions provided in Precise and Trusty.
+# we may reenable these if the icinga server gets upgraded
+# to Trusty.
+# See: https://phabricator.wikimedia.org/T76414
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670373
+#
class role::analytics::refinery::data::check {
# We are monitoring hourly datasets.
# Give Oozie a little time to finish running
@@ -114,6 +122,7 @@
# This is a passive check that is triggered by the Oozie
# webrequest add partition jobs.
monitoring::service { 'hive_partition_webrequest-bits':
+ ensure => 'absent',
description => 'hive_partition_webrequest-bits',
check_command =>
"analytics_cluster_data_import-FAIL!wmf_raw.webrequest
bits!${alert_return_code}",
passive => 'true',
@@ -121,6 +130,7 @@
retries => 1,
}
monitoring::service { 'hive_partition_webrequest-mobile':
+ ensure => 'absent',
description => 'hive_partition_webrequest-mobile',
check_command =>
"analytics_cluster_data_import-FAIL!wmf_raw.webrequest
mobile!${alert_return_code}",
passive => 'true',
@@ -128,6 +138,7 @@
retries => 1,
}
monitoring::service { 'hive_partition_webrequest-text':
+ ensure => 'absent',
description => 'hive_partition_webrequest-text',
check_command =>
"analytics_cluster_data_import-FAIL!wmf_raw.webrequest
text!${alert_return_code}",
passive => 'true',
@@ -135,6 +146,7 @@
retries => 1,
}
monitoring::service { 'hive_partition_webrequest-upload':
+ ensure => 'absent',
description => 'hive_partition_webrequest-upload',
check_command =>
"analytics_cluster_data_import-FAIL!wmf_raw.webrequest
upload!${alert_return_code}",
passive => 'true',
diff --git a/modules/cassandra b/modules/cassandra
index a6727f2..d618289 160000
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit a6727f2f96969b0adae0d01162f90f0f89cfbb73
+Subproject commit d6182892c5f71081306e4a616d012ed8687fb20b
--
To view, visit https://gerrit.wikimedia.org/r/177009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib56dd1b818d40708cd6a475e509e07d11964676f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits