Merge branch 'v10.4.x-logzio' of github.com:logzio/data-viz-next into…

… v10.4.x-logzio
logzio · Oct 9, 2024 · 893f99a · 893f99a
2 parents bb61023 + eca87be
commit 893f99a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/custom.ini b/custom.ini
@@ -62,7 +62,7 @@ disable_gravatar = true
 allow_embedding = true
 x_xss_protection = true
 content_security_policy = true
-content_security_policy_template = """script-src *.guides.logz.io *.pendo.io pendo-io-static.storage.googleapis.com pendo-static-6219552081182720.storage.googleapis.com 'unsafe-eval' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src *.guides.logz.io *.pendo.io pendo-io-static.storage.googleapis.com pendo-static-6219552081182720.storage.googleapis.com 'self' 'unsafe-inline' blob:;img-src services.arcgisonline.com *.tile.openstreetmap.org  *.cartocdn.com *.guides.logz.io *.pendo.io pendo-io-static.storage.googleapis.com pendo-static-6219552081182720.storage.googleapis.com 'self' data: *.global.ssl.fastly.net *.iconfinder.com;base-uri 'self';connect-src *.guides.logz.io *.pendo.io pendo-io-static.storage.googleapis.com pendo-static-6219552081182720.storage.googleapis.com 'self' grafana.com;manifest-src 'self';media-src 'none';block-all-mixed-content;frame-src 'self' https://www.youtube.com;"""
+content_security_policy_template = """script-src *.guides.logz.io *.pendo.io pendo-io-static.storage.googleapis.com pendo-static-6219552081182720.storage.googleapis.com 'unsafe-eval' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src *.guides.logz.io *.pendo.io pendo-io-static.storage.googleapis.com pendo-static-6219552081182720.storage.googleapis.com 'self' 'unsafe-inline' blob:;img-src services.arcgisonline.com *.tile.openstreetmap.org  *.cartocdn.com *.guides.logz.io *.pendo.io pendo-io-static.storage.googleapis.com pendo-static-6219552081182720.storage.googleapis.com 'self' data: *.global.ssl.fastly.net *.iconfinder.com;base-uri 'self';connect-src *.guides.logz.io *.pendo.io pendo-io-static.storage.googleapis.com pendo-static-6219552081182720.storage.googleapis.com 'self' grafana.com;manifest-src 'self';media-src 'none';block-all-mixed-content;frame-src 'self' *.vimeo.com https://www.youtube.com;"""
 
 [dashboards]
 min_refresh_interval = 30s

diff --git a/public/app/features/alerting/routes.tsx b/public/app/features/alerting/routes.tsx
@@ -103,16 +103,12 @@ const unifiedRoutes: RouteDescriptor[] = [
   ...commonRoutes,
   {
     path: '/alerting',
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingHome" */ 'app/features/alerting/unified/home/Home')
-    ),
+    component: () => <Redirect to={'/alerting/list'} />, // LOGZ.IO CHANGE :: DEV-46520 - DISABLE ALERTING HOME
   },
   {
     path: '/alerting/home',
     exact: false,
-    component: SafeDynamicImport(
-      () => import(/* webpackChunkName: "AlertingHome" */ 'app/features/alerting/unified/home/Home')
-    ),
+    component: () => <Redirect to={'/alerting/list'} />, // LOGZ.IO CHANGE :: DEV-46520 - DISABLE ALERTING HOME
   },
   {
     path: '/alerting/list',