[MediaWiki-commits] [Gerrit] Remove unused udp2log awk scripts that forwarded to universi... - change (operations/puppet)

2015-01-12 Thread Ottomata (Code Review) 
Ottomata has submitted this change and it was merged.

Change subject: Remove unused udp2log awk scripts that forwarded to universities
..


Remove unused udp2log awk scripts that forwarded to universities

The corresponding udp2log filters have been removed in
* 64848d7a3ed205e8b4b0471c82c6573231c02624 (minnesota.awk)
* b70209dbce9347aeab2ce632c611cd9b0aef536c (vu.awk)

Change-Id: I913af090eb8549a87b32cf21ced7a7dba5a43c1a
---
D files/udp2log/minnesota.awk
D files/udp2log/vu.awk
M manifests/role/logging.pp
3 files changed, 2 insertions(+), 24 deletions(-)

Approvals:
  Ottomata: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/udp2log/minnesota.awk b/files/udp2log/minnesota.awk
deleted file mode 100644
index 4830ff6..000
--- a/files/udp2log/minnesota.awk
+++ /dev/null
@@ -1,3 +0,0 @@
-# University of Minnesota udp2log filter
-
-$5 !~ /^(145\.97\.39\.|66\.230\.200\.|211\.115\.107\.)/ {print $3, $9}
\ No newline at end of file
diff --git a/files/udp2log/vu.awk b/files/udp2log/vu.awk
deleted file mode 100644
index 2b1d715..000
--- a/files/udp2log/vu.awk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Vrije Universiteit udp2log filter
-
-function savemark(url, code) {
-   if (url ~ /action=submit$/  code == TCP_MISS/302)
-   return save
-   return -
-}
-
-$5 !~ /^(145\.97\.39\.|66\.230\.200\.|211\.115\.107\.)/ {
-   print $3, $9, savemark($9, $6)
-}
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index fa116c0..d0a5d4c 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -340,18 +340,10 @@
 }
 
 file { $webrequest_filter_directory/vu.awk:
-ensure = 'file',
-source = 'puppet:///files/udp2log/vu.awk',
-mode   = 0755,
-owner  = 'udp2log',
-group  = 'udp2log',
+ensure = absent,
 }
 file { $webrequest_filter_directory/minnesota.awk:
-ensure = 'file',
-source = 'puppet:///files/udp2log/minnesota.awk',
-mode   = 0755,
-owner  = 'udp2log',
-group  = 'udp2log',
+ensure = absent,
 }
 
 # oxygen run webstatscollector's filter process,

-- 
To view, visit https://gerrit.wikimedia.org/r/184137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I913af090eb8549a87b32cf21ced7a7dba5a43c1a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
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

[MediaWiki-commits] [Gerrit] Remove unused udp2log awk scripts that forwarded to universi... - change (operations/puppet)

2015-01-10 Thread QChris (Code Review) 
Hello Ottomata,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/184137

to review the following change.

Change subject: Remove unused udp2log awk scripts that forwarded to universities
..

Remove unused udp2log awk scripts that forwarded to universities

The corresponding udp2log filters have been removed in
* 64848d7a3ed205e8b4b0471c82c6573231c02624 (minnesota.awk)
* b70209dbce9347aeab2ce632c611cd9b0aef536c (vu.awk)

Change-Id: I913af090eb8549a87b32cf21ced7a7dba5a43c1a
---
D files/udp2log/minnesota.awk
D files/udp2log/vu.awk
M manifests/role/logging.pp
3 files changed, 2 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/184137/1

diff --git a/files/udp2log/minnesota.awk b/files/udp2log/minnesota.awk
deleted file mode 100644
index 4830ff6..000
--- a/files/udp2log/minnesota.awk
+++ /dev/null
@@ -1,3 +0,0 @@
-# University of Minnesota udp2log filter
-
-$5 !~ /^(145\.97\.39\.|66\.230\.200\.|211\.115\.107\.)/ {print $3, $9}
\ No newline at end of file
diff --git a/files/udp2log/vu.awk b/files/udp2log/vu.awk
deleted file mode 100644
index 2b1d715..000
--- a/files/udp2log/vu.awk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Vrije Universiteit udp2log filter
-
-function savemark(url, code) {
-   if (url ~ /action=submit$/  code == TCP_MISS/302)
-   return save
-   return -
-}
-
-$5 !~ /^(145\.97\.39\.|66\.230\.200\.|211\.115\.107\.)/ {
-   print $3, $9, savemark($9, $6)
-}
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index fa116c0..d0a5d4c 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -340,18 +340,10 @@
 }
 
 file { $webrequest_filter_directory/vu.awk:
-ensure = 'file',
-source = 'puppet:///files/udp2log/vu.awk',
-mode   = 0755,
-owner  = 'udp2log',
-group  = 'udp2log',
+ensure = absent,
 }
 file { $webrequest_filter_directory/minnesota.awk:
-ensure = 'file',
-source = 'puppet:///files/udp2log/minnesota.awk',
-mode   = 0755,
-owner  = 'udp2log',
-group  = 'udp2log',
+ensure = absent,
 }
 
 # oxygen run webstatscollector's filter process,

-- 
To view, visit https://gerrit.wikimedia.org/r/184137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I913af090eb8549a87b32cf21ced7a7dba5a43c1a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata o...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits