root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 197 Packages Projects Releases Wiki Activity

Zipkin: Run queries through backend (#97754) 

* Zipkin: Run queries through backend

* ;2DUpdate e2e

* Update e2e
This commit is contained in:
Ivana Huckova 2024-12-11 11:31:24 +01:00 committed by GitHub
parent cdc7c1cae2
commit 2149c75e22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
View File

@ -81,6 +81,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
| `singleTopNav` | Unifies the top search bar and breadcrumb bar into one | Yes | | `singleTopNav` | Unifies the top search bar and breadcrumb bar into one | Yes |
| `azureMonitorDisableLogLimit` | Disables the log limit restriction for Azure Monitor when true. The limit is enabled by default. | | | `azureMonitorDisableLogLimit` | Disables the log limit restriction for Azure Monitor when true. The limit is enabled by default. | |
| `preinstallAutoUpdate` | Enables automatic updates for pre-installed plugins | Yes | | `preinstallAutoUpdate` | Enables automatic updates for pre-installed plugins | Yes |
| `zipkinBackendMigration` | Enables querying Zipkin data source without the proxy | Yes |
| `alertingUIOptimizeReducer` | Enables removing the reducer from the alerting UI when creating a new alert rule and using instant query | Yes | | `alertingUIOptimizeReducer` | Enables removing the reducer from the alerting UI when creating a new alert rule and using instant query | Yes |
| `azureMonitorEnableUserAuth` | Enables user auth for Azure Monitor datasource only | Yes | | `azureMonitorEnableUserAuth` | Enables user auth for Azure Monitor datasource only | Yes |
@ -221,7 +222,6 @@ Experimental features might be changed or removed without prior notice.
| `dashboardSchemaV2` | Enables the new dashboard schema version 2, implementing changes necessary for dynamic dashboards and dashboards as code. | | `dashboardSchemaV2` | Enables the new dashboard schema version 2, implementing changes necessary for dynamic dashboards and dashboards as code. |
| `playlistsWatcher` | Enables experimental watcher for playlists | | `playlistsWatcher` | Enables experimental watcher for playlists |
| `enableExtensionsAdminPage` | Enables the extension admin page regardless of development mode | | `enableExtensionsAdminPage` | Enables the extension admin page regardless of development mode |
| `zipkinBackendMigration` | Enables querying Zipkin data source without the proxy |
| `enableSCIM` | Enables SCIM support for user and group management | | `enableSCIM` | Enables SCIM support for user and group management |
| `crashDetection` | Enables browser crash detection reporting to Faro. | | `crashDetection` | Enables browser crash detection reporting to Faro. |
| `jaegerBackendMigration` | Enables querying the Jaeger data source without the proxy | | `jaegerBackendMigration` | Enables querying the Jaeger data source without the proxy |

13
e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/datasourceConfigPage.spec.ts
View File

@ -24,18 +24,11 @@ test.describe('test createDataSourceConfigPage fixture, saveAndTest and toBeOK m
}); });
test.describe('test data source with frontend only health check', () => { test.describe('test data source with frontend only health check', () => {
test('valid credentials should display a success alert on the page', async ({ test('valid credentials should display a success alert on the page', async ({ createDataSourceConfigPage, page }) => {
createDataSourceConfigPage,
page,
selectors,
}) => {
const configPage = await createDataSourceConfigPage({ type: 'zipkin' }); const configPage = await createDataSourceConfigPage({ type: 'zipkin' });
const healthCheckPath = `${selectors.apis.DataSource.proxy(configPage.datasource.uid)}/api/v2/services`; configPage.mockHealthCheckResponse({ message: 'Data source is working', status: 'OK' }, 200);
await page.route(healthCheckPath, async (route) => {
await route.fulfill({ status: 200, body: 'OK' });
});
await page.getByPlaceholder('http://localhost:9411').fill('http://localhost:9411'); await page.getByPlaceholder('http://localhost:9411').fill('http://localhost:9411');
await expect(configPage.saveAndTest({ path: healthCheckPath })).toBeOK(); await expect(configPage.saveAndTest()).toBeOK();
await expect( await expect(
configPage, configPage,
formatExpectError('Expected data source config to display success alert after save') formatExpectError('Expected data source config to display success alert after save')

3
pkg/services/featuremgmt/registry.go
View File

@ -1617,8 +1617,9 @@ var (
{ {
Name: "zipkinBackendMigration", Name: "zipkinBackendMigration",
Description: "Enables querying Zipkin data source without the proxy", Description: "Enables querying Zipkin data source without the proxy",
Stage: FeatureStageExperimental, Stage: FeatureStageGeneralAvailability,
Owner: grafanaOSSBigTent, Owner: grafanaOSSBigTent,
Expression: "true", // enabled by default
}, },
{ {
Name: "enableSCIM", Name: "enableSCIM",

2
pkg/services/featuremgmt/toggles_gen.csv
View File

@ -214,7 +214,7 @@ playlistsWatcher,experimental,@grafana/grafana-app-platform-squad,false,true,fal
passwordlessMagicLinkAuthentication,experimental,@grafana/identity-access-team,false,false,false passwordlessMagicLinkAuthentication,experimental,@grafana/identity-access-team,false,false,false
exploreMetricsRelatedLogs,experimental,@grafana/observability-metrics,false,false,true exploreMetricsRelatedLogs,experimental,@grafana/observability-metrics,false,false,true
enableExtensionsAdminPage,experimental,@grafana/plugins-platform-backend,false,true,false enableExtensionsAdminPage,experimental,@grafana/plugins-platform-backend,false,true,false
zipkinBackendMigration,experimental,@grafana/oss-big-tent,false,false,false zipkinBackendMigration,GA,@grafana/oss-big-tent,false,false,false
enableSCIM,experimental,@grafana/identity-access-team,false,false,false enableSCIM,experimental,@grafana/identity-access-team,false,false,false
crashDetection,experimental,@grafana/observability-traces-and-profiling,false,false,true crashDetection,experimental,@grafana/observability-traces-and-profiling,false,false,true
jaegerBackendMigration,experimental,@grafana/oss-big-tent,false,false,false jaegerBackendMigration,experimental,@grafana/oss-big-tent,false,false,false

1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
214 passwordlessMagicLinkAuthentication experimental @grafana/identity-access-team false false false
215 exploreMetricsRelatedLogs experimental @grafana/observability-metrics false false true
216 enableExtensionsAdminPage experimental @grafana/plugins-platform-backend false true false
217 zipkinBackendMigration experimental GA @grafana/oss-big-tent false false false
218 enableSCIM experimental @grafana/identity-access-team false false false
219 crashDetection experimental @grafana/observability-traces-and-profiling false false true
220 jaegerBackendMigration experimental @grafana/oss-big-tent false false false

12
pkg/services/featuremgmt/toggles_gen.json
View File

@ -3630,13 +3630,17 @@
{ {
"metadata": { "metadata": {
"name": "zipkinBackendMigration", "name": "zipkinBackendMigration",
"resourceVersion": "1730907578997", "resourceVersion": "1733846643829",
"creationTimestamp": "2024-11-06T15:39:38Z" "creationTimestamp": "2024-11-06T15:39:38Z",
"annotations": {
"grafana.app/updatedTimestamp": "2024-12-10 16:04:03.82919 +0000 UTC"
}
}, },
"spec": { "spec": {
"description": "Enables querying Zipkin data source without the proxy", "description": "Enables querying Zipkin data source without the proxy",
"stage": "experimental", "stage": "GA",
"codeowner": "@grafana/oss-big-tent" "codeowner": "@grafana/oss-big-tent",
"expression": "true"
} }
} }
] ]