diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d88636c3bc3..28f48105a82 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -116,7 +116,7 @@ /pkg/apimachinery @grafana/grafana-app-platform-squad /pkg/apimachinery/identity/ @grafana/identity-squad /pkg/apimachinery/errutil/ @grafana/grafana-backend-group -/pkg/promlib @grafana/observability-metrics +/pkg/promlib @grafana/oss-big-tent /pkg/storage/ @grafana/grafana-search-and-storage /pkg/services/annotations/ @grafana/grafana-search-and-storage /pkg/services/apikey/ @grafana/identity-squad @@ -178,7 +178,7 @@ # Logs code, developers environment /devenv/docker/blocks/loki* @grafana/observability-logs /devenv/docker/blocks/elastic* @grafana/aws-datasources -/devenv/docker/blocks/self-instrumentation* @grafana/observability-metrics +/devenv/docker/blocks/self-instrumentation* @grafana/oss-big-tent /devenv/bulk-dashboards/ @grafana/dashboards-squad /devenv/bulk-folders/ @grafana/grafana-frontend-platform @@ -264,9 +264,9 @@ /devenv/docker/blocks/opentsdb/ @grafana/partner-datasources /devenv/docker/blocks/postgres/ @grafana/oss-big-tent /devenv/docker/blocks/postgres_tests/ @grafana/oss-big-tent -/devenv/docker/blocks/prometheus/ @grafana/observability-metrics -/devenv/docker/blocks/prometheus_random_data/ @grafana/observability-metrics -/devenv/docker/blocks/prometheus_high_card/ @grafana/observability-metrics +/devenv/docker/blocks/prometheus/ @grafana/oss-big-tent +/devenv/docker/blocks/prometheus_random_data/ @grafana/oss-big-tent +/devenv/docker/blocks/prometheus_high_card/ @grafana/oss-big-tent /devenv/docker/blocks/pyroscope/ @grafana/observability-traces-and-profiling /devenv/docker/blocks/redis/ @bergquist /devenv/docker/blocks/sensugo/ @grafana/grafana-backend-group @@ -314,7 +314,7 @@ /pkg/tsdb/cloud-monitoring/ @grafana/partner-datasources # Observability backend code -/pkg/tsdb/prometheus/ @grafana/observability-metrics +/pkg/tsdb/prometheus/ @grafana/oss-big-tent /pkg/tsdb/elasticsearch/ @grafana/aws-datasources /pkg/tsdb/loki/ @grafana/observability-logs /pkg/tsdb/tempo/ @grafana/observability-traces-and-profiling @@ -396,7 +396,7 @@ /packages/grafana-o11y-ds-frontend/src/TraceToMetrics/ @grafana/observability-traces-and-profiling /packages/grafana-o11y-ds-frontend/src/TraceToProfiles/ @grafana/observability-traces-and-profiling /packages/grafana-plugin-configs/ @grafana/plugins-platform-frontend -/packages/grafana-prometheus/ @grafana/observability-metrics +/packages/grafana-prometheus/ @grafana/oss-big-tent /packages/grafana-schema/src/**/*canvas* @grafana/dataviz-squad /packages/grafana-schema/src/**/*tempo* @grafana/observability-traces-and-profiling /packages/grafana-sql/ @grafana/partner-datasources @grafana/oss-big-tent @@ -576,7 +576,7 @@ playwright.config.ts @grafana/plugins-platform-frontend /public/app/features/explore/Logs/ @grafana/observability-logs -/public/app/features/explore/RawPrometheus/ @grafana/observability-metrics +/public/app/features/explore/RawPrometheus/ @grafana/oss-big-tent /public/app/features/explore/NodeGraph/ @grafana/observability-traces-and-profiling /public/app/features/explore/FlameGraph/ @grafana/observability-traces-and-profiling @@ -656,7 +656,7 @@ playwright.config.ts @grafana/plugins-platform-frontend /public/app/plugins/datasource/mysql/ @grafana/oss-big-tent /public/app/plugins/datasource/opentsdb/ @grafana/partner-datasources /public/app/plugins/datasource/grafana-postgresql-datasource/ @grafana/oss-big-tent -/public/app/plugins/datasource/prometheus/ @grafana/observability-metrics +/public/app/plugins/datasource/prometheus/ @grafana/oss-big-tent /public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources /public/app/plugins/datasource/zipkin/ @grafana/oss-big-tent /public/app/plugins/datasource/tempo/ @grafana/observability-traces-and-profiling diff --git a/.github/commands.json b/.github/commands.json index e79e5e860ed..64f636d7224 100644 --- a/.github/commands.json +++ b/.github/commands.json @@ -96,7 +96,7 @@ "name": "datasource/Prometheus", "action": "addToProject", "addToProject": { - "url": "https://github.com/orgs/grafana/projects/112" + "url": "https://github.com/orgs/grafana/projects/457" } }, { diff --git a/go.mod b/go.mod index 16d80864a8e..a0300b54f7b 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( // This needs to be here for other projects that import grafana/grafana // For local development grafana/grafana will always use the local files // Check go.work file for details - github.com/grafana/grafana/pkg/promlib v0.0.6 // @grafana/observability-metrics + github.com/grafana/grafana/pkg/promlib v0.0.6 // @grafana/oss-big-tent github.com/grafana/grafana/pkg/semconv v0.0.0-20240808213237-f4d2e064f435 // @grafana/grafana-app-platform-squad github.com/grafana/otel-profiling-go v0.5.1 // @grafana/grafana-backend-group github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // @grafana/observability-traces-and-profiling @@ -180,7 +180,7 @@ require ( golang.org/x/text v0.21.0 // @grafana/grafana-backend-group golang.org/x/time v0.6.0 // @grafana/grafana-backend-group golang.org/x/tools v0.28.0 // @grafana/grafana-as-code - gonum.org/v1/gonum v0.15.1 // @grafana/observability-metrics + gonum.org/v1/gonum v0.15.1 // @grafana/oss-big-tent google.golang.org/api v0.193.0 // @grafana/grafana-backend-group google.golang.org/grpc v1.68.1 // @grafana/plugins-platform-backend google.golang.org/protobuf v1.35.2 // @grafana/plugins-platform-backend @@ -457,7 +457,7 @@ require ( require github.com/phpdave11/gofpdi v1.0.13 // @grafana/sharing-squad require ( - github.com/google/go-querystring v1.1.0 // indirect; @grafana/observability-metrics + github.com/google/go-querystring v1.1.0 // indirect; @grafana/oss-big-tent github.com/grafana/e2e v0.1.1 // @grafana-app-platform-squad ) diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 27bae82dafe..dfa777c630d 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -277,7 +277,7 @@ var ( Description: "Query InfluxDB InfluxQL without the proxy", Stage: FeatureStageGeneralAvailability, FrontendOnly: true, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaPartnerPluginsSquad, Expression: "true", // enabled by default AllowSelfServe: false, }, @@ -285,21 +285,21 @@ var ( Name: "influxqlStreamingParser", Description: "Enable streaming JSON parser for InfluxDB datasource InfluxQL query language", Stage: FeatureStageExperimental, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaPartnerPluginsSquad, }, { Name: "influxdbRunQueriesInParallel", Description: "Enables running InfluxDB Influxql queries in parallel", Stage: FeatureStagePrivatePreview, FrontendOnly: false, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaPartnerPluginsSquad, }, { Name: "prometheusRunQueriesInParallel", Description: "Enables running Prometheus queries in parallel", Stage: FeatureStagePrivatePreview, FrontendOnly: false, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaOSSBigTent, }, { Name: "lokiLogsDataplane", @@ -806,14 +806,14 @@ var ( Description: "Prometheus and AI/ML to assist users in creating a query", Stage: FeatureStageExperimental, FrontendOnly: true, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaOSSBigTent, }, { Name: "prometheusCodeModeMetricNamesSearch", Description: "Enables search for metric names in Code Mode, to improve performance when working with an enormous number of metric names", FrontendOnly: true, Stage: FeatureStageExperimental, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaOSSBigTent, }, { Name: "addFieldFromCalculationStatFunctions", @@ -1058,7 +1058,7 @@ var ( Name: "promQLScope", Description: "In-development feature that will allow injection of labels into prometheus queries.", Stage: FeatureStageGeneralAvailability, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaOSSBigTent, Expression: "true", }, { @@ -1191,7 +1191,7 @@ var ( Description: "In server-side expressions, disable the sorting of numeric-kind metrics by their metric name or labels.", Stage: FeatureStageExperimental, FrontendOnly: false, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaOSSBigTent, RequiresRestart: true, }, { @@ -1544,7 +1544,7 @@ var ( Name: "prometheusUsesCombobox", Description: "Use new combobox component for Prometheus query editor", Stage: FeatureStageExperimental, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaOSSBigTent, }, { Name: "userStorageAPI", @@ -1595,7 +1595,7 @@ var ( Description: "Adds support for quotes and special characters in label values for Prometheus queries", FrontendOnly: true, Stage: FeatureStageExperimental, - Owner: grafanaObservabilityMetricsSquad, + Owner: grafanaOSSBigTent, }, { Name: "enableExtensionsAdminPage", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index ad5a9881e02..5ed9666bde6 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -34,10 +34,10 @@ lokiShardSplitting,experimental,@grafana/observability-logs,false,false,true lokiQuerySplitting,GA,@grafana/observability-logs,false,false,true lokiQuerySplittingConfig,experimental,@grafana/observability-logs,false,false,true individualCookiePreferences,experimental,@grafana/grafana-backend-group,false,false,false -influxdbBackendMigration,GA,@grafana/observability-metrics,false,false,true -influxqlStreamingParser,experimental,@grafana/observability-metrics,false,false,false -influxdbRunQueriesInParallel,privatePreview,@grafana/observability-metrics,false,false,false -prometheusRunQueriesInParallel,privatePreview,@grafana/observability-metrics,false,false,false +influxdbBackendMigration,GA,@grafana/partner-datasources,false,false,true +influxqlStreamingParser,experimental,@grafana/partner-datasources,false,false,false +influxdbRunQueriesInParallel,privatePreview,@grafana/partner-datasources,false,false,false +prometheusRunQueriesInParallel,privatePreview,@grafana/oss-big-tent,false,false,false lokiLogsDataplane,experimental,@grafana/observability-logs,false,false,false dataplaneFrontendFallback,GA,@grafana/observability-metrics,false,false,true disableSSEDataplane,experimental,@grafana/observability-metrics,false,false,false @@ -106,8 +106,8 @@ teamHttpHeaders,preview,@grafana/identity-access-team,false,false,false cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false panelTitleSearchInV1,experimental,@grafana/search-and-storage,true,false,false managedPluginsInstall,GA,@grafana/plugins-platform-backend,false,false,false -prometheusPromQAIL,experimental,@grafana/observability-metrics,false,false,true -prometheusCodeModeMetricNamesSearch,experimental,@grafana/observability-metrics,false,false,true +prometheusPromQAIL,experimental,@grafana/oss-big-tent,false,false,true +prometheusCodeModeMetricNamesSearch,experimental,@grafana/oss-big-tent,false,false,true addFieldFromCalculationStatFunctions,GA,@grafana/dataviz-squad,false,false,true alertmanagerRemoteSecondary,experimental,@grafana/alerting-squad,false,false,false alertmanagerRemotePrimary,experimental,@grafana/alerting-squad,false,false,false @@ -139,7 +139,7 @@ onPremToCloudMigrations,preview,@grafana/grafana-operator-experience-squad,false onPremToCloudMigrationsAuthApiMig,experimental,@grafana/grafana-operator-experience-squad,false,false,false alertingSaveStatePeriodic,privatePreview,@grafana/alerting-squad,false,false,false scopeApi,experimental,@grafana/grafana-app-platform-squad,false,false,false -promQLScope,GA,@grafana/observability-metrics,false,false,false +promQLScope,GA,@grafana/oss-big-tent,false,false,false logQLScope,privatePreview,@grafana/observability-logs,false,false,false sqlExpressions,experimental,@grafana/grafana-app-platform-squad,false,false,false nodeGraphDotLayout,experimental,@grafana/observability-traces-and-profiling,false,false,true @@ -156,7 +156,7 @@ oauthRequireSubClaim,experimental,@grafana/identity-access-team,false,false,fals newDashboardWithFiltersAndGroupBy,experimental,@grafana/dashboards-squad,false,false,false cloudWatchNewLabelParsing,GA,@grafana/aws-datasources,false,false,false accessActionSets,GA,@grafana/identity-access-team,false,false,false -disableNumericMetricsSortingInExpressions,experimental,@grafana/observability-metrics,false,true,false +disableNumericMetricsSortingInExpressions,experimental,@grafana/oss-big-tent,false,true,false grafanaManagedRecordingRules,experimental,@grafana/alerting-squad,false,false,false queryLibrary,experimental,@grafana/grafana-frontend-platform,false,false,false logsExploreTableDefaultVisualization,experimental,@grafana/observability-logs,false,false,true @@ -204,14 +204,14 @@ unifiedStorageSearchSprinkles,experimental,@grafana/search-and-storage,false,fal pluginsSriChecks,experimental,@grafana/plugins-platform-backend,false,false,false unifiedStorageBigObjectsSupport,experimental,@grafana/search-and-storage,false,false,false timeRangeProvider,experimental,@grafana/grafana-frontend-platform,false,false,false -prometheusUsesCombobox,experimental,@grafana/observability-metrics,false,false,false +prometheusUsesCombobox,experimental,@grafana/oss-big-tent,false,false,false userStorageAPI,experimental,@grafana/plugins-platform-backend,false,false,false azureMonitorDisableLogLimit,GA,@grafana/partner-datasources,false,false,false preinstallAutoUpdate,GA,@grafana/plugins-platform-backend,false,false,false playlistsReconciler,experimental,@grafana/grafana-app-platform-squad,false,true,false passwordlessMagicLinkAuthentication,experimental,@grafana/identity-access-team,false,false,false exploreMetricsRelatedLogs,experimental,@grafana/observability-metrics,false,false,true -prometheusSpecialCharsInLabelValues,experimental,@grafana/observability-metrics,false,false,true +prometheusSpecialCharsInLabelValues,experimental,@grafana/oss-big-tent,false,false,true enableExtensionsAdminPage,experimental,@grafana/plugins-platform-backend,false,true,false zipkinBackendMigration,GA,@grafana/oss-big-tent,false,false,false enableSCIM,experimental,@grafana/identity-access-team,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 90a15c08bba..28f51669b5e 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1208,13 +1208,16 @@ { "metadata": { "name": "disableNumericMetricsSortingInExpressions", - "resourceVersion": "1718727528075", - "creationTimestamp": "2024-04-16T14:52:47Z" + "resourceVersion": "1735845919509", + "creationTimestamp": "2024-04-16T14:52:47Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" + } }, "spec": { "description": "In server-side expressions, disable the sorting of numeric-kind metrics by their metric name or labels.", "stage": "experimental", - "codeowner": "@grafana/observability-metrics", + "codeowner": "@grafana/oss-big-tent", "requiresRestart": true } }, @@ -1822,17 +1825,17 @@ { "metadata": { "name": "influxdbBackendMigration", - "resourceVersion": "1720021873452", + "resourceVersion": "1735845919509", "creationTimestamp": "2022-02-09T18:26:16Z", "deletionTimestamp": "2023-01-17T14:11:26Z", "annotations": { - "grafana.app/updatedTimestamp": "2024-07-03 15:51:13.452477 +0000 UTC" + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" } }, "spec": { "description": "Query InfluxDB InfluxQL without the proxy", "stage": "GA", - "codeowner": "@grafana/observability-metrics", + "codeowner": "@grafana/partner-datasources", "frontend": true, "expression": "true" } @@ -1840,25 +1843,31 @@ { "metadata": { "name": "influxdbRunQueriesInParallel", - "resourceVersion": "1718727528075", - "creationTimestamp": "2024-02-01T10:58:24Z" + "resourceVersion": "1735845919509", + "creationTimestamp": "2024-02-01T10:58:24Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" + } }, "spec": { "description": "Enables running InfluxDB Influxql queries in parallel", "stage": "privatePreview", - "codeowner": "@grafana/observability-metrics" + "codeowner": "@grafana/partner-datasources" } }, { "metadata": { "name": "influxqlStreamingParser", - "resourceVersion": "1718727528075", - "creationTimestamp": "2023-11-29T17:29:35Z" + "resourceVersion": "1735845919509", + "creationTimestamp": "2023-11-29T17:29:35Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" + } }, "spec": { "description": "Enable streaming JSON parser for InfluxDB datasource InfluxQL query language", "stage": "experimental", - "codeowner": "@grafana/observability-metrics" + "codeowner": "@grafana/partner-datasources" } }, { @@ -2881,16 +2890,16 @@ { "metadata": { "name": "promQLScope", - "resourceVersion": "1724076197892", + "resourceVersion": "1735845919509", "creationTimestamp": "2024-01-29T20:22:17Z", "annotations": { - "grafana.app/updatedTimestamp": "2024-08-19 14:03:17.892558375 +0000 UTC" + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" } }, "spec": { "description": "In-development feature that will allow injection of labels into prometheus queries.", "stage": "GA", - "codeowner": "@grafana/observability-metrics", + "codeowner": "@grafana/oss-big-tent", "expression": "true" } }, @@ -2914,13 +2923,16 @@ { "metadata": { "name": "prometheusCodeModeMetricNamesSearch", - "resourceVersion": "1718727528075", - "creationTimestamp": "2024-04-04T20:38:23Z" + "resourceVersion": "1735845919509", + "creationTimestamp": "2024-04-04T20:38:23Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" + } }, "spec": { "description": "Enables search for metric names in Code Mode, to improve performance when working with an enormous number of metric names", "stage": "experimental", - "codeowner": "@grafana/observability-metrics", + "codeowner": "@grafana/oss-big-tent", "frontend": true } }, @@ -2995,54 +3007,63 @@ { "metadata": { "name": "prometheusPromQAIL", - "resourceVersion": "1718727528075", - "creationTimestamp": "2023-10-19T15:45:32Z" + "resourceVersion": "1735845919509", + "creationTimestamp": "2023-10-19T15:45:32Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" + } }, "spec": { "description": "Prometheus and AI/ML to assist users in creating a query", "stage": "experimental", - "codeowner": "@grafana/observability-metrics", + "codeowner": "@grafana/oss-big-tent", "frontend": true } }, { "metadata": { "name": "prometheusRunQueriesInParallel", - "resourceVersion": "1720677541862", - "creationTimestamp": "2024-08-12T12:31:39Z" + "resourceVersion": "1735845919509", + "creationTimestamp": "2024-08-12T12:31:39Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" + } }, "spec": { "description": "Enables running Prometheus queries in parallel", "stage": "privatePreview", - "codeowner": "@grafana/observability-metrics" + "codeowner": "@grafana/oss-big-tent" } }, { "metadata": { "name": "prometheusSpecialCharsInLabelValues", - "resourceVersion": "1734047568531", - "creationTimestamp": "2024-12-12T23:52:48Z" + "resourceVersion": "1735845919509", + "creationTimestamp": "2024-12-12T23:52:48Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" + } }, "spec": { "description": "Adds support for quotes and special characters in label values for Prometheus queries", "stage": "experimental", - "codeowner": "@grafana/observability-metrics", + "codeowner": "@grafana/oss-big-tent", "frontend": true } }, { "metadata": { "name": "prometheusUsesCombobox", - "resourceVersion": "1726140033271", + "resourceVersion": "1735845919509", "creationTimestamp": "2024-09-12T11:19:18Z", "annotations": { - "grafana.app/updatedTimestamp": "2024-09-12 11:20:33.271822988 +0000 UTC" + "grafana.app/updatedTimestamp": "2025-01-02 19:25:19.509884 +0000 UTC" } }, "spec": { "description": "Use new combobox component for Prometheus query editor", "stage": "experimental", - "codeowner": "@grafana/observability-metrics" + "codeowner": "@grafana/oss-big-tent" } }, {