From 2a20806c719b4f0e8186abb0e7be4369eea4ecdc Mon Sep 17 00:00:00 2001
From: Jen Huang <jen.huang@elastic.co>
Date: Tue, 30 Nov 2021 15:47:15 -0800
Subject: [PATCH] Re-enable registry version check

---
 x-pack/plugins/fleet/server/index.ts                       | 3 +--
 x-pack/plugins/fleet/server/services/epm/registry/index.ts | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/fleet/server/index.ts b/x-pack/plugins/fleet/server/index.ts
index 17425050a4e10..cbada80ffb6e3 100644
--- a/x-pack/plugins/fleet/server/index.ts
+++ b/x-pack/plugins/fleet/server/index.ts
@@ -92,8 +92,7 @@ export const config: PluginConfigDescriptor = {
     outputs: PreconfiguredOutputsSchema,
     agentIdVerificationEnabled: schema.boolean({ defaultValue: true }),
     developer: schema.object({
-      // TODO: change default to false as soon as EPR issue fixed. Blocker for 8.0.
-      disableRegistryVersionCheck: schema.boolean({ defaultValue: true }),
+      disableRegistryVersionCheck: schema.boolean({ defaultValue: false }),
     }),
   }),
 };
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/index.ts b/x-pack/plugins/fleet/server/services/epm/registry/index.ts
index ff829eca5ec18..1b6e28a07f8e0 100644
--- a/x-pack/plugins/fleet/server/services/epm/registry/index.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/index.ts
@@ -138,9 +138,8 @@ export async function fetchFile(filePath: string): Promise<Response> {
 }
 
 function setKibanaVersion(url: URL) {
-  // TODO: change default to false as soon as EPR issue fixed. Blocker for 8.0.
   const disableVersionCheck =
-    appContextService.getConfig()?.developer?.disableRegistryVersionCheck ?? true;
+    appContextService.getConfig()?.developer?.disableRegistryVersionCheck ?? false;
   if (disableVersionCheck) {
     return;
   }