Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366016 )
Change subject: icinga/ores: Change scoring team's name for alerts; point to
group member
......................................................................
icinga/ores: Change scoring team's name for alerts; point to group member
DEPENDENCY: This will require a change to the private repo, to add the
"team-scoring" contact info sending via PM...
Change-Id: I4a9a006f425e9f8ddc85269147bd3a1a9900844b
---
M modules/icinga/manifests/monitor/ores.pp
M modules/icinga/manifests/monitor/ores_labs_web_node.pp
M modules/nagios_common/files/contactgroups.cfg
3 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/modules/icinga/manifests/monitor/ores.pp
b/modules/icinga/manifests/monitor/ores.pp
index 57f2eba..00c9311 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -2,7 +2,7 @@
class icinga::monitor::ores {
monitoring::grafana_alert { 'db/ores':
- contact_group => 'team-ores',
+ contact_group => 'team-scoring',
}
@monitoring::host { 'ores.wmflabs.org':
@@ -17,7 +17,7 @@
description => 'ORES home page',
check_command => 'check_http',
host => 'ores.wmflabs.org',
- contact_group => 'team-ores',
+ contact_group => 'team-scoring',
}
$web_nodes = [ 'ores-web-03', 'ores-web-05' ]
@@ -29,14 +29,14 @@
description => 'ORES worker labs',
check_command => 'check_ores_workers!oresweb',
host => 'ores.wmflabs.org',
- contact_group => 'team-ores',
+ contact_group => 'team-scoring',
}
monitoring::service { 'ores_worker_production':
description => 'ORES worker production',
check_command => 'check_ores_workers!ores.wikimedia.org',
host => 'ores.wikimedia.org',
- contact_group => 'team-ores',
+ contact_group => 'team-scoring',
}
# T122830
diff --git a/modules/icinga/manifests/monitor/ores_labs_web_node.pp
b/modules/icinga/manifests/monitor/ores_labs_web_node.pp
index 0128511..c67d030 100644
--- a/modules/icinga/manifests/monitor/ores_labs_web_node.pp
+++ b/modules/icinga/manifests/monitor/ores_labs_web_node.pp
@@ -4,6 +4,6 @@
description => "ORES web node labs ${title}",
check_command => "check_ores_workers!oresweb/node/${title}",
host => 'ores.wmflabs.org',
- contact_group => 'team-ores',
+ contact_group => 'team-scoring',
}
}
diff --git a/modules/nagios_common/files/contactgroups.cfg
b/modules/nagios_common/files/contactgroups.cfg
index abd8a0d..bbca1c8 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -60,8 +60,8 @@
}
define contactgroup {
- contactgroup_name team-ores
- members halfak,Ladsgroup,irc-ores
+ contactgroup_name team-scoring
+ members team-scoring,irc-ores
}
define contactgroup {
--
To view, visit https://gerrit.wikimedia.org/r/366016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a9a006f425e9f8ddc85269147bd3a1a9900844b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Halfak <[email protected]>
Gerrit-Reviewer: Maintenance-bot <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
