diff --git a/extensions/arc/package.json b/extensions/arc/package.json index 1153265480..aca015a4bd 100644 --- a/extensions/arc/package.json +++ b/extensions/arc/package.json @@ -1040,7 +1040,7 @@ "pages": [ { "title": "%arc.sql.wizard.page1.title%", - "labelWidth": "190px", + "labelWidth": "250px", "inputWidth": "280px", "sections": [ { @@ -1363,13 +1363,34 @@ "min": 1, "required": true }, + { + "type": "readonly_text", + "label": "", + "labelWidth": "600px", + "enabled": true, + "fieldHeight": "12px" + }, { "label": "%arc.storage-class.backups.label%", "description": "%arc.sql.storage-class.backups.description%", "variableName": "AZDATA_NB_VAR_SQL_STORAGE_CLASS_BACKUPS", - "type": "kube_storage_class", + "type": "text", + "fieldHeight": "5px", "required": false }, + { + "type": "readonly_text", + "label": "%arc.storage-class.backups.warning%", + "labelWidth": "600px", + "enabled": true, + "fieldHeight": "1px", + "links": [ + { + "text": "%arc.storage-class.backups.warning.link%", + "url": "https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes" + } + ] + }, { "label": "%arc.sql.volume.size.backups.label%", "description": "%arc.sql.volume.size.backups.description%", @@ -1377,7 +1398,15 @@ "type": "number", "defaultValue": "5", "min": 1, - "required": true + "required": true, + "fieldHeight": "5px" + }, + { + "type": "readonly_text", + "label": "", + "labelWidth": "600px", + "enabled": true, + "fieldHeight": "12px" }, { "label": "%arc.cores-request.label%", @@ -1493,7 +1522,7 @@ "valueProvider": { "providerId": "params-to-billable-replicas", "triggerFields": [ - "AZDATA_NB_VAR_READABLE_SECONDARIES" + "AZDATA_NB_VAR_SQL_READABLE_SECONDARIES" ] } }, @@ -1509,7 +1538,7 @@ "AZDATA_NB_VAR_SQL_DEV_USE", "AZDATA_NB_VAR_SQL_SERVICE_TIER", "AZDATA_NB_VAR_SQL_LICENSE_TYPE", - "AZDATA_NB_VAR_READABLE_SECONDARIES" + "AZDATA_NB_VAR_SQL_READABLE_SECONDARIES" ] } }, @@ -1525,7 +1554,7 @@ "AZDATA_NB_VAR_SQL_DEV_USE", "AZDATA_NB_VAR_SQL_SERVICE_TIER", "AZDATA_NB_VAR_SQL_LICENSE_TYPE", - "AZDATA_NB_VAR_READABLE_SECONDARIES" + "AZDATA_NB_VAR_SQL_READABLE_SECONDARIES" ] } } diff --git a/extensions/arc/package.nls.json b/extensions/arc/package.nls.json index 58bd0ea8cc..903376aaea 100644 --- a/extensions/arc/package.nls.json +++ b/extensions/arc/package.nls.json @@ -150,8 +150,10 @@ "arc.storage-class.logs.label": "Storage Class (Logs)", "arc.sql.storage-class.logs.description": "The storage class to be used for logs (/var/log). If no value is specified, the default storage class will be used.", "arc.postgres.storage-class.logs.description": "The storage class to be used for logs persistent volumes", + "arc.storage-class.backups.warning": "({0})", + "arc.storage-class.backups.warning.link": "RWX capable", "arc.storage-class.backups.label": "Storage Class (Backups)", - "arc.sql.storage-class.backups.description": "The storage class to be used for backup persistent volumes. If no value is specified, the default storage class will be used.", + "arc.sql.storage-class.backups.description": "The storage class to be used for Backups. If no value is specified, backups will be stored in same storage class assigned to Data. Must be a RWX capable storage class.", "arc.sql.volume.size.data.label": "Volume Size in Gi (Data)", "arc.sql.volume.size.data.description": "The size of the storage volume to be used for data in gibibytes.", "arc.sql.volume.size.datalogs.label": "Volume Size in Gi (Database logs)", diff --git a/extensions/arc/src/common/pricingUtils.ts b/extensions/arc/src/common/pricingUtils.ts index 52cc9a4b0f..a68a6fc2de 100644 --- a/extensions/arc/src/common/pricingUtils.ts +++ b/extensions/arc/src/common/pricingUtils.ts @@ -44,7 +44,7 @@ export const serviceTierVarName = 'AZDATA_NB_VAR_SQL_SERVICE_TIER'; export const devUseVarName = 'AZDATA_NB_VAR_SQL_DEV_USE'; export const vcoresLimitVarName = 'AZDATA_NB_VAR_SQL_CORES_LIMIT'; export const licenseTypeVarName = 'AZDATA_NB_VAR_SQL_LICENSE_TYPE'; -export const readableSecondaries = 'AZDATA_NB_VAR_READABLE_SECONDARIES'; +export const readableSecondaries = 'AZDATA_NB_VAR_SQL_READABLE_SECONDARIES'; // Gets number of replicas charged export function numBillableReplicas(mapping: { [key: string]: InputValueType }): number {