From 7fe6c8be1056dd9a5419f7dfeae3587ee4a14ead Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Thu, 20 Dec 2018 12:23:36 -0100 Subject: [PATCH] mgr/dashboard: Add missing frontend I18N Fixes: http://tracker.ceph.com/issues/36719 Signed-off-by: Tiago Melo --- .../rbd-details/rbd-details.component.html | 206 ++++---- .../rbd-snapshot-actions.model.ts | 147 +++--- .../rbd-snapshot-list.component.spec.ts | 7 +- .../rbd-snapshot-list.component.ts | 2 +- .../rbd-trash-move-modal.component.html | 9 +- .../osd-details/osd-details.component.spec.ts | 5 +- .../osd-recv-speed-modal.component.ts | 8 +- .../osd-recv-speed-modal.priorities.ts | 45 -- .../osd-reweight-modal.component.spec.ts | 4 +- .../erasure-code-profile-form-tooltips.ts | 64 --- .../erasure-code-profile-form.component.html | 5 +- .../erasure-code-profile-form.component.ts | 3 +- .../app/ceph/pool/pool-form/pool-form-data.ts | 27 +- .../rgw-user-details.component.html | 3 +- .../auth/user-form/user-form.component.ts | 3 +- .../api/erasure-code-profile.service.spec.ts | 4 +- .../api/erasure-code-profile.service.ts | 69 ++- .../src/app/shared/api/osd.service.spec.ts | 4 +- .../src/app/shared/api/osd.service.ts | 49 +- .../select-badges-messages.model.ts | 26 +- .../select-badges.component.spec.ts | 5 +- .../select-badges/select-badges.component.ts | 5 +- .../shared/services/task-message.service.ts | 90 ++-- .../frontend/src/locale/messages.xlf | 450 ++++++++++++++---- 24 files changed, 783 insertions(+), 457 deletions(-) delete mode 100755 src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.priorities.ts delete mode 100644 src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-tooltips.ts diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html index 92cd89c122f03..28546d0d04856 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html @@ -1,5 +1,5 @@ -
+ Only available for RBD images with fast-diff enabled @@ -8,106 +8,110 @@ heading="Details"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name{{ selectedItem.name }}
Pool{{ selectedItem.pool_name }}
Data Pool{{ selectedItem.data_pool | empty }}
Created{{ selectedItem.timestamp | cdDate }}
Size{{ selectedItem.size | dimlessBinary }}
Objects{{ selectedItem.num_objs | dimless }}
Object size{{ selectedItem.obj_size | dimlessBinary }}
Features - - {{ feature }} - -
Provisioned - - N/A - - - {{ selectedItem.disk_usage | dimlessBinary }} - -
Total provisioned - - N/A - - - {{ selectedItem.total_disk_usage | dimlessBinary }} - -
Striping unit{{ selectedItem.stripe_unit | dimlessBinary }}
Striping count{{ selectedItem.stripe_count }}
Parent - {{ selectedItem.parent.pool_name }}/{{ selectedItem.parent.image_name }}@{{ selectedItem.parent.snap_name }} - - -
Block name prefix{{ selectedItem.block_name_prefix }}
Order{{ selectedItem.order }}
Name{{ selectedItem.name }}
Pool{{ selectedItem.pool_name }}
Data Pool{{ selectedItem.data_pool | empty }}
Created{{ selectedItem.timestamp | cdDate }}
Size{{ selectedItem.size | dimlessBinary }}
Objects{{ selectedItem.num_objs | dimless }}
Object size{{ selectedItem.obj_size | dimlessBinary }}
Features + + {{ feature }} + +
Provisioned + + N/A + + + {{ selectedItem.disk_usage | dimlessBinary }} + +
Total provisioned + + N/A + + + {{ selectedItem.total_disk_usage | dimlessBinary }} + +
Striping unit{{ selectedItem.stripe_unit | dimlessBinary }}
Striping count{{ selectedItem.stripe_count }}
Parent + {{ selectedItem.parent.pool_name }} + /{{ selectedItem.parent.image_name }} + @{{ selectedItem.parent.snap_name }} + - +
Block name prefix{{ selectedItem.block_name_prefix }}
Order{{ selectedItem.order }}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts index 1494bc6254917..eb408eb5f2d0f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts @@ -1,69 +1,88 @@ +import { I18n } from '@ngx-translate/i18n-polyfill'; + import { CdTableAction } from '../../../shared/models/cd-table-action'; import { CdTableSelection } from '../../../shared/models/cd-table-selection'; export class RbdSnapshotActionsModel { - create: CdTableAction = { - permission: 'create', - icon: 'fa-plus', - name: 'Create' - }; - rename: CdTableAction = { - permission: 'update', - icon: 'fa-pencil', - name: 'Rename' - }; - protect: CdTableAction = { - permission: 'update', - icon: 'fa-lock', - visible: (selection: CdTableSelection) => - selection.hasSingleSelection && !selection.first().is_protected, - name: 'Protect' - }; - unprotect: CdTableAction = { - permission: 'update', - icon: 'fa-unlock', - visible: (selection: CdTableSelection) => - selection.hasSingleSelection && selection.first().is_protected, - name: 'Unprotect' - }; - clone: CdTableAction = { - permission: 'create', - canBePrimary: (selection: CdTableSelection) => selection.hasSingleSelection, - disable: (selection: CdTableSelection) => - !selection.hasSingleSelection || selection.first().cdExecuting, - icon: 'fa-clone', - name: 'Clone' - }; - copy: CdTableAction = { - permission: 'create', - canBePrimary: (selection: CdTableSelection) => selection.hasSingleSelection, - disable: (selection: CdTableSelection) => - !selection.hasSingleSelection || selection.first().cdExecuting, - icon: 'fa-copy', - name: 'Copy' - }; - rollback: CdTableAction = { - permission: 'update', - icon: 'fa-undo', - name: 'Rollback' - }; - deleteSnap: CdTableAction = { - permission: 'delete', - icon: 'fa-times', - disable: (selection: CdTableSelection) => { - const first = selection.first(); - return !selection.hasSingleSelection || first.cdExecuting || first.is_protected; - }, - name: 'Delete' - }; - ordering = [ - this.create, - this.rename, - this.protect, - this.unprotect, - this.clone, - this.copy, - this.rollback, - this.deleteSnap - ]; + i18n: I18n; + + create: CdTableAction; + rename: CdTableAction; + protect: CdTableAction; + unprotect: CdTableAction; + clone: CdTableAction; + copy: CdTableAction; + rollback: CdTableAction; + deleteSnap: CdTableAction; + ordering: CdTableAction[]; + + constructor(i18n: I18n) { + this.i18n = i18n; + + this.create = { + permission: 'create', + icon: 'fa-plus', + name: this.i18n('Create') + }; + this.rename = { + permission: 'update', + icon: 'fa-pencil', + name: this.i18n('Rename') + }; + this.protect = { + permission: 'update', + icon: 'fa-lock', + visible: (selection: CdTableSelection) => + selection.hasSingleSelection && !selection.first().is_protected, + name: this.i18n('Protect') + }; + this.unprotect = { + permission: 'update', + icon: 'fa-unlock', + visible: (selection: CdTableSelection) => + selection.hasSingleSelection && selection.first().is_protected, + name: this.i18n('Unprotect') + }; + this.clone = { + permission: 'create', + canBePrimary: (selection: CdTableSelection) => selection.hasSingleSelection, + disable: (selection: CdTableSelection) => + !selection.hasSingleSelection || selection.first().cdExecuting, + icon: 'fa-clone', + name: this.i18n('Clone') + }; + this.copy = { + permission: 'create', + canBePrimary: (selection: CdTableSelection) => selection.hasSingleSelection, + disable: (selection: CdTableSelection) => + !selection.hasSingleSelection || selection.first().cdExecuting, + icon: 'fa-copy', + name: this.i18n('Copy') + }; + this.rollback = { + permission: 'update', + icon: 'fa-undo', + name: this.i18n('Rollback') + }; + this.deleteSnap = { + permission: 'delete', + icon: 'fa-times', + disable: (selection: CdTableSelection) => { + const first = selection.first(); + return !selection.hasSingleSelection || first.cdExecuting || first.is_protected; + }, + name: this.i18n('Delete') + }; + + this.ordering = [ + this.create, + this.rename, + this.protect, + this.unprotect, + this.clone, + this.copy, + this.rollback, + this.deleteSnap + ]; + } } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts index 41861135fe271..0294daf2b09f5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; +import { I18n } from '@ngx-translate/i18n-polyfill'; import { ToastModule } from 'ng2-toastr'; import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; import { Subject, throwError as observableThrowError } from 'rxjs'; @@ -80,11 +81,12 @@ describe('RbdSnapshotListComponent', () => { beforeEach(() => { fixture.detectChanges(); + const i18n = TestBed.get(I18n); called = false; rbdService = new RbdService(null); notificationService = new NotificationService(null, null); authStorageService = new AuthStorageService(); - authStorageService.set('user', { 'rbd-image': ['create', 'read', 'update', 'delete'] }); + authStorageService.set('user', '', { 'rbd-image': ['create', 'read', 'update', 'delete'] }); component = new RbdSnapshotListComponent( authStorageService, null, @@ -94,7 +96,8 @@ describe('RbdSnapshotListComponent', () => { null, notificationService, null, - null + null, + i18n ); spyOn(rbdService, 'deleteSnapshot').and.returnValue(observableThrowError({ status: 500 })); spyOn(notificationService, 'notifyTask').and.stub(); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts index 8958dea84b2dc..e186195c5c71f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts @@ -77,7 +77,7 @@ export class RbdSnapshotListComponent implements OnInit, OnChanges { private i18n: I18n ) { this.permission = this.authStorageService.getPermissions().rbdImage; - const actions = new RbdSnapshotActionsModel(); + const actions = new RbdSnapshotActionsModel(this.i18n); actions.create.click = () => this.openCreateSnapshotModal(); actions.rename.click = () => this.openEditSnapshotModal(); actions.protect.click = () => this.toggleProtection(); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html index 0be5c92ddfbc7..d19a2adfa5c4c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html @@ -9,13 +9,8 @@ [formGroup]="moveForm" novalidate>
-

- To move  - {{ poolName }}/{{ imageName }}  - to trash, click  - Move Image.  - Optionally, you can pick an expiration date. -

+

To move {{ poolName }}/{{ imageName }} to trash, + click Move Image. Optionally, you can pick an expiration date.

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts index ecd5b5fd1818f..1bcecc679c4ea 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts @@ -6,7 +6,7 @@ import { of } from 'rxjs'; import { TabsModule } from 'ngx-bootstrap/tabs'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; +import { configureTestBed, i18nProviders } from '../../../../../testing/unit-test-helper'; import { OsdService } from '../../../../shared/api/osd.service'; import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; import { SharedModule } from '../../../../shared/shared.module'; @@ -28,7 +28,8 @@ describe('OsdDetailsComponent', () => { PerformanceCounterModule, SharedModule ], - declarations: [OsdDetailsComponent, OsdPerformanceHistogramComponent] + declarations: [OsdDetailsComponent, OsdPerformanceHistogramComponent], + providers: i18nProviders }); beforeEach(() => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts index f6823557e9abe..26c738f226945 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts @@ -8,10 +8,10 @@ import { forkJoin as observableForkJoin, of } from 'rxjs'; import { mergeMap } from 'rxjs/operators'; import { ConfigurationService } from '../../../../shared/api/configuration.service'; +import { OsdService } from '../../../../shared/api/osd.service'; import { NotificationType } from '../../../../shared/enum/notification-type.enum'; import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; import { NotificationService } from '../../../../shared/services/notification.service'; -import { OsdRecvSpeedModalPriorities } from './osd-recv-speed-modal.priorities'; @Component({ selector: 'cd-osd-recv-speed-modal', @@ -20,15 +20,17 @@ import { OsdRecvSpeedModalPriorities } from './osd-recv-speed-modal.priorities'; }) export class OsdRecvSpeedModalComponent implements OnInit { osdRecvSpeedForm: CdFormGroup; - priorities = OsdRecvSpeedModalPriorities.KNOWN_PRIORITIES; + priorities = []; priorityAttrs = []; constructor( public bsModalRef: BsModalRef, private configService: ConfigurationService, private notificationService: NotificationService, - private i18n: I18n + private i18n: I18n, + private osdService: OsdService ) { + this.priorities = this.osdService.osdRecvSpeedModalPriorities.KNOWN_PRIORITIES; this.osdRecvSpeedForm = new CdFormGroup({ priority: new FormControl(null, { validators: [Validators.required] }), customizePriority: new FormControl(false) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.priorities.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.priorities.ts deleted file mode 100755 index 7b1bacdfb697e..0000000000000 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.priorities.ts +++ /dev/null @@ -1,45 +0,0 @@ -export class OsdRecvSpeedModalPriorities { - public static KNOWN_PRIORITIES = [ - // TODO: I18n - { - name: null, - text: '-- Select the priority --', - values: { - osd_max_backfills: null, - osd_recovery_max_active: null, - osd_recovery_max_single_start: null, - osd_recovery_sleep: null - } - }, - { - name: 'low', - text: 'Low', - values: { - osd_max_backfills: 1, - osd_recovery_max_active: 1, - osd_recovery_max_single_start: 1, - osd_recovery_sleep: 0.5 - } - }, - { - name: 'default', - text: 'Default', - values: { - osd_max_backfills: 1, - osd_recovery_max_active: 3, - osd_recovery_max_single_start: 1, - osd_recovery_sleep: 0 - } - }, - { - name: 'high', - text: 'High', - values: { - osd_max_backfills: 4, - osd_recovery_max_active: 4, - osd_recovery_max_single_start: 4, - osd_recovery_sleep: 0 - } - } - ]; -} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.spec.ts index 93d19341c9a83..9ffc34ead1295 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.spec.ts @@ -5,7 +5,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { BsModalRef } from 'ngx-bootstrap/modal'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; +import { configureTestBed, i18nProviders } from '../../../../../testing/unit-test-helper'; import { OsdService } from '../../../../shared/api/osd.service'; import { ModalComponent } from '../../../../shared/components/modal/modal.component'; import { SubmitButtonComponent } from '../../../../shared/components/submit-button/submit-button.component'; @@ -19,7 +19,7 @@ describe('OsdReweightModalComponent', () => { configureTestBed({ imports: [ReactiveFormsModule, HttpClientTestingModule], declarations: [OsdReweightModalComponent, ModalComponent, SubmitButtonComponent], - providers: [OsdService, BsModalRef, CdFormBuilder] + providers: [OsdService, BsModalRef, CdFormBuilder, i18nProviders] }); beforeEach(() => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-tooltips.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-tooltips.ts deleted file mode 100644 index 358354dee9455..0000000000000 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-tooltips.ts +++ /dev/null @@ -1,64 +0,0 @@ -export class ErasureCodeProfileFormTooltips { - // TODO: I18N - // Copied from /srv/cephmgr/ceph-dev/doc/rados/operations/erasure-code.*.rst - k = `Each object is split in data-chunks parts, each stored on a different OSD.`; - - m = `Compute coding chunks for each object and store them on different OSDs. - The number of coding chunks is also the number of OSDs that can be down without losing data.`; - - plugins = { - jerasure: { - description: `The jerasure plugin is the most generic and flexible plugin, - it is also the default for Ceph erasure coded pools.`, - technique: `The more flexible technique is reed_sol_van : it is enough to set k and m. - The cauchy_good technique can be faster but you need to chose the packetsize carefully. - All of reed_sol_r6_op, liberation, blaum_roth, liber8tion are RAID6 equivalents in the - sense that they can only be configured with m=2.`, - packetSize: `The encoding will be done on packets of bytes size at a time. - Chosing the right packet size is difficult. - The jerasure documentation contains extensive information on this topic.` - }, - lrc: { - description: `With the jerasure plugin, when an erasure coded object is stored - on multiple OSDs, recovering from the loss of one OSD requires reading from all the others. - For instance if jerasure is configured with k=8 and m=4, losing one OSD requires - reading from the eleven others to repair. - - The lrc erasure code plugin creates local parity chunks to be able to recover using - less OSDs. For instance if lrc is configured with k=8, m=4 and l=4, it will create - an additional parity chunk for every four OSDs. When a single OSD is lost, it can be - recovered with only four OSDs instead of eleven.`, - l: `Group the coding and data chunks into sets of size locality. For instance, - for k=4 and m=2, when locality=3 two groups of three are created. Each set can - be recovered without reading chunks from another set.`, - crushLocality: `The type of the crush bucket in which each set of chunks defined by l - will be stored. For instance, if it is set to rack, each group of l chunks will be placed - in a different rack. It is used to create a CRUSH rule step such as step choose rack. - If it is not set, no such grouping is done.` - }, - isa: { - description: `The isa plugin encapsulates the ISA library. It only runs on Intel processors.`, - technique: `The ISA plugin comes in two Reed Solomon forms. - If reed_sol_van is set, it is Vandermonde, if cauchy is set, it is Cauchy.` - }, - shec: { - description: `The shec plugin encapsulates the multiple SHEC library. - It allows ceph to recover data more efficiently than Reed Solomon codes.`, - c: `The number of parity chunks each of which includes each data chunk in its calculation - range. The number is used as a durability estimator. For instance, if c=2, 2 OSDs can - be down without losing data.` - } - }; - - crushRoot = `The name of the crush bucket used for the first step of the CRUSH rule. - For instance step take default.`; - - crushFailureDomain = `Ensure that no two chunks are in a bucket with the same failure domain. - For instance, if the failure domain is host no two chunks will be stored on the same host. - It is used to create a CRUSH rule step such as step chooseleaf host.`; - - crushDeviceClass = `Restrict placement to devices of a specific class (e.g., ssd or hdd), - using the crush device class names in the CRUSH map.`; - - directory = `Set the directory name from which the erasure code plugin is loaded.`; -} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html index f0e7c720c35f1..1fd5879aab42c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html @@ -33,9 +33,8 @@ *ngIf="form.showError('name', frm, 'required')" i18n>This field is required! - The name can only consist of alphanumeric characters, dashes and underscores. - + *ngIf="form.showError('name', frm, 'pattern')" + i18n>The name can only consist of alphanumeric characters, dashes and underscores. The chosen erasure code profile name is already in use. diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.ts index 6e3218b47f721..7599833bc2ad8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.ts @@ -10,7 +10,6 @@ import { CdValidators } from '../../../shared/forms/cd-validators'; import { ErasureCodeProfile } from '../../../shared/models/erasure-code-profile'; import { FinishedTask } from '../../../shared/models/finished-task'; import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; -import { ErasureCodeProfileFormTooltips } from './erasure-code-profile-form-tooltips'; @Component({ selector: 'cd-erasure-code-profile-form', @@ -28,7 +27,7 @@ export class ErasureCodeProfileFormComponent implements OnInit { techniques: string[]; requiredControls: string[] = []; devices: string[] = []; - tooltips = new ErasureCodeProfileFormTooltips(); + tooltips = this.ecpService.formTooltips; PLUGIN = { LRC: 'lrc', // Locally Repairable Erasure Code diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form-data.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form-data.ts index 0c0e1390ea1ee..9e1a60764572b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form-data.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form-data.ts @@ -22,19 +22,22 @@ export class PoolFormData { new SelectBadgesOption(false, 'rgw', '') ], validators: [Validators.pattern('[A-Za-z0-9_]+'), Validators.maxLength(128)], - messages: new SelectBadgesMessages({ - empty: i18n('No applications added'), - selectionLimit: { - text: i18n('Applications limit reached'), - tooltip: i18n('A pool can only have up to four applications definitions.') + messages: new SelectBadgesMessages( + { + empty: i18n('No applications added'), + selectionLimit: { + text: i18n('Applications limit reached'), + tooltip: i18n('A pool can only have up to four applications definitions.') + }, + customValidations: { + pattern: i18n(`Allowed characters '_a-zA-Z0-9'`), + maxlength: i18n('Maximum length is 128 characters') + }, + filter: i18n('Filter or add applications'), + add: i18n('Add application') }, - customValidations: { - pattern: i18n(`Allowed characters '_a-zA-Z0-9'`), - maxlength: i18n('Maximum length is 128 characters') - }, - filter: i18n('Filter or add applications'), - add: i18n('Add application') - }) + i18n + ) }; } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html index ab5f22f738721..0e23d16b44e50 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html @@ -27,7 +27,8 @@ System - {{ user.system ? "Yes" : "No" }} + {user.system, select, 1 {Yes} 0 {No}} ; - messages = new SelectBadgesMessages({ empty: 'There are no roles.' }); + messages: SelectBadgesMessages; constructor( private authService: AuthService, @@ -51,6 +51,7 @@ export class UserFormComponent implements OnInit { private i18n: I18n ) { this.createForm(); + this.messages = new SelectBadgesMessages({ empty: 'There are no roles.' }, this.i18n); } createForm() { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.spec.ts index 180a350734740..227af54c43c80 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed, i18nProviders } from '../../../testing/unit-test-helper'; import { ErasureCodeProfile } from '../models/erasure-code-profile'; import { ErasureCodeProfileService } from './erasure-code-profile.service'; @@ -13,7 +13,7 @@ describe('ErasureCodeProfileService', () => { configureTestBed({ imports: [HttpClientTestingModule], - providers: [ErasureCodeProfileService] + providers: [ErasureCodeProfileService, i18nProviders] }); beforeEach(() => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.ts index 7599caaa60d61..df7527727aab0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.ts @@ -3,6 +3,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; +import { I18n } from '@ngx-translate/i18n-polyfill'; import { ErasureCodeProfile } from '../models/erasure-code-profile'; import { ApiModule } from './api.module'; @@ -12,7 +13,73 @@ import { ApiModule } from './api.module'; export class ErasureCodeProfileService { apiPath = 'api/erasure_code_profile'; - constructor(private http: HttpClient) {} + formTooltips = { + // Copied from /srv/cephmgr/ceph-dev/doc/rados/operations/erasure-code.*.rst + k: this.i18n(`Each object is split in data-chunks parts, each stored on a different OSD.`), + + m: this.i18n(`Compute coding chunks for each object and store them on different OSDs. + The number of coding chunks is also the number of OSDs that can be down without losing data.`), + + plugins: { + jerasure: { + description: this.i18n(`The jerasure plugin is the most generic and flexible plugin, + it is also the default for Ceph erasure coded pools.`), + technique: this.i18n(`The more flexible technique is reed_sol_van : it is enough to set k + and m. The cauchy_good technique can be faster but you need to chose the packetsize + carefully. All of reed_sol_r6_op, liberation, blaum_roth, liber8tion are RAID6 equivalents + in the sense that they can only be configured with m=2.`), + packetSize: this.i18n(`The encoding will be done on packets of bytes size at a time. + Chosing the right packet size is difficult. + The jerasure documentation contains extensive information on this topic.`) + }, + lrc: { + description: this.i18n(`With the jerasure plugin, when an erasure coded object is stored on + multiple OSDs, recovering from the loss of one OSD requires reading from all the others. + For instance if jerasure is configured with k=8 and m=4, losing one OSD requires reading + from the eleven others to repair. + + The lrc erasure code plugin creates local parity chunks to be able to recover using + less OSDs. For instance if lrc is configured with k=8, m=4 and l=4, it will create + an additional parity chunk for every four OSDs. When a single OSD is lost, it can be + recovered with only four OSDs instead of eleven.`), + l: this.i18n(`Group the coding and data chunks into sets of size locality. For instance, + for k=4 and m=2, when locality=3 two groups of three are created. Each set can + be recovered without reading chunks from another set.`), + crushLocality: this.i18n(`The type of the crush bucket in which each set of chunks defined + by l will be stored. For instance, if it is set to rack, each group of l chunks will be + placed in a different rack. It is used to create a CRUSH rule step such as step choose + rack. If it is not set, no such grouping is done.`) + }, + isa: { + description: this.i18n( + `The isa plugin encapsulates the ISA library. It only runs on Intel processors.` + ), + technique: this.i18n(`The ISA plugin comes in two Reed Solomon forms. + If reed_sol_van is set, it is Vandermonde, if cauchy is set, it is Cauchy.`) + }, + shec: { + description: this.i18n(`The shec plugin encapsulates the multiple SHEC library. + It allows ceph to recover data more efficiently than Reed Solomon codes.`), + c: this.i18n(`The number of parity chunks each of which includes each data chunk in its + calculation range. The number is used as a durability estimator. For instance, if c=2, + 2 OSDs can be down without losing data.`) + } + }, + + crushRoot: this.i18n(`The name of the crush bucket used for the first step of the CRUSH rule. + For instance step take default.`), + + crushFailureDomain: this.i18n(`Ensure that no two chunks are in a bucket with the same failure + domain. For instance, if the failure domain is host no two chunks will be stored on the same + host. It is used to create a CRUSH rule step such as step chooseleaf host.`), + + crushDeviceClass: this.i18n(`Restrict placement to devices of a specific class + (e.g., ssd or hdd), using the crush device class names in the CRUSH map.`), + + directory: this.i18n(`Set the directory name from which the erasure code plugin is loaded.`) + }; + + constructor(private http: HttpClient, private i18n: I18n) {} list(): Observable { return this.http.get(this.apiPath); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts index 08c87c3e4369f..a442642a06bbb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed, i18nProviders } from '../../../testing/unit-test-helper'; import { OsdService } from './osd.service'; describe('OsdService', () => { @@ -9,7 +9,7 @@ describe('OsdService', () => { let httpTesting: HttpTestingController; configureTestBed({ - providers: [OsdService], + providers: [OsdService, i18nProviders], imports: [HttpClientTestingModule] }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.ts index 03e056d17514b..a98d503ae0f2d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.ts @@ -1,6 +1,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { I18n } from '@ngx-translate/i18n-polyfill'; + import { ApiModule } from './api.module'; @Injectable({ @@ -9,7 +11,52 @@ import { ApiModule } from './api.module'; export class OsdService { private path = 'api/osd'; - constructor(private http: HttpClient) {} + osdRecvSpeedModalPriorities = { + KNOWN_PRIORITIES: [ + { + name: null, + text: this.i18n('-- Select the priority --'), + values: { + osd_max_backfills: null, + osd_recovery_max_active: null, + osd_recovery_max_single_start: null, + osd_recovery_sleep: null + } + }, + { + name: 'low', + text: this.i18n('Low'), + values: { + osd_max_backfills: 1, + osd_recovery_max_active: 1, + osd_recovery_max_single_start: 1, + osd_recovery_sleep: 0.5 + } + }, + { + name: 'default', + text: this.i18n('Default'), + values: { + osd_max_backfills: 1, + osd_recovery_max_active: 3, + osd_recovery_max_single_start: 1, + osd_recovery_sleep: 0 + } + }, + { + name: 'high', + text: this.i18n('High'), + values: { + osd_max_backfills: 4, + osd_recovery_max_active: 4, + osd_recovery_max_single_start: 4, + osd_recovery_sleep: 0 + } + } + ] + }; + + constructor(private http: HttpClient, private i18n: I18n) {} getList() { return this.http.get(`${this.path}`); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges-messages.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges-messages.model.ts index cbe298861af6d..c5306411826c3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges-messages.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges-messages.model.ts @@ -1,16 +1,26 @@ +import { I18n } from '@ngx-translate/i18n-polyfill'; + import * as _ from 'lodash'; export class SelectBadgesMessages { - empty = 'There are no items.'; - selectionLimit = { - tooltip: 'Deselect item to select again', - text: 'Selection limit reached' - }; + i18n: I18n; + empty: string; + selectionLimit: any; customValidations = {}; - filter = 'Filter tags'; - add = 'Add badge'; // followed by " '{{filter.value}}'" + filter: string; + add: string; + + constructor(messages: {}, i18n: I18n) { + this.i18n = i18n; + + this.empty = this.i18n('There are no items.'); + this.selectionLimit = { + tooltip: this.i18n('Deselect item to select again'), + text: this.i18n('Selection limit reached') + }; + this.filter = this.i18n('Filter tags'); + this.add = this.i18n('Add badge'); // followed by " '{{filter.value}}'" - constructor(messages: {}) { _.merge(this, messages); } } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.spec.ts index 08f9e5eb6978a..cc539353ee8dc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.spec.ts @@ -4,7 +4,7 @@ import { ReactiveFormsModule, Validators } from '@angular/forms'; import { PopoverModule } from 'ngx-bootstrap/popover'; import { TooltipModule } from 'ngx-bootstrap/tooltip'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed, i18nProviders } from '../../../../testing/unit-test-helper'; import { SelectBadgesOption } from './select-badges-option.model'; import { SelectBadgesComponent } from './select-badges.component'; @@ -20,7 +20,8 @@ describe('SelectBadgesComponent', () => { configureTestBed({ declarations: [SelectBadgesComponent], - imports: [PopoverModule.forRoot(), TooltipModule, ReactiveFormsModule] + imports: [PopoverModule.forRoot(), TooltipModule, ReactiveFormsModule], + providers: i18nProviders }); beforeEach(() => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts index 0d3bec8bb6ac2..fcfbf34f1d3ef 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts @@ -1,6 +1,7 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { FormControl, ValidatorFn } from '@angular/forms'; +import { I18n } from '@ngx-translate/i18n-polyfill'; import * as _ from 'lodash'; import { CdFormGroup } from '../../forms/cd-form-group'; @@ -18,7 +19,7 @@ export class SelectBadgesComponent implements OnInit, OnChanges { @Input() options: Array = []; @Input() - messages = new SelectBadgesMessages({}); + messages = new SelectBadgesMessages({}, this.i18n); @Input() selectionLimit: number; @Input() @@ -30,7 +31,7 @@ export class SelectBadgesComponent implements OnInit, OnChanges { Object = Object; filteredOptions: Array = []; - constructor() {} + constructor(private i18n: I18n) {} ngOnInit() { this.initFilter(); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.ts index 455fbc6f93d10..209f5ca7b14ed 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.ts @@ -20,13 +20,17 @@ export class TaskMessageOperation { } class TaskMessage { + i18n: I18n; + operation: TaskMessageOperation; involves: (object) => string; errors: (metadata) => object; failure(metadata): string { - // TODO: I18N - return `Failed to ${this.operation.failure} ${this.involves(metadata)}`; + return this.i18n('Failed to {{failure}} {{metadata}}', { + failure: this.operation.failure, + metadata: this.involves(metadata) + }); } running(metadata): string { @@ -38,10 +42,12 @@ class TaskMessage { } constructor( + i18n: I18n, operation: TaskMessageOperation, involves: (metadata) => string, errors?: (metadata) => object ) { + this.i18n = i18n; this.operation = operation; this.involves = involves; this.errors = errors || (() => ({})); @@ -54,7 +60,7 @@ class TaskMessage { export class TaskMessageService { constructor(private i18n: I18n) {} - defaultMessage = new TaskMessage( + defaultMessage = this.newTaskMessage( new TaskMessageOperation(this.i18n('Executing'), this.i18n('execute'), this.i18n('Executed')), (metadata) => { return ( @@ -117,7 +123,7 @@ export class TaskMessageService { messages = { // Pool tasks - 'pool/create': new TaskMessage( + 'pool/create': this.newTaskMessage( this.commonOperations.create, (metadata) => this.pool(metadata), (metadata) => ({ @@ -126,7 +132,7 @@ export class TaskMessageService { }) }) ), - 'pool/edit': new TaskMessage( + 'pool/edit': this.newTaskMessage( this.commonOperations.update, (metadata) => this.pool(metadata), (metadata) => ({ @@ -135,9 +141,11 @@ export class TaskMessageService { }) }) ), - 'pool/delete': new TaskMessage(this.commonOperations.delete, (metadata) => this.pool(metadata)), + 'pool/delete': this.newTaskMessage(this.commonOperations.delete, (metadata) => + this.pool(metadata) + ), // Erasure code profile tasks - 'ecp/create': new TaskMessage( + 'ecp/create': this.newTaskMessage( this.commonOperations.create, (metadata) => this.ecp(metadata), (metadata) => ({ @@ -146,24 +154,34 @@ export class TaskMessageService { }) }) ), - 'ecp/delete': new TaskMessage(this.commonOperations.delete, (metadata) => this.ecp(metadata)), + 'ecp/delete': this.newTaskMessage(this.commonOperations.delete, (metadata) => + this.ecp(metadata) + ), // RBD tasks - 'rbd/create': new TaskMessage(this.commonOperations.create, this.rbd.default, (metadata) => ({ - '17': this.i18n('Name is already used by {{rbd_name}}.', { - rbd_name: this.rbd.default(metadata) + 'rbd/create': this.newTaskMessage( + this.commonOperations.create, + this.rbd.default, + (metadata) => ({ + '17': this.i18n('Name is already used by {{rbd_name}}.', { + rbd_name: this.rbd.default(metadata) + }) }) - })), - 'rbd/edit': new TaskMessage(this.commonOperations.update, this.rbd.default, (metadata) => ({ + ), + 'rbd/edit': this.newTaskMessage(this.commonOperations.update, this.rbd.default, (metadata) => ({ '17': this.i18n('Name is already used by {{rbd_name}}.', { rbd_name: this.rbd.default(metadata) }) })), - 'rbd/delete': new TaskMessage(this.commonOperations.delete, this.rbd.default, (metadata) => ({ - '39': this.i18n('{{rbd_name}} contains snapshots.', { - rbd_name: this.rbd.default(metadata) + 'rbd/delete': this.newTaskMessage( + this.commonOperations.delete, + this.rbd.default, + (metadata) => ({ + '39': this.i18n('{{rbd_name}} contains snapshots.', { + rbd_name: this.rbd.default(metadata) + }) }) - })), - 'rbd/clone': new TaskMessage( + ), + 'rbd/clone': this.newTaskMessage( new TaskMessageOperation(this.i18n('Cloning'), this.i18n('clone'), this.i18n('Cloned')), this.rbd.child, (metadata) => ({ @@ -175,7 +193,7 @@ export class TaskMessageService { }) }) ), - 'rbd/copy': new TaskMessage( + 'rbd/copy': this.newTaskMessage( new TaskMessageOperation(this.i18n('Copying'), this.i18n('copy'), this.i18n('Copied')), this.rbd.destination, (metadata) => ({ @@ -184,7 +202,7 @@ export class TaskMessageService { }) }) ), - 'rbd/flatten': new TaskMessage( + 'rbd/flatten': this.newTaskMessage( new TaskMessageOperation( this.i18n('Flattening'), this.i18n('flatten'), @@ -193,7 +211,7 @@ export class TaskMessageService { this.rbd.default ), // RBD snapshot tasks - 'rbd/snap/create': new TaskMessage( + 'rbd/snap/create': this.newTaskMessage( this.commonOperations.create, this.rbd.snapshot, (metadata) => ({ @@ -202,7 +220,7 @@ export class TaskMessageService { }) }) ), - 'rbd/snap/edit': new TaskMessage( + 'rbd/snap/edit': this.newTaskMessage( this.commonOperations.update, this.rbd.snapshot, (metadata) => ({ @@ -211,7 +229,7 @@ export class TaskMessageService { }) }) ), - 'rbd/snap/delete': new TaskMessage( + 'rbd/snap/delete': this.newTaskMessage( this.commonOperations.delete, this.rbd.snapshot, (metadata) => ({ @@ -220,7 +238,7 @@ export class TaskMessageService { }) }) ), - 'rbd/snap/rollback': new TaskMessage( + 'rbd/snap/rollback': this.newTaskMessage( new TaskMessageOperation( this.i18n('Rolling back'), this.i18n('rollback'), @@ -229,7 +247,7 @@ export class TaskMessageService { this.rbd.snapshot ), // RBD trash tasks - 'rbd/trash/move': new TaskMessage( + 'rbd/trash/move': this.newTaskMessage( new TaskMessageOperation(this.i18n('Moving'), this.i18n('move'), this.i18n('Moved')), (metadata) => this.i18n(`image '{{id}}' to trash`, { @@ -239,7 +257,7 @@ export class TaskMessageService { 2: this.i18n('Could not find image.') }) ), - 'rbd/trash/restore': new TaskMessage( + 'rbd/trash/restore': this.newTaskMessage( new TaskMessageOperation(this.i18n('Restoring'), this.i18n('restore'), this.i18n('Restored')), (metadata) => this.i18n(`image '{{id}}' into '{{new_id}}'`, { @@ -252,14 +270,14 @@ export class TaskMessageService { }) }) ), - 'rbd/trash/remove': new TaskMessage( + 'rbd/trash/remove': this.newTaskMessage( new TaskMessageOperation(this.i18n('Deleting'), this.i18n('delete'), this.i18n('Deleted')), (metadata) => this.i18n(`image '{{id}}'`, { id: `${metadata.pool_name}/${metadata.image_name}@${metadata.image_id}` }) ), - 'rbd/trash/purge': new TaskMessage( + 'rbd/trash/purge': this.newTaskMessage( new TaskMessageOperation(this.i18n('Purging'), this.i18n('purge'), this.i18n('Purged')), (metadata) => { let message = this.i18n('all pools'); @@ -272,30 +290,38 @@ export class TaskMessageService { } ), // RBD mirroring tasks - 'rbd/mirroring/pool/edit': new TaskMessage( + 'rbd/mirroring/pool/edit': this.newTaskMessage( this.commonOperations.update, this.rbd_mirroring.pool, (metadata) => ({ 16: this.i18n('Cannot disable mirroring because it contains a peer.') }) ), - 'rbd/mirroring/peer/add': new TaskMessage( + 'rbd/mirroring/peer/add': this.newTaskMessage( this.commonOperations.create, this.rbd_mirroring.pool_peer, (metadata) => ({}) ), - 'rbd/mirroring/peer/edit': new TaskMessage( + 'rbd/mirroring/peer/edit': this.newTaskMessage( this.commonOperations.update, this.rbd_mirroring.pool_peer, (metadata) => ({}) ), - 'rbd/mirroring/peer/delete': new TaskMessage( + 'rbd/mirroring/peer/delete': this.newTaskMessage( this.commonOperations.delete, this.rbd_mirroring.pool_peer, (metadata) => ({}) ) }; + newTaskMessage( + operation: TaskMessageOperation, + involves: (metadata) => string, + errors?: (metadata) => object + ) { + return new TaskMessage(this.i18n, operation, involves, errors); + } + pool(metadata) { return this.i18n(`pool '{{pool_name}}'`, { pool_name: metadata.pool_name diff --git a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf index 9774dc4c8e58f..4089463464765 100644 --- a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf +++ b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf @@ -475,15 +475,15 @@ app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 60 + 59 app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 187 + 186 app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 211 + 210 app/ceph/pool/pool-form/pool-form.component.html @@ -875,7 +875,7 @@ app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 49 + 44 app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.html @@ -959,19 +959,19 @@ app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 68 + 67 app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 92 + 91 app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 118 + 117 app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 166 + 165 app/ceph/pool/pool-form/pool-form.component.html @@ -1084,125 +1084,131 @@ app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html 3 + + The name can only consist of alphanumeric characters, dashes and underscores. + + app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html + 37 + The chosen erasure code profile name is already in use. app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 41 + 40 Plugin app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 48 + 47 Data chunks (k) app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 76 + 75 Must be equal to or greater than 2. app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 95 + 94 Coding chunks (m) app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 103 + 102 Must be equal to or greater than 1. app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 121 + 120 app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 143 + 142 app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 169 + 168 app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 262 + 261 Durability estimator (c) app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 130 + 129 Locality (l) app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 152 + 151 Crush failure domain app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 176 + 175 Crush Locality app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 200 + 199 None app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 214 + 213 Technique app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 227 + 226 Packetsize app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 249 + 248 Crush root app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 270 + 269 Crush device class app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 287 + 286 any app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 297 + 296 Directory app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 309 + 308 Add app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 327 + 326 app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html @@ -1212,7 +1218,7 @@ Close app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form.component.html - 331 + 330 app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.html @@ -1939,7 +1945,7 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 39 + 40 There are no subusers. @@ -1975,7 +1981,7 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 133 + 134 S3 @@ -2005,7 +2011,7 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 148 + 149 Add S3 key @@ -2027,7 +2033,7 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 48 + 49 There are no capabilities. @@ -2049,7 +2055,7 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 60 + 61 Enabled @@ -2067,11 +2073,11 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 65 + 66 app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 101 + 102 Unlimited size @@ -2125,7 +2131,7 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 96 + 97 Welcome to Ceph! @@ -2435,11 +2441,11 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 70 + 71 app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 106 + 107 Unlimited @@ -2453,19 +2459,19 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 73 + 74 app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 84 + 85 app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 109 + 110 app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 120 + 121 Maximum objects @@ -2475,11 +2481,11 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 81 + 82 app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 117 + 118 System @@ -2487,11 +2493,17 @@ app/ceph/rgw/rgw-user-details/rgw-user-details.component.html 29 + + {VAR_SELECT, select, 0 {No} 1 {Yes} } + + app/ceph/rgw/rgw-user-details/rgw-user-details.component.html + 31 + Maximum buckets app/ceph/rgw/rgw-user-details/rgw-user-details.component.html - 34 + 35 Performance counters not available @@ -2713,57 +2725,48 @@ app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html 3 - - To move - - app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 13 - - - to trash, click - - app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 15 - - - Move Image - - app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 16 - - - app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 45 - - - Optionally, you can pick an expiration date. + + To move / to trash, + click Move Image. Optionally, you can pick an expiration date. app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 17 + 12 Protection expires at app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 23 + 18 NOT PROTECTED app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 25 + 20 Wrong date format. Please use "YYYY-MM-DD HH:mm:ss". app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 34 + 29 Protection has already expired. Please pick a future date or leave it empty. app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html - 37 + 32 + + + Move Image + + app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.html + 40 + + + Only available for RBD images with fast-diff enabled + + app/ceph/block/rbd-details/rbd-details.component.html + 2 Pool @@ -2789,47 +2792,57 @@ app/ceph/block/rbd-details/rbd-details.component.html 57 + + N/A + + app/ceph/block/rbd-details/rbd-details.component.html + 63 + + + app/ceph/block/rbd-details/rbd-details.component.html + 78 + Total provisioned app/ceph/block/rbd-details/rbd-details.component.html - 71 + 72 Striping unit app/ceph/block/rbd-details/rbd-details.component.html - 85 + 87 Striping count app/ceph/block/rbd-details/rbd-details.component.html - 90 + 92 Parent app/ceph/block/rbd-details/rbd-details.component.html - 95 + 97 Block name prefix app/ceph/block/rbd-details/rbd-details.component.html - 103 + 107 Order app/ceph/block/rbd-details/rbd-details.component.html - 108 + 112 Snapshots app/ceph/block/rbd-details/rbd-details.component.html - 115 + 119 RBD Snapshot @@ -3375,6 +3388,10 @@ src/app/ceph/block/rbd-list/rbd-list.component.ts 1 + + src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts + 1 + Flatten @@ -3390,15 +3407,62 @@ 1 - - RBD snapshot rollback + + Create - src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts + src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts + 1 + + + src/app/core/auth/role-details/role-details.component.ts + 1 + + + src/app/core/auth/role-form/role-form.component.ts + 1 + + + + Rename + + src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts + 1 + + + + Protect + + src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts + 1 + + + + Unprotect + + src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts + 1 + + + + Clone + + src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts 1 Rollback + + src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts + 1 + + + src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts + 1 + + + + RBD snapshot rollback src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts 1 @@ -4433,17 +4497,6 @@ 1 - - Create - - src/app/core/auth/role-details/role-details.component.ts - 1 - - - src/app/core/auth/role-form/role-form.component.ts - 1 - - Created role '' @@ -4528,6 +4581,167 @@ 1 + + Each object is split in data-chunks parts, each stored on a different OSD. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + Compute coding chunks for each object and store them on different OSDs. + The number of coding chunks is also the number of OSDs that can be down without losing data. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + The jerasure plugin is the most generic and flexible plugin, + it is also the default for Ceph erasure coded pools. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + The more flexible technique is reed_sol_van : it is enough to set k + and m. The cauchy_good technique can be faster but you need to chose the packetsize + carefully. All of reed_sol_r6_op, liberation, blaum_roth, liber8tion are RAID6 equivalents + in the sense that they can only be configured with m=2. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + The encoding will be done on packets of bytes size at a time. + Chosing the right packet size is difficult. + The jerasure documentation contains extensive information on this topic. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + With the jerasure plugin, when an erasure coded object is stored on + multiple OSDs, recovering from the loss of one OSD requires reading from all the others. + For instance if jerasure is configured with k=8 and m=4, losing one OSD requires reading + from the eleven others to repair. + + The lrc erasure code plugin creates local parity chunks to be able to recover using + less OSDs. For instance if lrc is configured with k=8, m=4 and l=4, it will create + an additional parity chunk for every four OSDs. When a single OSD is lost, it can be + recovered with only four OSDs instead of eleven. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + Group the coding and data chunks into sets of size locality. For instance, + for k=4 and m=2, when locality=3 two groups of three are created. Each set can + be recovered without reading chunks from another set. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + The type of the crush bucket in which each set of chunks defined + by l will be stored. For instance, if it is set to rack, each group of l chunks will be + placed in a different rack. It is used to create a CRUSH rule step such as step choose + rack. If it is not set, no such grouping is done. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + The isa plugin encapsulates the ISA library. It only runs on Intel processors. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + The ISA plugin comes in two Reed Solomon forms. + If reed_sol_van is set, it is Vandermonde, if cauchy is set, it is Cauchy. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + The shec plugin encapsulates the multiple SHEC library. + It allows ceph to recover data more efficiently than Reed Solomon codes. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + The number of parity chunks each of which includes each data chunk in its + calculation range. The number is used as a durability estimator. For instance, if c=2, + 2 OSDs can be down without losing data. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + The name of the crush bucket used for the first step of the CRUSH rule. + For instance step take default. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + Ensure that no two chunks are in a bucket with the same failure + domain. For instance, if the failure domain is host no two chunks will be stored on the same + host. It is used to create a CRUSH rule step such as step chooseleaf host. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + Restrict placement to devices of a specific class + (e.g., ssd or hdd), using the crush device class names in the CRUSH map. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + Set the directory name from which the erasure code plugin is loaded. + + src/app/shared/api/erasure-code-profile.service.ts + 1 + + + + -- Select the priority -- + + src/app/shared/api/osd.service.ts + 1 + + + + Low + + src/app/shared/api/osd.service.ts + 1 + + + + High + + src/app/shared/api/osd.service.ts + 1 + + Information @@ -4535,6 +4749,48 @@ 1 + + There are no items. + + src/app/shared/components/select-badges/select-badges-messages.model.ts + 1 + + + + Deselect item to select again + + src/app/shared/components/select-badges/select-badges-messages.model.ts + 1 + + + + Selection limit reached + + src/app/shared/components/select-badges/select-badges-messages.model.ts + 1 + + + + Filter tags + + src/app/shared/components/select-badges/select-badges-messages.model.ts + 1 + + + + Add badge + + src/app/shared/components/select-badges/select-badges-messages.model.ts + 1 + + + + Failed to + + src/app/shared/services/task-message.service.ts + 1 + + Executing -- 2.39.5