Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/294723
Change subject: Team-interactive receives maps alerts
......................................................................
Team-interactive receives maps alerts
Adding team-interactive to the following alerts:
* service check on kartotherian
* service check on tilerator
* service check on tileratorui
* LVS check on kartotherian service
Bug: T137869
Bug: T137851
Change-Id: I02fca2da8ac90366d6be1c67d1e985c1b2c46228
---
M hieradata/role/common/maps/server.yaml
M modules/kartotherian/manifests/init.pp
M modules/lvs/manifests/monitor_services.pp
M modules/tilerator/manifests/init.pp
M modules/tilerator/manifests/ui.pp
5 files changed, 39 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/294723/1
diff --git a/hieradata/role/common/maps/server.yaml
b/hieradata/role/common/maps/server.yaml
index 0249efa..1586e40 100644
--- a/hieradata/role/common/maps/server.yaml
+++ b/hieradata/role/common/maps/server.yaml
@@ -12,3 +12,7 @@
- tilerator-admin
service::configuration::logstash_host: logstash1001.eqiad.wmnet
service::configuration::statsd_host: statsd.eqiad.wmnet
+
+kartotherian::contact_groups: 'admins,team-interactive'
+tilerator::contact_groups: 'admins,team-interactive'
+tilerator::ui::contact_groups: 'admins,team-interactive'
diff --git a/modules/kartotherian/manifests/init.pp
b/modules/kartotherian/manifests/init.pp
index 0638390..7867f49 100644
--- a/modules/kartotherian/manifests/init.pp
+++ b/modules/kartotherian/manifests/init.pp
@@ -6,8 +6,17 @@
# accomodate future kartotherian needs that are not suited for the service
module
# classes as well as conform to a de-facto standard of having a module for
every
# service
+#
+# === Parameters
+#
+# [*contact_groups*]
+# Contact groups for alerting.
+# Default: hiera('contactgroups', 'admins') - use 'contactgroups' hiera
+# variable with a fallback to 'admins' if 'contactgroups' isn't set.
+#
class kartotherian(
- $conf_sources = 'sources.prod.yaml',
+ $conf_sources = 'sources.prod.yaml',
+ $contact_groups = hiera('contactgroups', 'admins'),
) {
$cassandra_kartotherian_user = 'kartotherian'
@@ -21,5 +30,6 @@
deployment => 'scap3',
has_spec => true,
healthcheck_url => '',
+ contact_groups => $contact_groups,
}
}
diff --git a/modules/lvs/manifests/monitor_services.pp
b/modules/lvs/manifests/monitor_services.pp
index c92281f..7d39a28 100644
--- a/modules/lvs/manifests/monitor_services.pp
+++ b/modules/lvs/manifests/monitor_services.pp
@@ -106,8 +106,9 @@
host => 'kartotherian.svc.codfw.wmnet',
group => 'lvs',
description => 'Kartotherian LVS codfw',
- check_command =>
- 'check_wmf_service!http://kartotherian.svc.codfw.wmnet:6533!15',
+ check_command =>
'check_wmf_service!http://kartotherian.svc.codfw.wmnet:6533!15',
+ contact_group => 'admins,team-interactive',
+ critical => true,
}
}
diff --git a/modules/tilerator/manifests/init.pp
b/modules/tilerator/manifests/init.pp
index 80c97c4..1d2946b 100644
--- a/modules/tilerator/manifests/init.pp
+++ b/modules/tilerator/manifests/init.pp
@@ -6,10 +6,19 @@
# accomodate future tilerator needs that are not suited for the service module
# classes as well as conform to a de-facto standard of having a module for
every
# service
+#
+# === Parameters
+#
+# [*contact_groups*]
+# Contact groups for alerting.
+# Default: hiera('contactgroups', 'admins') - use 'contactgroups' hiera
+# variable with a fallback to 'admins' if 'contactgroups' isn't set.
+#
class tilerator(
- $conf_sources = 'sources.prod.yaml',
+ $conf_sources = 'sources.prod.yaml',
+ $contact_groups = hiera('contactgroups', 'admins'),
) {
- include tilerator::ui
+ include ::tilerator::ui
$cassandra_tilerator_user = 'tilerator'
$cassandra_tilerator_pass = hiera('maps::cassandra_tilerator_pass')
diff --git a/modules/tilerator/manifests/ui.pp
b/modules/tilerator/manifests/ui.pp
index d59829b..54fa4b5 100644
--- a/modules/tilerator/manifests/ui.pp
+++ b/modules/tilerator/manifests/ui.pp
@@ -17,8 +17,17 @@
# only meant to be used through an SSH tunnel
# NOTE: The above is THE reason this service is separated from the tilerator
# service
+#
+# === Parameters
+#
+# [*contact_groups*]
+# Contact groups for alerting.
+# Default: hiera('contactgroups', 'admins') - use 'contactgroups' hiera
+# variable with a fallback to 'admins' if 'contactgroups' isn't set.
+#
class tilerator::ui(
- $conf_sources = 'sources.prod.yaml',
+ $conf_sources = 'sources.prod.yaml',
+ $contact_groups = hiera('contactgroups', 'admins'),
) {
$cassandra_tileratorui_user = 'tileratorui'
$cassandra_tileratorui_pass = hiera('maps::cassandra_tileratorui_pass')
--
To view, visit https://gerrit.wikimedia.org/r/294723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02fca2da8ac90366d6be1c67d1e985c1b2c46228
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
