Joal has submitted this change and it was merged. Change subject: Remove single use of x_forwarded_for in insert_hourly_pagecounts.hq ......................................................................
Remove single use of x_forwarded_for in insert_hourly_pagecounts.hq We will soon no longer send this field from varnish. client_ip and ip are populated by varnish by parsing x_forwarded_for. See also: https://gerrit.wikimedia.org/r/#/c/253474 Bug: T118557 Change-Id: I6c735118f2e2c72f561bab532b9c198160c2a0e7 --- M hive/webrequest/create_webrequest_raw_table.hql M hive/webrequest/create_webrequest_table.hql M oozie/pagecounts-all-sites/load/insert_hourly_pagecounts.hql 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Joal: Verified; Looks good to me, approved diff --git a/hive/webrequest/create_webrequest_raw_table.hql b/hive/webrequest/create_webrequest_raw_table.hql index de4d6c4..49cdddc 100644 --- a/hive/webrequest/create_webrequest_raw_table.hql +++ b/hive/webrequest/create_webrequest_raw_table.hql @@ -31,7 +31,7 @@ `uri_query` string COMMENT 'Query of request', `content_type` string COMMENT 'Content-Type header of response', `referer` string COMMENT 'Referer header of request', - `x_forwarded_for` string COMMENT 'X-Forwarded-For header of request', + `x_forwarded_for` string COMMENT 'X-Forwarded-For header of request (deprecated)', `user_agent` string COMMENT 'User-Agent header of request', `accept_language` string COMMENT 'Accept-Language header of request', `x_analytics` string COMMENT 'X-Analytics header of response', diff --git a/hive/webrequest/create_webrequest_table.hql b/hive/webrequest/create_webrequest_table.hql index fcbbf8d..d204747 100644 --- a/hive/webrequest/create_webrequest_table.hql +++ b/hive/webrequest/create_webrequest_table.hql @@ -30,7 +30,7 @@ `uri_query` string COMMENT 'Query of request', `content_type` string COMMENT 'Content-Type header of response', `referer` string COMMENT 'Referer header of request', - `x_forwarded_for` string COMMENT 'X-Forwarded-For header of request', + `x_forwarded_for` string COMMENT 'X-Forwarded-For header of request (deprecated)', `user_agent` string COMMENT 'User-Agent header of request', `accept_language` string COMMENT 'Accept-Language header of request', `x_analytics` string COMMENT 'X-Analytics header of response', diff --git a/oozie/pagecounts-all-sites/load/insert_hourly_pagecounts.hql b/oozie/pagecounts-all-sites/load/insert_hourly_pagecounts.hql index 0fc9a02..c054203 100644 --- a/oozie/pagecounts-all-sites/load/insert_hourly_pagecounts.hql +++ b/oozie/pagecounts-all-sites/load/insert_hourly_pagecounts.hql @@ -65,7 +65,7 @@ '208.80.155.', '91.198.174.' ) - ) OR x_forwarded_for != '-' + ) ) AND SUBSTR(uri_path, 1, 31) != '/wiki/Special:CentralAutoLogin/' AND http_status NOT IN ( '301', '302', '303' ) -- To view, visit https://gerrit.wikimedia.org/r/279132 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c735118f2e2c72f561bab532b9c198160c2a0e7 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: master Gerrit-Owner: Ottomata <[email protected]> Gerrit-Reviewer: Joal <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
