Skip to content

Update X-Ray in config to application signals #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iwysiu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update X-Ray in config to application signals #335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions src/components/ConfigEditor/XrayLinkConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,22 @@ export function XrayLinkConfig({ newFormStyling, datasourceUid, onChange }: Prop

return newFormStyling ? (
<ConfigSection
title="X-ray trace link"
description="Grafana will automatically create a link to a trace in X-ray data source if logs contain @xrayTraceId field"
title="Application Signals trace link"
description="Grafana will automatically create a link to a trace in Application Signals (formerly X-ray) data source if logs contain @xrayTraceId field"
>
{!hasXrayDatasource && (
<Alert
title={
'There is no X-ray datasource to link to. First add an X-ray data source and then link it to Cloud Watch. '
'There is no Application Signals datasource to link to. First add an Application Signals data source and then link it to Cloud Watch. '
}
severity="info"
/>
)}
<Field htmlFor="data-source-picker" label="Data source" description="X-ray data source containing traces">
<Field
htmlFor="data-source-picker"
label="Data source"
description="Application Signals data source containing traces"
>
<DataSourcePicker
pluginId={xRayDsId}
onChange={(ds: DataSourceInstanceSettings) => onChange(ds.uid)}
Expand All @@ -49,16 +53,17 @@ export function XrayLinkConfig({ newFormStyling, datasourceUid, onChange }: Prop
</ConfigSection>
) : (
<>
<h3 className="page-heading">X-ray trace link</h3>
<h3 className="page-heading">Application Signals trace link</h3>

<div className={styles.infoText}>
Grafana will automatically create a link to a trace in X-ray data source if logs contain @xrayTraceId field
Grafana will automatically create a link to a trace in Application Signals (formerly X-ray) data source if logs
contain @xrayTraceId field
</div>

{!hasXrayDatasource && (
<Alert
title={
'There is no X-ray datasource to link to. First add an X-ray data source and then link it to Cloud Watch. '
'There is no Application Signals datasource to link to. First add an Application Signals data source and then link it to Cloud Watch. '
}
severity="info"
/>
Expand All @@ -69,7 +74,7 @@ export function XrayLinkConfig({ newFormStyling, datasourceUid, onChange }: Prop
htmlFor="data-source-picker"
label="Data source"
labelWidth={28}
tooltip="X-ray data source containing traces"
tooltip="Application Signals data source containing traces"
>
<DataSourcePicker
pluginId={xRayDsId}
Expand Down
Loading