Yuvipanda has submitted this change and it was merged.
Change subject: logging: Move fatalmonitor into role::mediawiki::logging
......................................................................
logging: Move fatalmonitor into role::mediawiki::logging
That's the only place where it is used, and other helper scripts
are there already
Bug: T87221
Change-Id: Ic74ad378f94b7146f34df99a55ddaea5a0a8d980
---
M manifests/misc/deployment.pp
M manifests/role/logging.pp
M manifests/site.pp
3 files changed, 8 insertions(+), 11 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index f65e5ef..f56068e 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -2,16 +2,6 @@
# deployment hosts
-class misc::deployment::fatalmonitor {
- file {
- '/usr/local/bin/fatalmonitor':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/fatalmonitor';
- }
-}
-
class misc::deployment::passwordscripts {
include passwords::misc::scripts
$cachemgr_pass = $passwords::misc::scripts::cachemgr_pass
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 0cbb786..f0e7ccc 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -89,6 +89,14 @@
content => template('misc/exceptionmonitor.erb'),
}
+ file {
+ '/usr/local/bin/fatalmonitor':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///files/misc/scripts/fatalmonitor';
+ }
+
$cirrussearch_slow_log_check_interval = 5
# Send CirrusSearch-slow.log entry rate to ganglia.
logster::job { 'CirrusSearch-slow.log':
diff --git a/manifests/site.pp b/manifests/site.pp
index 01cef58..c2c95fe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1128,7 +1128,6 @@
$cluster = 'misc'
include standard
- include misc::deployment::fatalmonitor
include ::role::xenon
class { 'admin':
--
To view, visit https://gerrit.wikimedia.org/r/186603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic74ad378f94b7146f34df99a55ddaea5a0a8d980
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
