Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/384183 )
Change subject: base/icinga: if on labs, don't page for mysql procs
......................................................................
base/icinga: if on labs, don't page for mysql procs
If on labs/labtest hosts, set "is_critical" to false
for mariabd::monitor_process
which means nrpe::monitor_service will be used with "critical => false"
which means monitoring::service will be used with "critical => false"
which means $do_paging will be set to default
which means $real_contact_groups will _not_ have the 'sms' contact group
which means no SMS will be sent to anyone.
Bug: T178008
Change-Id: Ia490b4b25285cef912bf84edf9a38a24104ae713
---
M hieradata/regex.yaml
M modules/profile/manifests/base.pp
2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/384183/1
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 8f22550..0b72b8a 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -115,15 +115,14 @@
labs:
__regex: !ruby/regexp
/^lab((net|nodepool|mon)100[1-9]\.eqiad\.wmnet|(services|control)100[1-9]\.wikimedia\.org)$/
cluster: labs
-
+ mariadb::monitor_process::is_critical: false
labtestvirt:
__regex: !ruby/regexp /^labtestvirt20[0-9][0-9]\.codfw\.wmnet$/
cluster: labtestvirt
-
labtest:
__regex: !ruby/regexp
/^labtest(net200[1-9]\.codfw\.wmnet|(services|control)100[1-9]\.wikimedia\.org)$/
cluster: labtest
-
+ mariadb::monitor_process::is_critical: false
swift_be_codfw_dell:
__regex: !ruby/regexp /^ms-be201[3-5]\.codfw\.wmnet$/
swift_storage_drives: [
diff --git a/modules/profile/manifests/base.pp
b/modules/profile/manifests/base.pp
index 997cadc..b15e403 100644
--- a/modules/profile/manifests/base.pp
+++ b/modules/profile/manifests/base.pp
@@ -8,6 +8,7 @@
$remote_syslog = hiera('profile::base::remote_syslog',
['syslog.eqiad.wmnet', 'syslog.codfw.wmnet']),
$remote_syslog_tls = hiera('profile::base::remote_syslog_tls', []),
$notifications_enabled = hiera('profile::base::notifications_enabled',
'1'),
+ $paging_enabled = hiera('profile::base::paging_enabled', '1'),
$core_dump_pattern = hiera('profile::base::core_dump_pattern',
'/var/tmp/core/core.%h.%e.%p.%t'),
$ssh_server_settings = hiera('profile::base::ssh_server_settings', {}),
$nrpe_allowed_hosts = hiera('profile::base::nrpe_allowed_hosts',
'127.0.0.1,208.80.154.14,208.80.153.74,208.80.155.119'),
@@ -105,6 +106,7 @@
raid_check_interval => $check_raid_interval,
raid_retry_interval => $check_raid_retry,
notifications_enabled => $notifications_enabled,
+ paging_enabled => $paging_enabled,
}
if os_version('ubuntu == trusty') {
--
To view, visit https://gerrit.wikimedia.org/r/384183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia490b4b25285cef912bf84edf9a38a24104ae713
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
