diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d0207f4c4d3..6f6c712d417 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -278,6 +278,7 @@ /pkg/tsdb/mysql/ @grafana/oss-big-tent /pkg/tsdb/grafana-postgresql-datasource/ @grafana/oss-big-tent /pkg/tsdb/zipkin/ @grafana/oss-big-tent +/pkg/tsdb/jaeger/ @grafana/oss-big-tent # Partner Datasources backend code /pkg/tsdb/mssql/ @grafana/partner-datasources 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 fab815be73a..3b1ba4e21de 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -223,6 +223,7 @@ Experimental features might be changed or removed without prior notice. | `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 | ## Development feature toggles diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 3d27b8456cf..cb6ac1c9e56 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -237,5 +237,6 @@ export interface FeatureToggles { zipkinBackendMigration?: boolean; enableSCIM?: boolean; crashDetection?: boolean; + jaegerBackendMigration?: boolean; reportingUseRawTimeRange?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 235197f6e30..5ded2146b25 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1637,6 +1637,12 @@ var ( Owner: grafanaObservabilityTracesAndProfilingSquad, FrontendOnly: true, }, + { + Name: "jaegerBackendMigration", + Description: "Enables querying the Jaeger data source without the proxy", + Stage: FeatureStageExperimental, + Owner: grafanaOSSBigTent, + }, { Name: "reportingUseRawTimeRange", Description: "Uses the original report or dashboard time range instead of making an absolute transformation", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 16125721adb..aa60cb4ba3a 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -218,4 +218,5 @@ enableExtensionsAdminPage,experimental,@grafana/plugins-platform-backend,false,t zipkinBackendMigration,experimental,@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 reportingUseRawTimeRange,preview,@grafana/sharing-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 37231dcc9d4..262fca16761 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -883,6 +883,10 @@ const ( // Enables browser crash detection reporting to Faro. FlagCrashDetection = "crashDetection" + // FlagJaegerBackendMigration + // Enables querying the Jaeger data source without the proxy + FlagJaegerBackendMigration = "jaegerBackendMigration" + // FlagReportingUseRawTimeRange // Uses the original report or dashboard time range instead of making an absolute transformation FlagReportingUseRawTimeRange = "reportingUseRawTimeRange" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 9f844717dbd..3c4ec27c279 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1741,6 +1741,18 @@ "codeowner": "@grafana/observability-metrics" } }, + { + "metadata": { + "name": "jaegerBackendMigration", + "resourceVersion": "1731599633815", + "creationTimestamp": "2024-11-14T15:53:53Z" + }, + "spec": { + "description": "Enables querying the Jaeger data source without the proxy", + "stage": "experimental", + "codeowner": "@grafana/oss-big-tent" + } + }, { "metadata": { "name": "jitterAlertRulesWithinGroups", diff --git a/pkg/tsdb/jaeger/plugin.go b/pkg/tsdb/jaeger/plugin.go new file mode 100644 index 00000000000..17974e553c4 --- /dev/null +++ b/pkg/tsdb/jaeger/plugin.go @@ -0,0 +1 @@ +package jaeger