apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix feature toggle conflict

Browse Source
pull/95351/head
Ihor Yeromin 1 year ago
parent 815b42232b
commit 1ebdbaa87d
4 changed files with 6 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
  2. 3
      packages/grafana-data/src/types/featureToggles.gen.ts
  3. 3
      pkg/services/featuremgmt/toggles_gen.csv
  4. 9
      pkg/services/featuremgmt/toggles_gen.go

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

@ -196,9 +196,8 @@ Experimental features might be changed or removed without prior notice.
| `failWrongDSUID` | Throws an error if a datasource has an invalid UIDs |
| `alertingApiServer` | Register Alerting APIs with the K8s API server |
| `dataplaneAggregator` | Enable grafana dataplane aggregator |
| `adhocFilterOneOf` | Exposes a new 'one of' operator for ad-hoc filters. This operator allows users to filter by multiple values in a single filter. |
| `tableNG` | Allows access to the new react-data-grid based table component. |
| `newFiltersUI` | Enables new combobox style UI for the Ad hoc filters variable in scenes architecture |
| `tableNG` | Allows access to the new react-data-grid based table component. |
| `lokiSendDashboardPanelNames` | Send dashboard and panel names to Loki when querying |
| `alertingPrometheusRulesPrimary` | Uses Prometheus rules as the primary source of truth for ruler-enabled data sources |
| `singleTopNav` | Unifies the top search bar and breadcrumb bar into one |

3
packages/grafana-data/src/types/featureToggles.gen.ts
Unescape View File

@ -203,9 +203,8 @@ export interface FeatureToggles {
prometheusAzureOverrideAudience?: boolean;
alertingFilterV2?: boolean;
dataplaneAggregator?: boolean;
adhocFilterOneOf?: boolean;
tableNG?: boolean;
newFiltersUI?: boolean;
tableNG?: boolean;
lokiSendDashboardPanelNames?: boolean;
alertingPrometheusRulesPrimary?: boolean;
singleTopNav?: boolean;

3
pkg/services/featuremgmt/toggles_gen.csv
Unescape View File

@ -184,9 +184,8 @@ cloudwatchMetricInsightsCrossAccount,preview,@grafana/aws-datasources,false,fals
prometheusAzureOverrideAudience,deprecated,@grafana/partner-datasources,false,false,false
alertingFilterV2,experimental,@grafana/alerting-squad,false,false,false
dataplaneAggregator,experimental,@grafana/grafana-app-platform-squad,false,true,false
adhocFilterOneOf,experimental,@grafana/dashboards-squad,false,false,false
tableNG,experimental,@grafana/mesa-verde,false,false,false
newFiltersUI,experimental,@grafana/dashboards-squad,false,false,false
tableNG,experimental,@grafana/mesa-verde,false,false,false
lokiSendDashboardPanelNames,experimental,@grafana/observability-logs,false,false,false
alertingPrometheusRulesPrimary,experimental,@grafana/alerting-squad,false,false,true
singleTopNav,experimental,@grafana/grafana-frontend-platform,false,false,true

1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
184 prometheusAzureOverrideAudience deprecated @grafana/partner-datasources false false false
185 alertingFilterV2 experimental @grafana/alerting-squad false false false
186 dataplaneAggregator experimental @grafana/grafana-app-platform-squad false true false
adhocFilterOneOf experimental @grafana/dashboards-squad false false false
tableNG experimental @grafana/mesa-verde false false false
187 newFiltersUI experimental @grafana/dashboards-squad false false false
188 tableNG experimental @grafana/mesa-verde false false false
189 lokiSendDashboardPanelNames experimental @grafana/observability-logs false false false
190 alertingPrometheusRulesPrimary experimental @grafana/alerting-squad false false true
191 singleTopNav experimental @grafana/grafana-frontend-platform false false true

9
pkg/services/featuremgmt/toggles_gen.go
Unescape View File

@ -747,16 +747,13 @@ const (
// Enable grafana dataplane aggregator
FlagDataplaneAggregator = "dataplaneAggregator"
// FlagAdhocFilterOneOf
// Exposes a new 'one of' operator for ad-hoc filters. This operator allows users to filter by multiple values in a single filter.
FlagAdhocFilterOneOf = "adhocFilterOneOf"
// FlagNewFiltersUI
// Enables new combobox style UI for the Ad hoc filters variable in scenes architecture
FlagNewFiltersUI = "newFiltersUI"
// FlagTableNG
// Allows access to the new react-data-grid based table component.
FlagTableNG = "tableNG"
// FlagNewFiltersUI
// Enables new combobox style UI for the Ad hoc filters variable in scenes architecture
FlagNewFiltersUI = "newFiltersUI"
// FlagLokiSendDashboardPanelNames
// Send dashboard and panel names to Loki when querying

Write Preview
Loading…
Cancel
Save