Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58136
Change subject: Prepping for emery upgrade to precise.
......................................................................
Prepping for emery upgrade to precise.
RT 1791
Change-Id: Ifc0df27fc5860acee79ffa9aadf7b6a8f30944f7
---
M files/autoinstall/netboot.cfg
M manifests/role/logging.pp
M manifests/site.pp
M templates/udp2log/filters.emery.erb
4 files changed, 29 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/58136/1
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
old mode 100644
new mode 100755
index d1a17e3..0745115
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -61,7 +61,7 @@
searchidx*) echo partman/searchidx.cfg ;; \
search[0-9]*) echo partman/search.cfg ;; \
snapshot[1-4]|snapshot1002) echo partman/snapshot.cfg ;; \
- copper|neon|harmon|ssl[1-3]0[0-9][0-9]|ssl[0-9]|zirconium) echo
partman/raid1-lvm.cfg ;; \
+
copper|emery|neon|harmon|ssl[1-3]0[0-9][0-9]|ssl[0-9]|zirconium) echo
partman/raid1-lvm.cfg ;; \
solr[1-3]|solr100[1-3]) echo partman/lvm.cfg ;; \
virt[5-9]|virt1[0-1]) echo partman/virt-raid10-cisco.cfg ;; \
virt100[1-3]) echo partman/virt-raid10-cisco-ceph.cfg ;; \
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 5319785..d879974 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -220,3 +220,14 @@
require => Class['role::logging::webstatscollector'],
}
}
+
+
+# emery is a generic webrequests udp2log host.
+class role::logging::udp2log::emery inherits role::logging::udp2log {
+ # udp2log::instance will ensure this is created
+ $webrequest_log_directory = "$log_directory/webrequest"
+
+ misc::udp2log::instance { 'emery':
+ log_directory => $webrequest_log_directory,
+ }
+}
\ No newline at end of file
diff --git a/manifests/site.pp b/manifests/site.pp
index 7e7e718..515a02f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -722,39 +722,12 @@
# base_analytics_logging_node is defined in role/logging.pp
node "emery.wikimedia.org" inherits "base_analytics_logging_node" {
include
+ generic::sysctl::high-bandwidth-rsync,
admins::mortals,
# RT 4312
accounts::dandreescu
- include
- generic::sysctl::high-bandwidth-rsync,
- misc::udp2log::utilities,
- misc::udp2log
-
- sudo_user { "otto": privileges => ['ALL = NOPASSWD: ALL'] }
-
- # emery's udp2log instance
- # saves logs mainly in /var/log/squid.
- # TODO: Move this to /var/log/udp2log
- misc::udp2log::instance { "emery": log_directory => "/var/log/squid" }
-
- # Set up an rsync daemon module for udp2log logrotated
- # archives. This allows stat1 to copy logs from the
- # logrotated archive directory
- class { "misc::udp2log::rsyncd":
- path => "/var/log/squid",
- require => Misc::Udp2log::Instance["emery"],
- }
-
- # aft (Article Feedback Tool)
- # udp2log instance for clicktracking logs.
- misc::udp2log::instance { "aft":
- log_directory => "/var/log/squid/aft",
- port => "8421",
- # packet-loss.log is not generated for clicktracking logs,
- # so packet loss monitoring is disabled.
- monitor_packet_loss => false,
- }
+ include role::logging::udp2log::emery
}
node /(ersch|tarin)\.pmtpa\.wmnet/ {
diff --git a/templates/udp2log/filters.emery.erb
b/templates/udp2log/filters.emery.erb
index 4c236fa..71ae175 100644
--- a/templates/udp2log/filters.emery.erb
+++ b/templates/udp2log/filters.emery.erb
@@ -2,24 +2,24 @@
#### This file managed by puppet.
###
-# udp2log packet loss monitoring
-pipe 10 /usr/bin/packet-loss 10 '\t' >> /var/log/squid/packet-loss.log
+### udp2log packet loss monitoring
+pipe 10 /usr/bin/packet-loss 10 '\t' >> <%= log_directory %>/packet-loss.log
-# 0.0001 of all udp2log messages
-# This log file is also on locke for redundancy
-file 1000 /var/log/squid/sampled-1000.tab.log
+### 0.0001 of all udp2log messages
+# This log file is also on gadolinium for redundancy
+file 1000 <%= log_directory %>/sampled-1000.tsv.log
-# API Usage
-pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php >>
/var/log/squid/api-usage.tab.log
+### API Usage
+pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php >> <%= log_directory
%>/api-usage.tsv.log
-# GLAM NARA / National Archives - RT 2212
-pipe 10 /usr/bin/udp-filter -F '\t' -p _NARA_ -g -m
/var/log/squid/filters/GeoIPLibs/GeoIP.dat -b country >>
/var/log/squid/glam_nara.tab.log
+### GLAM NARA / National Archives - RT 2212
+pipe 10 /usr/bin/udp-filter -F '\t' -p _NARA_ -g -m -b country >> <%=
log_directory %>/glam_nara.tsv.log
-# Location geocoding filter for Erik Zachte.
-pipe 1000 /usr/bin/udp-filter -F '\t' -g -b everything >>
/var/log/squid/location-1000.tab.log
+### Location geocoding filter for Erik Zachte.
+pipe 1000 /usr/bin/udp-filter -F '\t' -g -b everything >> <%= log_directory
%>/location-1000.tsv.log
-# Teahouse filters
-pipe 10 /usr/bin/udp-filter -F '\t' -d en.wikipedia.org -p
/wiki/Wikipedia:Teahouse >> /var/log/squid/teahouse.tab.log
+### Teahouse filters
+pipe 10 /usr/bin/udp-filter -F '\t' -d en.wikipedia.org -p
/wiki/Wikipedia:Teahouse >> <%= log_directory %>/teahouse.tsv.log
-# Arabic Wikipedia Banner Pages - Siko Bouterse <[email protected]>,
Haitham Shammaa <[email protected]>
-pipe 10 /usr/bin/udp-filter -F '\t' -d ar.wikipedia.org -p
'/wiki/%D9%88%D9%8A%D9%83%D9%8A%D8%A8%D9%8A%D8%AF%D9%8A%D8%A7:%D8%A8%D9%88%D8%A7%D8%A8%D8%A9_%D8%A7%D9%84%D9%85%D8%B4%D8%A7%D8%B1%D9%83%D8%A9'
>> /var/log/squid/arabic-banner.tab.log
+### Arabic Wikipedia Banner Pages - Siko Bouterse <[email protected]>,
Haitham Shammaa <[email protected]>
+pipe 10 /usr/bin/udp-filter -F '\t' -d ar.wikipedia.org -p
'/wiki/%D9%88%D9%8A%D9%83%D9%8A%D8%A8%D9%8A%D8%AF%D9%8A%D8%A7:%D8%A8%D9%88%D8%A7%D8%A8%D8%A9_%D8%A7%D9%84%D9%85%D8%B4%D8%A7%D8%B1%D9%83%D8%A9'
>> <%= log_directory %>/arabic-banner.tsv.log
--
To view, visit https://gerrit.wikimedia.org/r/58136
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc0df27fc5860acee79ffa9aadf7b6a8f30944f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
