Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112587
Change subject: remove locke from puppet,dsh,dhcpd,ud2log filter
..
remove locke from puppet,dsh,dhcpd,ud2log filter
RT #6168
can be decom'ed anytime per ottomata
delete from dsh groups, ganglia comment, logging
role, site.pp, dhcpd and ...
delete udp2log/filters.locke.erb
Andrew, can the filter file really go or is that
just a name and used on gadolinium now or something
Change-Id: I3fe32f4830289ad297a4335472db8137d09cd21a
---
M files/dsh/group/ALL
M files/dsh/group/misc_pmtpa
M files/dsh/group/pmtpa
M manifests/ganglia.pp
M manifests/role/logging.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
D templates/udp2log/filters.locke.erb
8 files changed, 2 insertions(+), 178 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/112587/1
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index 0d7120a..4a03b22 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -12,7 +12,6 @@
lvs2
lvs3
lvs4
-locke
db9
db10
palladium
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 7552d28..7f12df8 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -9,7 +9,6 @@
hume
kaulen
linne
-locke
manutius
maurus
mchenry
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index 106fc55..41c1676 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -6,7 +6,6 @@
hume
kaulen
linne
-locke
mchenry
sanger
sockpuppet
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index ad9a568..76653e4 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -612,7 +612,7 @@
# # You can describe the same graphs to add with $items.
# # $graphs is just a shortcut. aggregate_graphs in $items
# # are a bit overly verbose.
-# $host_regex = 'locke|emery|oxygen|gadolinium'
+# $host_regex = 'emery|oxygen|gadolinium'
# ganglia::view { 'udp2log':
# graphs = [
# {
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index ef75791..c271b59 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -1,6 +1,6 @@
# logging (udp2log) servers
-# base node definition from which logging nodes (emery, locke, oxygen, etc)
+# base node definition from which logging nodes (emery, oxygen, etc)
# inherit. Note that there is no real node named base_analytics_logging_node.
# This is done as a base node primarily so that we can override the
# $nagios_contact_group variable.
diff --git a/manifests/site.pp b/manifests/site.pp
index 02afcb2..9054ac5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1037,24 +1037,6 @@
class { ganglia_new::monitor::aggregator: sites = [esams] }
}
-# base_analytics_logging_node is defined in role/logging.pp
-
-node locke.wikimedia.org inherits base_analytics_logging_node {
-include
-accounts::dsc,
-accounts::tstarling,
-accounts::datasets,
-accounts::milimetric,
-accounts::tnegrin, # RT 5391
-misc::udp2log::utilities,
-misc::udp2log
-
-sudo_user { otto: privileges = ['ALL = NOPASSWD: ALL'] }
-
-# fundraising banner log pipeline (moved to gadolinium)
-#include misc::fundraising::udp2log_rotation
-}
-
node manutius.wikimedia.org {
$corerouters = [
cr1-sdtpa.wikimedia.org,
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
index 1d93727..601ea80 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -58,11 +58,6 @@
fixed-address linne.wikimedia.org;
}
-host locke {
- hardware ethernet 00:18:8b:44:6c:d0;
- fixed-address locke.wikimedia.org;
-}
-
host lvs1 {
hardware ethernet 00:1e:c9:ab:80:4e;
fixed-address lvs1.wikimedia.org;
diff --git a/templates/udp2log/filters.locke.erb
b/templates/udp2log/filters.locke.erb
deleted file mode 100644
index 233adef..000
--- a/templates/udp2log/filters.locke.erb
+++ /dev/null
@@ -1,150 +0,0 @@
-###
-This file managed by puppet.
-###
-
-# udp2log packet loss monitoring
-pipe 10 /usr/bin/packet-loss 10 '\t' /a/squid/packet-loss.log
-
-## Fundraising
-# Landing pages
-#pipe 1 /usr/bin/udp-filter -F '\t' -d
wikimediafoundation.org,donate.wikimedia.org
/a/squid/fundraising/logs/landingpages.tab.log
-
-# Banner Impressions
-#pipe 100 /usr/bin/udp-filter -F '\t' -p
Special:RecordImpression\?banner=,Special:RecordImpression\?result=
/a/squid/fundraising/logs/bannerImpressions-sampled100.tab.log
-
-
-
-
-
-
-
-
-
-
- MOVED TO GADOLINIUM:
-
-# 0.001 of all udp2log messages
-# This log file is also on emery for redundancy
-#file 1000 /a/squid/sampled-1000.tab.log
-
-# All edits
