Page MenuHomePhabricator
Create Task
Maniphest T361884

Remove $wgIPInfoGeoIP2EnterprisePath from production config
Closed, ResolvedPublic
Actions

Description

$wgIPInfoGeoIP2EnterprisePath was added to WMF production config in T304604.

Now that we are using data from Spur instead of the MaxMind GeoIP2 Enterprise database, we can unset this config.

We still need to use $wgIPInfoGeoLite2Prefix to get geographical, ISP, ASN and organization data.

Details

SubjectRepoBranchLines +/-
IPInfo: Switch to using GeoLite2 dataoperations/mediawiki-configmaster+1 -1
IPInfo: Set GeoLite2Prefix pathoperations/mediawiki-configmaster+6 -4
Revert "IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath"operations/mediawiki-configmaster+9 -2
IPInfo: Remove $wgIPInfoGeoIP2EnterprisePathoperations/mediawiki-configmaster+2 -9
Customize query in gerrit

Related Objects
Search...

Event Timeline

Tchanders created this task.Apr 4 2024, 8:37 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptApr 4 2024, 8:37 PM
gerritbot added a comment.Apr 4 2024, 8:40 PM

Change #1017152 had a related patch set uploaded (by Tchanders; author: Tchanders):

[operations/mediawiki-config@master] IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath

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

gerritbot added a project: Patch-For-Review.Apr 4 2024, 8:40 PM
Dreamy_Jazz moved this task from Priority Backlog to Needs Review on the Trust and Safety Product Sprint (Sprint Tabla (1st - 14th April)) board.Apr 8 2024, 12:13 PM
Tchanders added a subscriber: STran.Apr 17 2024, 4:04 PM

I noticed that IPInfo only gets ISP from MaxMind's Enterprise database: https://gerrit.wikimedia.org/g/mediawiki/extensions/IPInfo/+/b1f9ab1370da79619911c754c875155ceecb81cb/src/InfoRetriever/GeoLite2InfoRetriever.php#196

I think this is OK though, since we get organization from Spur.

@STran Does that sound OK to you?

Tchanders edited projects, added Trust and Safety Product Sprint (Sprint Pennywhistle (23rd April - 3rd May)); removed Trust and Safety Product Sprint (Sprint Tabla (1st - 14th April)).Apr 23 2024, 10:54 AM
Tchanders edited projects, added Trust and Safety Product Sprint (Sprint Shekere (13th May - 24th May)); removed Trust and Safety Product Sprint (Sprint Pennywhistle (23rd April - 3rd May)).May 13 2024, 9:24 AM

Having spoken to @STran this is fine.

Tchanders moved this task from Priority Backlog to Ready on the Trust and Safety Product Sprint (Sprint Shekere (13th May - 24th May)) board.May 13 2024, 9:28 AM
Tchanders moved this task from Ready to In Progress on the Trust and Safety Product Sprint (Sprint Shekere (13th May - 24th May)) board.May 13 2024, 2:59 PM
gerritbot added a comment.May 13 2024, 8:40 PM

Change #1017152 merged by jenkins-bot:

[operations/mediawiki-config@master] IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath

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

Stashbot added a comment.May 13 2024, 8:40 PM

Mentioned in SAL (#wikimedia-operations) [2024-05-13T20:40:31Z] <ebernhardson@deploy1002> Started scap: Backport for [[gerrit:1017152|IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath (T361884)]]

Stashbot added a comment.May 13 2024, 8:42 PM

Mentioned in SAL (#wikimedia-operations) [2024-05-13T20:42:54Z] <ebernhardson@deploy1002> ebernhardson and tchanders: Backport for [[gerrit:1017152|IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath (T361884)]] synced to the testservers (https://wikitech.wikimedia.org/wiki/Mwdebug)

Stashbot added a comment.May 13 2024, 8:57 PM

Mentioned in SAL (#wikimedia-operations) [2024-05-13T20:57:54Z] <ebernhardson@deploy1002> Finished scap: Backport for [[gerrit:1017152|IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath (T361884)]] (duration: 17m 22s)

Maintenance_bot removed a project: Patch-For-Review.May 13 2024, 9:31 PM
Tchanders moved this task from In Progress to Done on the Trust and Safety Product Sprint (Sprint Shekere (13th May - 24th May)) board.May 15 2024, 3:41 PM
kostajh mentioned this in T355393: Provide fallbacks when source is missing data.Thu, May 30, 11:25 AM
kostajh mentioned this in T366272: Update puppet configuration to use GeoLite2 (free) instead of GeoIP2-Enterprise data.Thu, May 30, 12:42 PM
gerritbot added a comment.Thu, May 30, 2:06 PM

Change #1037139 had a related patch set uploaded (by Tchanders; author: Tchanders):

[operations/mediawiki-config@master] Revert "IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath"

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

gerritbot added a project: Patch-For-Review.Thu, May 30, 2:06 PM
gerritbot added a comment.Thu, May 30, 8:55 PM

Change #1037139 merged by jenkins-bot:

[operations/mediawiki-config@master] Revert "IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath"

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

Stashbot added a comment.Thu, May 30, 8:55 PM

Mentioned in SAL (#wikimedia-operations) [2024-05-30T20:55:56Z] <cjming@deploy1002> Started scap: Backport for [[gerrit:1037139|Revert "IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath" (T361884)]]

Stashbot added a comment.Thu, May 30, 8:58 PM

Mentioned in SAL (#wikimedia-operations) [2024-05-30T20:58:23Z] <cjming@deploy1002> tchanders and cjming: Backport for [[gerrit:1037139|Revert "IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath" (T361884)]] synced to the testservers (https://wikitech.wikimedia.org/wiki/Mwdebug)

Stashbot added a comment.Thu, May 30, 9:07 PM

Mentioned in SAL (#wikimedia-operations) [2024-05-30T21:07:40Z] <cjming@deploy1002> Finished scap: Backport for [[gerrit:1037139|Revert "IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath" (T361884)]] (duration: 11m 43s)

Maintenance_bot removed a project: Patch-For-Review.Thu, May 30, 9:31 PM
kostajh moved this task from Sprint Shekere (13th May - 24th May) to Sprint Melodica (Jun 3 - Jun 14) on the Trust and Safety Product Sprint board.Mon, Jun 3, 10:08 AM
kostajh edited projects, added Trust and Safety Product Sprint (Sprint Melodica (Jun 3 - Jun 14)); removed Trust and Safety Product Sprint (Sprint Shekere (13th May - 24th May)).
Tchanders added a comment.Mon, Jun 3, 10:08 AM

We'll remove the config again after T366272: Update puppet configuration to use GeoLite2 (free) instead of GeoIP2-Enterprise data is ready.

kostajh changed the task status from Open to Stalled.Mon, Jun 3, 10:08 AM
kostajh added a subtask: T366272: Update puppet configuration to use GeoLite2 (free) instead of GeoIP2-Enterprise data.
kostajh subscribed.

Marking as stalled on the subtask.

gerritbot added a comment.Mon, Jun 3, 6:42 PM

Change #1038421 had a related patch set uploaded (by Kosta Harlan; author: Kosta Harlan):

[operations/mediawiki-config@master] IPInfo: Set GeoLite2Prefix path

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

gerritbot added a project: Patch-For-Review.Mon, Jun 3, 6:42 PM
gerritbot added a comment.Tue, Jun 4, 10:55 AM

Change #1038723 had a related patch set uploaded (by Kosta Harlan; author: Kosta Harlan):

[operations/mediawiki-config@master] IPInfo: Remove $wgIPInfoGeoIP2EnterprisePath and use GeoLite2 data

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

gerritbot added a comment.Wed, Jun 5, 8:09 PM

Change #1038421 abandoned by Kosta Harlan:

[operations/mediawiki-config@master] IPInfo: Set GeoLite2Prefix path

Reason:

Going with I0489439c6eceb96ef00e0f0ef16ceb168a0067c9 instead

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

gerritbot added a comment.Mon, Jun 10, 7:40 AM

Change #1038723 merged by jenkins-bot:

[operations/mediawiki-config@master] IPInfo: Switch to using GeoLite2 data

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

Stashbot added a comment.Mon, Jun 10, 7:41 AM

Mentioned in SAL (#wikimedia-operations) [2024-06-10T07:41:17Z] <kharlan@deploy1002> Started scap: Backport for [[gerrit:1038723|IPInfo: Switch to using GeoLite2 data (T361884)]]

Stashbot added a comment.Mon, Jun 10, 7:57 AM

Mentioned in SAL (#wikimedia-operations) [2024-06-10T07:57:44Z] <kharlan@deploy1002> kharlan: Backport for [[gerrit:1038723|IPInfo: Switch to using GeoLite2 data (T361884)]] synced to the testservers (https://wikitech.wikimedia.org/wiki/Mwdebug)

Stashbot added a comment.Mon, Jun 10, 7:59 AM

Mentioned in SAL (#wikimedia-operations) [2024-06-10T07:59:46Z] <kharlan@deploy1002> Started scap: Backport for [[gerrit:1038723|IPInfo: Switch to using GeoLite2 data (T361884)]]

Stashbot added a comment.Mon, Jun 10, 8:02 AM

Mentioned in SAL (#wikimedia-operations) [2024-06-10T08:02:54Z] <kharlan@deploy1002> kharlan: Backport for [[gerrit:1038723|IPInfo: Switch to using GeoLite2 data (T361884)]] synced to the testservers (https://wikitech.wikimedia.org/wiki/Mwdebug)

Stashbot added a comment.Mon, Jun 10, 8:13 AM

Mentioned in SAL (#wikimedia-operations) [2024-06-10T08:13:54Z] <kharlan@deploy1002> Finished scap: Backport for [[gerrit:1038723|IPInfo: Switch to using GeoLite2 data (T361884)]] (duration: 14m 07s)

kostajh changed the task status from Stalled to Open.Mon, Jun 10, 8:25 AM
kostajh moved this task from Priority Backlog to Done on the Trust and Safety Product Sprint (Sprint Melodica (Jun 3 - Jun 14)) board.
kostajh added a subscriber: dom_walden.

I am not sure that this needs QA. @dom_walden do you have an opinion on this?

During deployment, I verified a couple of IP addresses and noted that in some cases the address information (city level) varied between enterprise level and GeoLite2. In one case, the GeoLite2 data was more specific; in another case, the Enterprise data was more specific. In several cases, there was no difference in the data.

kostajh closed subtask T366272: Update puppet configuration to use GeoLite2 (free) instead of GeoIP2-Enterprise data as Resolved.Mon, Jun 10, 8:27 AM
Maintenance_bot removed a project: Patch-For-Review.Mon, Jun 10, 8:30 AM
dom_walden added a comment.Mon, Jun 10, 12:39 PM
In T361884#9874424, @kostajh wrote:

I am not sure that this needs QA. @dom_walden do you have an opinion on this?

During deployment, I verified a couple of IP addresses and noted that in some cases the address information (city level) varied between enterprise level and GeoLite2. In one case, the GeoLite2 data was more specific; in another case, the Enterprise data was more specific. In several cases, there was no difference in the data.

I guess if you are seeing data for GeoLite2 that is enough. Unless there are any other risks we can think of, we probably don't need to do anymore testing.

kostajh closed this task as Resolved.Tue, Jun 11, 5:34 AM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL