RobH has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266543
Change subject: Revert "Add alert for elasticsearch 50th percentile prefix
search time"
......................................................................
Revert "Add alert for elasticsearch 50th percentile prefix search time"
This reverts commit 5d4a2649f7c4588c50c81f3b06af8233fc3524fd.
Change-Id: Idae8d384bd6ea817ceb1b514b5a91fd5a74cfc3d
---
M manifests/site.pp
M modules/nagios_common/files/contactgroups.cfg
D modules/role/manifests/elasticsearch/alerts.pp
3 files changed, 1 insertion(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/266543/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 532dec9..4c17989 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1170,7 +1170,7 @@
# Primary graphite machines
node 'graphite1001.eqiad.wmnet' {
- role graphite::production, statsdlb, performance, graphite::alerts,
restbase::alerts, graphite::alerts::reqstats, elasticsearch::alerts
+ role graphite::production, statsdlb, performance, graphite::alerts,
restbase::alerts, graphite::alerts::reqstats
include standard
}
diff --git a/modules/nagios_common/files/contactgroups.cfg
b/modules/nagios_common/files/contactgroups.cfg
index 8df55d9..3de6f46 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -64,8 +64,3 @@
contactgroup_name wdqs-admins
members smalyshev
}
-
-define contactgroup {
- contactgroup_name team-discovery
- members discovery-alerts
-}
diff --git a/modules/role/manifests/elasticsearch/alerts.pp
b/modules/role/manifests/elasticsearch/alerts.pp
deleted file mode 100644
index 0f86ea5..0000000
--- a/modules/role/manifests/elasticsearch/alerts.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class role::elasticsearch::alerts {
- monitoring::graphite_threshold { 'prefix_search_50th_percentile':
- description => 'Prefix search 50th percentile latency',
- metric =>
'transformNull(MediaWiki.CirrusSearch.requestTimeMs.prefix.p50, 0)',
- from => '10min',
- warning => '75',
- critical => '150',
- percentage => '20',
- contact_group => 'team-discovery',
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/266543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idae8d384bd6ea817ceb1b514b5a91fd5a74cfc3d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
