IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CloudMigrations: handle provisioned data source error (#95473)

Browse Source
This commit is contained in:
Matheus Macabu 2024-10-28 12:02:46 +01:00 committed by GitHub
parent 187111368a
commit 69f185b459
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/cloudmigration/api/dtos.go
View File

@ -150,6 +150,7 @@ type ItemErrorCode string
const (
ErrDatasourceNameConflict ItemErrorCode = "DATASOURCE_NAME_CONFLICT"
ErrDatasourceInvalidURL ItemErrorCode = "DATASOURCE_INVALID_URL"
ErrDatasourceAlreadyManaged ItemErrorCode = "DATASOURCE_ALREADY_MANAGED"
ErrFolderNameConflict ItemErrorCode = "FOLDER_NAME_CONFLICT"
ErrDashboardAlreadyManaged ItemErrorCode = "DASHBOARD_ALREADY_MANAGED"
ErrLibraryElementNameConflict ItemErrorCode = "LIBRARY_ELEMENT_NAME_CONFLICT"

1
pkg/services/cloudmigration/model.go
View File

@ -107,6 +107,7 @@ type ResourceErrorCode string
const (
ErrDatasourceNameConflict ResourceErrorCode = "DATASOURCE_NAME_CONFLICT"
ErrDatasourceInvalidURL ResourceErrorCode = "DATASOURCE_INVALID_URL"
ErrDatasourceAlreadyManaged ResourceErrorCode = "DATASOURCE_ALREADY_MANAGED"
ErrFolderNameConflict ResourceErrorCode = "FOLDER_NAME_CONFLICT"
ErrDashboardAlreadyManaged ResourceErrorCode = "DASHBOARD_ALREADY_MANAGED"
ErrLibraryElementNameConflict ResourceErrorCode = "LIBRARY_ELEMENT_NAME_CONFLICT"

1
public/api-enterprise-spec.json
View File

@ -5774,6 +5774,7 @@
"enum": [
"DATASOURCE_NAME_CONFLICT",
"DATASOURCE_INVALID_URL",
"DATASOURCE_ALREADY_MANAGED",
"FOLDER_NAME_CONFLICT",
"DASHBOARD_ALREADY_MANAGED",
"LIBRARY_ELEMENT_NAME_CONFLICT",

1
public/api-merged.json
View File

@ -17267,6 +17267,7 @@
"enum": [
"DATASOURCE_NAME_CONFLICT",
"DATASOURCE_INVALID_URL",
"DATASOURCE_ALREADY_MANAGED",
"FOLDER_NAME_CONFLICT",
"DASHBOARD_ALREADY_MANAGED",
"LIBRARY_ELEMENT_NAME_CONFLICT",

1
public/app/features/migrate-to-cloud/api/endpoints.gen.ts
View File

@ -167,6 +167,7 @@ export type MigrateDataResponseItemDto = {
errorCode?:
| 'DATASOURCE_NAME_CONFLICT'
| 'DATASOURCE_INVALID_URL'
| 'DATASOURCE_ALREADY_MANAGED'
| 'FOLDER_NAME_CONFLICT'
| 'DASHBOARD_ALREADY_MANAGED'
| 'LIBRARY_ELEMENT_NAME_CONFLICT'

5
public/app/features/migrate-to-cloud/onprem/ResourceDetailsModal.tsx
View File

@ -23,6 +23,11 @@ function getTMessage(errorCode: MigrateDataResponseItemDto['errorCode']): string
'migrate-to-cloud.resource-details.error-messages.datasource-invalid-url',
'There is a data source which has an invalid URL. Provide a valid URL and try again.'
);
case 'DATASOURCE_ALREADY_MANAGED':
return t(
'migrate-to-cloud.resource-details.error-messages.datasource-already-managed',
'Data source is already provisioned and managed by Grafana in the cloud instance. If this is a different resource, set another UID and try again.'
);
case 'FOLDER_NAME_CONFLICT':
return t(
'migrate-to-cloud.resource-details.error-messages.folder-name-conflict',

1
public/locales/en-US/grafana.json
View File

@ -1618,6 +1618,7 @@
"dismiss-button": "OK",
"error-messages": {
"dashboard-already-managed": "Dashboard is already provisioned and managed by Grafana in the cloud instance. We recommend using the provisioned dashboard going forward. If you still wish to copy the dashboard to the cloud instance, then change the dashboard ID in the dashboard JSON, save a new snapshot and upload again.",
"datasource-already-managed": "Data source is already provisioned and managed by Grafana in the cloud instance. If this is a different resource, set another UID and try again.",
"datasource-invalid-url": "There is a data source which has an invalid URL. Provide a valid URL and try again.",
"datasource-name-conflict": "There is a data source with the same name in the target instance. Rename one of them and try again.",
"folder-name-conflict": "There is a folder with the same name in the target instance. Rename one of them and try again.",

1
public/locales/pseudo-LOCALE/grafana.json
View File

@ -1618,6 +1618,7 @@
"dismiss-button": "ØĶ",
"error-messages": {
"dashboard-already-managed": "Đäşĥþőäřđ įş äľřęäđy přővįşįőʼnęđ äʼnđ mäʼnäģęđ þy Ğřäƒäʼnä įʼn ŧĥę čľőūđ įʼnşŧäʼnčę. Ŵę řęčőmmęʼnđ ūşįʼnģ ŧĥę přővįşįőʼnęđ đäşĥþőäřđ ģőįʼnģ ƒőřŵäřđ. Ĩƒ yőū şŧįľľ ŵįşĥ ŧő čőpy ŧĥę đäşĥþőäřđ ŧő ŧĥę čľőūđ įʼnşŧäʼnčę, ŧĥęʼn čĥäʼnģę ŧĥę đäşĥþőäřđ ĨĐ įʼn ŧĥę đäşĥþőäřđ ĴŜØŃ, şävę ä ʼnęŵ şʼnäpşĥőŧ äʼnđ ūpľőäđ äģäįʼn.",
"datasource-already-managed": "Đäŧä şőūřčę įş äľřęäđy přővįşįőʼnęđ äʼnđ mäʼnäģęđ þy Ğřäƒäʼnä įʼn ŧĥę čľőūđ įʼnşŧäʼnčę. Ĩƒ ŧĥįş įş ä đįƒƒęřęʼnŧ řęşőūřčę, şęŧ äʼnőŧĥęř ŮĨĐ äʼnđ ŧřy äģäįʼn.",
"datasource-invalid-url": "Ŧĥęřę įş ä đäŧä şőūřčę ŵĥįčĥ ĥäş äʼn įʼnväľįđ ŮŖĿ. Přővįđę ä väľįđ ŮŖĿ äʼnđ ŧřy äģäįʼn.",
"datasource-name-conflict": "Ŧĥęřę įş ä đäŧä şőūřčę ŵįŧĥ ŧĥę şämę ʼnämę įʼn ŧĥę ŧäřģęŧ įʼnşŧäʼnčę. Ŗęʼnämę őʼnę őƒ ŧĥęm äʼnđ ŧřy äģäįʼn.",
"folder-name-conflict": "Ŧĥęřę įş ä ƒőľđęř ŵįŧĥ ŧĥę şämę ʼnämę įʼn ŧĥę ŧäřģęŧ įʼnşŧäʼnčę. Ŗęʼnämę őʼnę őƒ ŧĥęm äʼnđ ŧřy äģäįʼn.",

1
public/openapi3.json
View File

@ -7222,6 +7222,7 @@
"enum": [
"DATASOURCE_NAME_CONFLICT",
"DATASOURCE_INVALID_URL",
"DATASOURCE_ALREADY_MANAGED",
"FOLDER_NAME_CONFLICT",
"DASHBOARD_ALREADY_MANAGED",
"LIBRARY_ELEMENT_NAME_CONFLICT",