Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV-46519 Grafana 10 alerting disable get started page #46

Merged
merged 2 commits into from
Oct 9, 2024
Merged

DEV-46519 Grafana 10 alerting disable get started page #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
576e5ac
Permit vimeo host
copyhold Oct 7, 2024
fe4035b
Disable the home alerting page
copyhold Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions custom.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -81,6 +81,6 @@ external_enabled = false
min_refresh_interval = 30s

[log.frontend]
enabled = true
enabled = false
custom_endpoint = log

8 changes: 2 additions & 6 deletions public/app/features/alerting/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down