Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268673
Change subject: Rename wdqs-admins contact groun to wdqs
......................................................................
Rename wdqs-admins contact groun to wdqs
This group does not equal the wdqs-admins
user group.
Others should be able to be added to this group.
For example "wikidata-monitoring" which I will
add in a followup
Change-Id: Iea3262871ba78da8927e43541f00e490cfcf2591
---
M hieradata/role/common/wdqs.yaml
M manifests/role/wdqs.pp
M manifests/site.pp
M modules/nagios_common/files/contactgroups.cfg
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/268673/1
diff --git a/hieradata/role/common/wdqs.yaml b/hieradata/role/common/wdqs.yaml
index 0f04540..d5effb9 100644
--- a/hieradata/role/common/wdqs.yaml
+++ b/hieradata/role/common/wdqs.yaml
@@ -3,7 +3,7 @@
admin::groups:
- wdqs-admins
cluster: wdqs
-contactgroups: admins,wdqs-admins
+contactgroups: admins,wdqs
debdeploy::grains:
debdeploy-wdqs:
value: standard
diff --git a/manifests/role/wdqs.pp b/manifests/role/wdqs.pp
index e499973..4396d75 100644
--- a/manifests/role/wdqs.pp
+++ b/manifests/role/wdqs.pp
@@ -6,7 +6,7 @@
include standard
include base::firewall
- $nagios_contact_group = 'admins,wdqs-admins'
+ $nagios_contact_group = 'admins,wdqs'
if $::realm == 'labs' {
include role::labs::lvm::srv
diff --git a/manifests/site.pp b/manifests/site.pp
index 70414c7..aa08382 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2579,7 +2579,7 @@
node /^wdqs100[1-2]\.eqiad\.wmnet$/ {
role wdqs
- $nagios_contact_group = 'admins,wdqs-admins'
+ $nagios_contact_group = 'admins,wdqs'
}
# https://www.mediawiki.org/wiki/Parsoid
diff --git a/modules/nagios_common/files/contactgroups.cfg
b/modules/nagios_common/files/contactgroups.cfg
index 8df55d9..9fbe28c 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -61,7 +61,7 @@
# T111243
define contactgroup {
- contactgroup_name wdqs-admins
+ contactgroup_name wdqs
members smalyshev
}
--
To view, visit https://gerrit.wikimedia.org/r/268673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea3262871ba78da8927e43541f00e490cfcf2591
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
