Ottomata has submitted this change and it was merged.
Change subject: emery: RT #6143 move two logs to erbium
......................................................................
emery: RT #6143 move two logs to erbium
Change-Id: I248299864ffc89ba3547444f4f2c7419e9f2c646
---
M manifests/misc/statistics.pp
M templates/udp2log/filters.emery.erb
M templates/udp2log/filters.erbium.erb
3 files changed, 9 insertions(+), 4 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 1852091..d1ae628 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -536,7 +536,7 @@
# sampled-1000 logs from emery
misc::statistics::rsync_job { "sampled_1000":
- source =>
"emery.wikimedia.org::udp2log/webrequest/archive/sampled-1000*.gz",
+ source =>
"erbium.wikimedia.org::udp2log/webrequest/archive/sampled-1000*.gz",
destination => "/a/squid/archive/sampled",
}
diff --git a/templates/udp2log/filters.emery.erb
b/templates/udp2log/filters.emery.erb
index 9b42b3b..6784566 100644
--- a/templates/udp2log/filters.emery.erb
+++ b/templates/udp2log/filters.emery.erb
@@ -9,5 +9,3 @@
# This log file is also on gadolinium for redundancy
file 1000 <%= log_directory %>/sampled-1000.tsv.log
-## This feeds all http related graphs in graphite / gdash.wikimedia.org
-pipe 2 /usr/local/bin/sqstat 2
diff --git a/templates/udp2log/filters.erbium.erb
b/templates/udp2log/filters.erbium.erb
index a6528cc..9a926fe 100644
--- a/templates/udp2log/filters.erbium.erb
+++ b/templates/udp2log/filters.erbium.erb
@@ -24,4 +24,11 @@
pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php >> <%=
webrequest_log_directory %>/api-usage.tsv.log
### GLAM NARA / National Archives - RT 2212
-#pipe 10 /usr/bin/udp-filter -F '\t' -p _NARA_ -g -b country >>
<%=log_directory %>/glam_nara.tsv.log
+pipe 10 /usr/bin/udp-filter -F '\t' -p _NARA_ -g -b country >>
<%=log_directory %>/glam_nara.tsv.log
+
+### This feeds all http related graphs in graphite / gdash.wikimedia.org
+pipe 2 /usr/local/bin/sqstat 2
+
+### 0.0001 of all udp2log messages
+## This log file is also on gadolinium for redundancy
+file 1000 <%= log_directory %>/sampled-1000.tsv.log
--
To view, visit https://gerrit.wikimedia.org/r/110382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I248299864ffc89ba3547444f4f2c7419e9f2c646
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
