[v9.0.x] Traces: Remove serviceMap feature flag (#52433)

This commit is contained in:
Joey Tawadrous
2022-07-19 10:25:12 +01:00
committed by GitHub
parent b026345459
commit 377acb4cdd
5 changed files with 4 additions and 20 deletions
@@ -29,7 +29,6 @@ export interface FeatureToggles {
panelTitleSearch?: boolean;
tempoSearch?: boolean;
tempoBackendSearch?: boolean;
tempoServiceGraph?: boolean;
lokiBackendMode?: boolean;
prometheus_azure_auth?: boolean;
prometheusAzureOverrideAudience?: boolean;
-6
View File
@@ -77,12 +77,6 @@ var (
Description: "Use backend for tempo search",
State: FeatureStateBeta,
},
{
Name: "tempoServiceGraph",
Description: "show service",
State: FeatureStateBeta,
FrontendOnly: true,
},
{
Name: "lokiBackendMode",
Description: "Loki datasource works as backend datasource",
-4
View File
@@ -59,10 +59,6 @@ const (
// Use backend for tempo search
FlagTempoBackendSearch = "tempoBackendSearch"
// FlagTempoServiceGraph
// show service
FlagTempoServiceGraph = "tempoServiceGraph"
// FlagLokiBackendMode
// Loki datasource works as backend datasource
FlagLokiBackendMode = "lokiBackendMode"
@@ -76,12 +76,9 @@ class TempoQueryFieldComponent extends React.PureComponent<Props> {
const queryTypeOptions: Array<SelectableValue<TempoQueryType>> = [
{ value: 'traceId', label: 'TraceID' },
{ value: 'upload', label: 'JSON file' },
{ value: 'serviceMap', label: 'Service Graph' },
];
if (config.featureToggles.tempoServiceGraph) {
queryTypeOptions.push({ value: 'serviceMap', label: 'Service Graph' });
}
if (config.featureToggles.tempoSearch && !datasource?.search?.hide) {
queryTypeOptions.unshift({ value: 'nativeSearch', label: 'Search - Beta' });
}
@@ -33,11 +33,9 @@ export const ConfigEditor: React.FC<Props> = ({ options, onOptionsChange }) => {
</div>
) : null}
{config.featureToggles.tempoServiceGraph && (
<div className="gf-form-group">
<ServiceGraphSettings options={options} onOptionsChange={onOptionsChange} />
</div>
)}
<div className="gf-form-group">
<ServiceGraphSettings options={options} onOptionsChange={onOptionsChange} />
</div>
{config.featureToggles.tempoSearch && (
<div className="gf-form-group">