Loki: Remove lokiSendDashboardPanelNames toggle (#106991)

This commit is contained in:
Ivana Huckova
2025-06-20 10:06:15 +02:00
committed by GitHub
parent c5243c0908
commit f0fab90072
9 changed files with 9 additions and 34 deletions
@@ -661,10 +661,6 @@ export interface FeatureToggles {
*/
tableNextGen?: boolean;
/**
* Send dashboard and panel names to Loki when querying
*/
lokiSendDashboardPanelNames?: boolean;
/**
* Uses Prometheus rules as the primary source of truth for ruler-enabled data sources
*/
alertingPrometheusRulesPrimary?: boolean;
-6
View File
@@ -1130,12 +1130,6 @@ var (
Owner: grafanaDatavizSquad,
FrontendOnly: true,
},
{
Name: "lokiSendDashboardPanelNames",
Description: "Send dashboard and panel names to Loki when querying",
Stage: FeatureStageExperimental,
Owner: grafanaObservabilityLogsSquad,
},
{
Name: "alertingPrometheusRulesPrimary",
Description: "Uses Prometheus rules as the primary source of truth for ruler-enabled data sources",
-1
View File
@@ -146,7 +146,6 @@ alertingFilterV2,experimental,@grafana/alerting-squad,false,false,false
dataplaneAggregator,experimental,@grafana/grafana-app-platform-squad,false,true,false
newFiltersUI,GA,@grafana/dashboards-squad,false,false,false
tableNextGen,preview,@grafana/dataviz-squad,false,false,true
lokiSendDashboardPanelNames,experimental,@grafana/observability-logs,false,false,false
alertingPrometheusRulesPrimary,experimental,@grafana/alerting-squad,false,false,true
exploreLogsShardSplitting,experimental,@grafana/observability-logs,false,false,true
exploreLogsAggregatedMetrics,experimental,@grafana/observability-logs,false,false,true
1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
146 dataplaneAggregator experimental @grafana/grafana-app-platform-squad false true false
147 newFiltersUI GA @grafana/dashboards-squad false false false
148 tableNextGen preview @grafana/dataviz-squad false false true
lokiSendDashboardPanelNames experimental @grafana/observability-logs false false false
149 alertingPrometheusRulesPrimary experimental @grafana/alerting-squad false false true
150 exploreLogsShardSplitting experimental @grafana/observability-logs false false true
151 exploreLogsAggregatedMetrics experimental @grafana/observability-logs false false true
-4
View File
@@ -595,10 +595,6 @@ const (
// Allows access to the new react-data-grid based table component.
FlagTableNextGen = "tableNextGen"
// FlagLokiSendDashboardPanelNames
// Send dashboard and panel names to Loki when querying
FlagLokiSendDashboardPanelNames = "lokiSendDashboardPanelNames"
// FlagAlertingPrometheusRulesPrimary
// Uses Prometheus rules as the primary source of truth for ruler-enabled data sources
FlagAlertingPrometheusRulesPrimary = "alertingPrometheusRulesPrimary"
+2 -1
View File
@@ -2127,7 +2127,8 @@
"metadata": {
"name": "lokiSendDashboardPanelNames",
"resourceVersion": "1743693517832",
"creationTimestamp": "2024-08-22T19:30:43Z"
"creationTimestamp": "2024-08-22T19:30:43Z",
"deletionTimestamp": "2025-06-19T13:40:02Z"
},
"spec": {
"description": "Send dashboard and panel names to Loki when querying",
+1 -3
View File
@@ -15,7 +15,6 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/tests/testinfra"
"github.com/grafana/grafana/pkg/tests/testsuite"
)
@@ -29,8 +28,7 @@ func TestIntegrationLoki(t *testing.T) {
t.Skip("skipping integration test")
}
dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
DisableAnonymous: true,
EnableFeatureToggles: []string{featuremgmt.FlagLokiSendDashboardPanelNames},
DisableAnonymous: true,
})
grafanaListeningAddr, testEnv := testinfra.StartGrafanaEnv(t, dir, path)
+6 -7
View File
@@ -27,13 +27,12 @@ import (
)
const (
flagLokiLogsDataplane = "lokiLogsDataplane"
flagLokiSendDashboardPanelNames = "lokiSendDashboardPanelNames"
flagLokiRunQueriesInParallel = "lokiRunQueriesInParallel"
flagLokiStructuredMetadata = "lokiStructuredMetadata"
flagLogQLScope = "logQLScope"
flagLokiExperimentalStreaming = "lokiExperimentalStreaming"
fromAlertHeaderName = "FromAlert"
flagLokiLogsDataplane = "lokiLogsDataplane"
flagLokiRunQueriesInParallel = "lokiRunQueriesInParallel"
flagLokiStructuredMetadata = "lokiStructuredMetadata"
flagLogQLScope = "logQLScope"
flagLokiExperimentalStreaming = "lokiExperimentalStreaming"
fromAlertHeaderName = "FromAlert"
)
type Service struct {
@@ -1811,7 +1811,6 @@ describe('LokiDatasource', () => {
});
describe('query', () => {
let featureToggleVal = config.featureToggles.lokiSendDashboardPanelNames;
beforeEach(() => {
setDashboardSrv({
getCurrent: () => ({
@@ -1821,10 +1820,6 @@ describe('LokiDatasource', () => {
} as unknown as DashboardSrv);
const fetchMock = jest.fn().mockReturnValue(of({ data: testLogsResponse }));
setBackendSrv({ ...origBackendSrv, fetch: fetchMock });
config.featureToggles.lokiSendDashboardPanelNames = true;
});
afterEach(() => {
config.featureToggles.lokiSendDashboardPanelNames = featureToggleVal;
});
it('adds dashboard headers', async () => {
@@ -297,9 +297,6 @@ export class LokiDatasource
private getQueryHeaders(request: DataQueryRequest<LokiQuery>): Record<string, string> {
const headers: Record<string, string> = {};
if (!config.featureToggles.lokiSendDashboardPanelNames) {
return headers;
}
// only add headers if we are in the context of a dashboard
if (
[CoreApp.Dashboard.toString(), CoreApp.PanelEditor.toString(), CoreApp.PanelViewer.toString()].includes(