From 2149c75e22b0ac05a7977f1e9cac0103a11eac26 Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:31:24 +0100 Subject: [PATCH] Zipkin: Run queries through backend (#97754) * Zipkin: Run queries through backend * ;2DUpdate e2e * Update e2e --- .../configure-grafana/feature-toggles/index.md | 2 +- .../as-admin-user/datasourceConfigPage.spec.ts | 13 +++---------- pkg/services/featuremgmt/registry.go | 3 ++- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.json | 12 ++++++++---- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index c04f6921c24..8ec9eedebd7 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -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 | | `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 | +| `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 | | `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. | | `playlistsWatcher` | Enables experimental watcher for playlists | | `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 | | `crashDetection` | Enables browser crash detection reporting to Faro. | | `jaegerBackendMigration` | Enables querying the Jaeger data source without the proxy | diff --git a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/datasourceConfigPage.spec.ts b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/datasourceConfigPage.spec.ts index 1191f153fb4..bf7ebe37653 100644 --- a/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/datasourceConfigPage.spec.ts +++ b/e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/datasourceConfigPage.spec.ts @@ -24,18 +24,11 @@ test.describe('test createDataSourceConfigPage fixture, saveAndTest and toBeOK m }); test.describe('test data source with frontend only health check', () => { - test('valid credentials should display a success alert on the page', async ({ - createDataSourceConfigPage, - page, - selectors, - }) => { + test('valid credentials should display a success alert on the page', async ({ createDataSourceConfigPage, page }) => { const configPage = await createDataSourceConfigPage({ type: 'zipkin' }); - const healthCheckPath = `${selectors.apis.DataSource.proxy(configPage.datasource.uid)}/api/v2/services`; - await page.route(healthCheckPath, async (route) => { - await route.fulfill({ status: 200, body: 'OK' }); - }); + configPage.mockHealthCheckResponse({ message: 'Data source is working', status: 'OK' }, 200); await page.getByPlaceholder('http://localhost:9411').fill('http://localhost:9411'); - await expect(configPage.saveAndTest({ path: healthCheckPath })).toBeOK(); + await expect(configPage.saveAndTest()).toBeOK(); await expect( configPage, formatExpectError('Expected data source config to display success alert after save') diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 8a1eb2c3477..7537e52b4d6 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1617,8 +1617,9 @@ var ( { Name: "zipkinBackendMigration", Description: "Enables querying Zipkin data source without the proxy", - Stage: FeatureStageExperimental, + Stage: FeatureStageGeneralAvailability, Owner: grafanaOSSBigTent, + Expression: "true", // enabled by default }, { Name: "enableSCIM", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index cd8f3b3cfb4..1fde233fece 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -214,7 +214,7 @@ playlistsWatcher,experimental,@grafana/grafana-app-platform-squad,false,true,fal passwordlessMagicLinkAuthentication,experimental,@grafana/identity-access-team,false,false,false exploreMetricsRelatedLogs,experimental,@grafana/observability-metrics,false,false,true 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 crashDetection,experimental,@grafana/observability-traces-and-profiling,false,false,true jaegerBackendMigration,experimental,@grafana/oss-big-tent,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 4fc648bc0ce..8feb0ce7185 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -3630,13 +3630,17 @@ { "metadata": { "name": "zipkinBackendMigration", - "resourceVersion": "1730907578997", - "creationTimestamp": "2024-11-06T15:39:38Z" + "resourceVersion": "1733846643829", + "creationTimestamp": "2024-11-06T15:39:38Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-12-10 16:04:03.82919 +0000 UTC" + } }, "spec": { "description": "Enables querying Zipkin data source without the proxy", - "stage": "experimental", - "codeowner": "@grafana/oss-big-tent" + "stage": "GA", + "codeowner": "@grafana/oss-big-tent", + "expression": "true" } } ]