mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Notifications: Enable display of trace ID by default (#64884)
enable tracing by default
This commit is contained in:
parent
41b0c17aae
commit
9ca01cc070
@ -64,7 +64,6 @@ Alpha features might be changed or removed without prior notice.
|
|||||||
| `lokiDataframeApi` | Use experimental loki api for WebSocket streaming (early prototype) |
|
| `lokiDataframeApi` | Use experimental loki api for WebSocket streaming (early prototype) |
|
||||||
| `storage` | Configurable storage for dashboards, datasources, and resources |
|
| `storage` | Configurable storage for dashboards, datasources, and resources |
|
||||||
| `exploreMixedDatasource` | Enable mixed datasource in Explore |
|
| `exploreMixedDatasource` | Enable mixed datasource in Explore |
|
||||||
| `tracing` | Adds trace ID to error notifications |
|
|
||||||
| `newTraceView` | Shows the new trace view design |
|
| `newTraceView` | Shows the new trace view design |
|
||||||
| `correlations` | Correlations page |
|
| `correlations` | Correlations page |
|
||||||
| `datasourceQueryMultiStatus` | Introduce HTTP 207 Multi Status for api/ds/query |
|
| `datasourceQueryMultiStatus` | Introduce HTTP 207 Multi Status for api/ds/query |
|
||||||
|
@ -37,7 +37,6 @@ export interface FeatureToggles {
|
|||||||
storage?: boolean;
|
storage?: boolean;
|
||||||
k8s?: boolean;
|
k8s?: boolean;
|
||||||
exploreMixedDatasource?: boolean;
|
exploreMixedDatasource?: boolean;
|
||||||
tracing?: boolean;
|
|
||||||
newTraceView?: boolean;
|
newTraceView?: boolean;
|
||||||
correlations?: boolean;
|
correlations?: boolean;
|
||||||
cloudWatchDynamicLabels?: boolean;
|
cloudWatchDynamicLabels?: boolean;
|
||||||
|
@ -128,13 +128,6 @@ var (
|
|||||||
FrontendOnly: true,
|
FrontendOnly: true,
|
||||||
Owner: grafanaExploreSquad,
|
Owner: grafanaExploreSquad,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
Name: "tracing",
|
|
||||||
Description: "Adds trace ID to error notifications",
|
|
||||||
State: FeatureStateAlpha,
|
|
||||||
FrontendOnly: true,
|
|
||||||
Owner: grafanaUserEssentialsSquad,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
Name: "newTraceView",
|
Name: "newTraceView",
|
||||||
Description: "Shows the new trace view design",
|
Description: "Shows the new trace view design",
|
||||||
|
@ -18,7 +18,6 @@ migrationLocking,beta,@grafana/backend-platform,false,false,false,false
|
|||||||
storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
|
storage,alpha,@grafana/grafana-app-platform-squad,false,false,false,false
|
||||||
k8s,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
|
k8s,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
|
||||||
exploreMixedDatasource,alpha,@grafana/explore-squad,false,false,false,true
|
exploreMixedDatasource,alpha,@grafana/explore-squad,false,false,false,true
|
||||||
tracing,alpha,@grafana/user-essentials,false,false,false,true
|
|
||||||
newTraceView,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
|
newTraceView,alpha,@grafana/observability-traces-and-profiling,false,false,false,true
|
||||||
correlations,alpha,@grafana/explore-squad,false,false,false,false
|
correlations,alpha,@grafana/explore-squad,false,false,false,false
|
||||||
cloudWatchDynamicLabels,stable,@grafana/aws-plugins,false,false,false,false
|
cloudWatchDynamicLabels,stable,@grafana/aws-plugins,false,false,false,false
|
||||||
|
|
@ -83,10 +83,6 @@ const (
|
|||||||
// Enable mixed datasource in Explore
|
// Enable mixed datasource in Explore
|
||||||
FlagExploreMixedDatasource = "exploreMixedDatasource"
|
FlagExploreMixedDatasource = "exploreMixedDatasource"
|
||||||
|
|
||||||
// FlagTracing
|
|
||||||
// Adds trace ID to error notifications
|
|
||||||
FlagTracing = "tracing"
|
|
||||||
|
|
||||||
// FlagNewTraceView
|
// FlagNewTraceView
|
||||||
// Shows the new trace view design
|
// Shows the new trace view design
|
||||||
FlagNewTraceView = "newTraceView"
|
FlagNewTraceView = "newTraceView"
|
||||||
|
@ -3,7 +3,6 @@ import React from 'react';
|
|||||||
import { useEffectOnce } from 'react-use';
|
import { useEffectOnce } from 'react-use';
|
||||||
|
|
||||||
import { GrafanaTheme2 } from '@grafana/data';
|
import { GrafanaTheme2 } from '@grafana/data';
|
||||||
import { config } from '@grafana/runtime';
|
|
||||||
import { Alert, useStyles2 } from '@grafana/ui';
|
import { Alert, useStyles2 } from '@grafana/ui';
|
||||||
import { AppNotification, timeoutMap } from 'app/types';
|
import { AppNotification, timeoutMap } from 'app/types';
|
||||||
|
|
||||||
@ -21,8 +20,6 @@ export default function AppNotificationItem({ appNotification, onClearNotificati
|
|||||||
}, timeoutMap[appNotification.severity]);
|
}, timeoutMap[appNotification.severity]);
|
||||||
});
|
});
|
||||||
|
|
||||||
const showTraceId = config.featureToggles.tracing && appNotification.traceId;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Alert
|
<Alert
|
||||||
severity={appNotification.severity}
|
severity={appNotification.severity}
|
||||||
@ -32,7 +29,7 @@ export default function AppNotificationItem({ appNotification, onClearNotificati
|
|||||||
>
|
>
|
||||||
<div className={styles.wrapper}>
|
<div className={styles.wrapper}>
|
||||||
<span>{appNotification.component || appNotification.text}</span>
|
<span>{appNotification.component || appNotification.text}</span>
|
||||||
{showTraceId && <span className={styles.trace}>Trace ID: {appNotification.traceId}</span>}
|
{appNotification.traceId && <span className={styles.trace}>Trace ID: {appNotification.traceId}</span>}
|
||||||
</div>
|
</div>
|
||||||
</Alert>
|
</Alert>
|
||||||
);
|
);
|
||||||
|
@ -3,7 +3,6 @@ import { formatDistanceToNow } from 'date-fns';
|
|||||||
import React, { ReactNode } from 'react';
|
import React, { ReactNode } from 'react';
|
||||||
|
|
||||||
import { GrafanaTheme2 } from '@grafana/data';
|
import { GrafanaTheme2 } from '@grafana/data';
|
||||||
import { config } from '@grafana/runtime';
|
|
||||||
import { Card, Checkbox, useTheme2 } from '@grafana/ui';
|
import { Card, Checkbox, useTheme2 } from '@grafana/ui';
|
||||||
|
|
||||||
export type AlertVariant = 'success' | 'warning' | 'error' | 'info';
|
export type AlertVariant = 'success' | 'warning' | 'error' | 'info';
|
||||||
@ -31,7 +30,6 @@ export const StoredNotificationItem = ({
|
|||||||
}: Props) => {
|
}: Props) => {
|
||||||
const theme = useTheme2();
|
const theme = useTheme2();
|
||||||
const styles = getStyles(theme);
|
const styles = getStyles(theme);
|
||||||
const showTraceId = config.featureToggles.tracing && traceId;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className={className} onClick={onClick}>
|
<Card className={className} onClick={onClick}>
|
||||||
@ -41,7 +39,7 @@ export const StoredNotificationItem = ({
|
|||||||
<Checkbox onChange={onClick} tabIndex={-1} value={isSelected} />
|
<Checkbox onChange={onClick} tabIndex={-1} value={isSelected} />
|
||||||
</Card.Figure>
|
</Card.Figure>
|
||||||
<Card.Tags className={styles.trace}>
|
<Card.Tags className={styles.trace}>
|
||||||
{showTraceId && <span>{`Trace ID: ${traceId}`}</span>}
|
{traceId && <span>{`Trace ID: ${traceId}`}</span>}
|
||||||
{timestamp && formatDistanceToNow(timestamp, { addSuffix: true })}
|
{timestamp && formatDistanceToNow(timestamp, { addSuffix: true })}
|
||||||
</Card.Tags>
|
</Card.Tags>
|
||||||
</Card>
|
</Card>
|
||||||
|
Loading…
Reference in New Issue
Block a user