Filippo Giunchedi has submitted this change and it was merged.
Change subject: lsearchd: remove udp2log configuration
......................................................................
lsearchd: remove udp2log configuration
Note: this will leave files unmanaged and to be removed:
service udp2log-lucene stop
rm /etc/init.d/udp2log-lucene
update-rc.d -f remove udp2log-lucene
rm /etc/logrotate.d/udp2log-lucene
rm /etc/udp2log/lucene
rm -rf /a/log/lucene/
Bug: T85009
Change-Id: I3e14c8007ebef0fb05eb2e21f502fceb9697dc25
---
M manifests/role/logging.pp
M manifests/site.pp
D templates/udp2log/filters.lucene.erb
3 files changed, 0 insertions(+), 15 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index d0a5d4c..3c91b02 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -361,18 +361,6 @@
}
}
-# lucene udp2log instance for capturing search logs
-class role::logging::udp2log::lucene inherits role::logging::udp2log {
- # udp2log::instance will ensure this is created
- $lucene_log_directory = "$log_directory/lucene"
-
- misc::udp2log::instance { 'lucene':
- port => '51234',
- log_directory => $lucene_log_directory,
- monitor_packet_loss => false,
- monitor_log_age => false,
- }
-}
# == Class role::logging::udp2log::erbium
# Erbium udp2log instance:
# - Fundraising: This requires write permissions on the netapp mount.
diff --git a/manifests/site.pp b/manifests/site.pp
index f96a408..f2bc999 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2218,8 +2218,6 @@
# main oxygen udp2log handles mostly Wikipedia Zero webrequest logs
include role::logging::udp2log::oxygen
- # Also include lucene search loggging udp2log instance
- include role::logging::udp2log::lucene
}
node 'palladium.eqiad.wmnet' {
diff --git a/templates/udp2log/filters.lucene.erb
b/templates/udp2log/filters.lucene.erb
deleted file mode 100644
index c0283d9..0000000
--- a/templates/udp2log/filters.lucene.erb
+++ /dev/null
@@ -1 +0,0 @@
-pipe 1 /bin/grep 'SearchResults:' >> /a/log/lucene/lucene.log
--
To view, visit https://gerrit.wikimedia.org/r/183469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e14c8007ebef0fb05eb2e21f502fceb9697dc25
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
