Name	+ Name +	{{ selection.name }}
Description	+ Description +	{{ selection.desc }}
Long description	+ Long description +	{{ selection.long_desc }}
Current values	+ Current values +	- {{ conf.section }}: {{ conf.value }}{{ !isLast ? "," : "" }} + {{ conf.section }}: {{ conf.value }}{{ !isLast ? ',' : '' }}
Default	+ Default +	{{ selection.default }}
Daemon default	+ Daemon default +	{{ selection.daemon_default }}
Type	+ Type +	{{ selection.type }}
Min	+ Min +	{{ selection.min }}
Max	+ Max +	{{ selection.max }}
Flags	+ Flags +	@@ -63,48 +105,75 @@
- Services +	+ Services	- {{ service }} - + *ngIf="service" + class="tag-dark me-2" + > + {{ service }} +
Source	+ Source +	{{ selection.source }}
Level	+ Level +	{{ selection.level }}
Can be updated at runtime (editable)	+ Can be updated at runtime (editable) +	{{ selection.can_update_at_runtime \| booleanText }}
Tags	+ Tags +	{{ selection.tags }}
Enum values	+ Enum values +	{{ selection.enum_values }}
See also	+ See also +	{{ selection.see_also }}

Hosts	+ Hosts +	{{ hostsCount }}
{{ totalDevices }} - {{ totalCapacity \| dimlessBinary }}	+ {{ totalDevices }} + + {{ totalCapacity \| dimlessBinary }} + +
CPUs	+ CPUs +	{{ totalCPUs \| empty }}
Memory	+ Memory +	{{ totalMemory \| empty }}
- {{deploymentDescText}} + {{ deploymentDescText }}

Cluster ID	{{ mon_status.monmap.fsid }}
monmap modified	{{ mon_status.monmap.modified \| relativeDate }}
monmap epoch	{{ mon_status.monmap.epoch }}
quorum con	{{ mon_status.features.quorum_con }}
quorum mon	{{ mon_status.features.quorum_mon }}
required con	{{ mon_status.features.required_con }}
required mon	{{ mon_status.features.required_mon }}

Cluster ID	{{ mon_status.monmap.fsid }}
monmap modified	{{ mon_status.monmap.modified \| relativeDate }}
monmap epoch	{{ mon_status.monmap.epoch }}
quorum con	{{ mon_status.features.quorum_con }}
quorum mon	{{ mon_status.features.quorum_mon }}
required con	{{ mon_status.features.required_con }}
required mon	{{ mon_status.features.required_mon }}

+@let storageCard = storageCardVm$ | async; +@let health = healthCardVm$ | async; +@let storageEmptyState = storageEmptyState$ | async; +@let prometheusEmptyState = prometheusEmptyState$ | async; +

+ [vm]="health" + (viewIncidents)="toggleHealthPanel()" + (viewPGStates)="togglePGStatesPanel()" + (activeSectionChange)="activeHealthTab = $event" + >

+ [prometheusEmptyState]="prometheusEmptyState" + >

+ [storageEmptyState]="storageEmptyState" + >

@if (isHealthPanelOpen && health?.incidents > 0) { -

- Health incidents are Ceph health checks warnings indicating conditions that require attention and remain until resolved. + (closed)="toggleHealthPanel()" + > +

+ Health incidents are Ceph health checks warnings indicating conditions that require + attention and remain until resolved.

@for (check of health?.checks; track check.name) { -

- - - {{ check?.name }} - +

+ + + {{ check?.name }} + +

+ {{ check?.description }} +

}

} @if (isPGStatePanelOpen) { -

+ (closed)="togglePGStatesPanel()" + > +

- Placement groups are how Ceph groups and distributes data across storage devices to manage replication, recovery, and performance. + Placement groups are how Ceph groups and distributes data across storage devices to manage + replication, recovery, and performance.

- @for (data of health?.pgs?.io; track $index ; let isLast = $last) { -

{{data.value | dimlessBinary }} / s

+ gap="4" + > + @for (data of health?.pgs?.io; track $index; let isLast = $last) { +

{{ data.value | dimlessBinary }} / s

}

+ [data]="health?.pgs?.states" + [columns]="pgTableColumns" + size="xs" + >

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/overview/storage-card/overview-storage-card.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/overview/storage-card/overview-storage-card.component.html index 94f4f9b6b9b..1bbb9d850ce 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/overview/storage-card/overview-storage-card.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/overview/storage-card/overview-storage-card.component.html @@ -1,153 +1,182 @@

Storage overview

+ Storage overview +

- @if(!storageEmptyState) { -

- @if( usedRaw !== null && totalRaw !== null && usedRawUnit && totalRawUnit) { -

- {{usedRaw}} - {{usedRawUnit}} of {{totalRaw}} {{totalRawUnit}} used - - - - @if(threshold === 'high') { - -
- -
- High storage usage - - } - @else if(threshold === 'critical') { - -
- -
- Capacity critically low - - } -

- } - @else { - - - } -

- } - @else { + @if (!storageEmptyState) { +

+ @if (usedRaw !== null && totalRaw !== null && usedRawUnit && totalRawUnit) { +

+ {{ usedRaw }} + {{ usedRawUnit }} of {{ totalRaw }} {{ totalRawUnit }} used + + + + @if (threshold === 'high') { + +
+ +
+ High storage usage + + } @else if (threshold === 'critical') { + +
+ +
+ Capacity critically low + + } +

+ } @else { + + + } +

+ } @else { + i18n-text + > } @if (!prometheusEmptyState && !storageEmptyState) { - @if(isBreakdownLoaded) { - - } @else { - - -} - - @if(consumptionTrendData.length) { -

- - -

- {{ estimatedTimeUntilFull }} -

- - Estimated time until full - -

+ @if (isBreakdownLoaded) { + + } @else { + + + } + + @if (consumptionTrendData.length) { +

+ +

- {{ averageDailyConsumption }} -

- - Average consumption - +

+ {{ estimatedTimeUntilFull }} +

+ + Estimated time until full + +

+ {{ averageDailyConsumption }} +

+ + Average consumption + +

+ } } -} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html index 988a8a25219..ab2abaa4222 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html @@ -1,4 +1,6 @@ {{ serviceType }}.{{ serviceId }} - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.html index e8e6624d802..33f026f2438 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.html @@ -1,15 +1,22 @@ - - + + {{ row.value | dimless }} {{ row.unit }} - Performance counters not available + Performance counters not available diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.html index 5699d556e0c..285a12265bd 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.html @@ -4,9 +4,7 @@ [hasScrollingContent]="false" (overlaySelected)="closeModal()" > - +

- +

- + @if (form.showError('name', formDir, 'required')) { - - This field is required! - + + This field is required! + } @if (form.showError('name', formDir, 'pattern')) { - - The name can only consist of alphanumeric characters, dashes and underscores. - + + The name can only consist of alphanumeric characters, dashes and underscores. + } @if (form.showError('name', formDir, 'uniqueName')) { - - The chosen erasure code profile name is already in use. - + + The chosen erasure code profile name is already in use. + }

- - + - + @if (form.showError('root', formDir, 'required')) { - - This field is required! - + + This field is required! + }

@if (!failureDomains) { - + } @for (domain of failureDomainKeys; track domain) { - + } - + -

- + @for (deviceClass of devices; track deviceClass) { - + } - + - +

-
+
- + @if (form.showError('name', formDir, 'required')) { - - This field is required! - + + This field is required! + } @if (form.showError('name', formDir, 'pattern')) { - - The name can only consist of alphanumeric characters, dashes and underscores. - + + The name can only consist of alphanumeric characters, dashes and underscores. + } @if (form.showError('name', formDir, 'uniqueName')) { - - The chosen erasure code profile name is already in use. - + + The chosen erasure code profile name is already in use. + }
-
+
@if (!plugins) { - + } @for (plugin of plugins; track plugin) { - + } - + - + Plugin - - +
-
+
- + @if (form.showError('k', formDir, 'required')) { - - This field is required! - + + This field is required! + } @if (form.showError('k', formDir, 'min')) { - - Must be equal to or greater than 2. - + + Must be equal to or greater than 2. + } - @if (form.showError('k', formDir, 'max') && form.getValue('crushFailureDomain') === CrushFailureDomains.Osd) { - - Chunks (k+m) have exceeded the available OSDs of {{deviceCount}}. - + @if ( + form.showError('k', formDir, 'max') && + form.getValue('crushFailureDomain') === CrushFailureDomains.Osd + ) { + + Chunks (k+m) have exceeded the available OSDs of {{ deviceCount }}. + } - @if (form.showError('k', formDir, 'max') && form.getValue('crushFailureDomain') === CrushFailureDomains.Host) { - - Chunks (k+m+1) have exceeded the available hosts of {{deviceCount}}. - + @if ( + form.showError('k', formDir, 'max') && + form.getValue('crushFailureDomain') === CrushFailureDomains.Host + ) { + + Chunks (k+m+1) have exceeded the available hosts of {{ deviceCount }}. + } @if (form.showError('k', formDir, 'unequal')) { - - For an equal distribution k has to be a multiple of (k+m)/l. - + + For an equal distribution k has to be a multiple of (k+m)/l. + } @if (form.showError('k', formDir, 'kLowerM')) { - - K has to be equal to or greater than m in order to recover data correctly through c. - + + K has to be equal to or greater than m in order to recover data correctly through c. + } @if (plugin === 'lrc') { - - Distribution factor: {{lrcMultiK}} - + + Distribution factor: {{ lrcMultiK }} + }
-
+
@if (form.showError('m', formDir, 'required')) { - - This field is required! - + + This field is required! + } @if (form.showError('m', formDir, 'min')) { - - Must be equal to or greater than 1. - + + Must be equal to or greater than 1. + } - @if (form.showError('m', formDir, 'max') && form.getValue('crushFailureDomain') === CrushFailureDomains.Osd) { - - Chunks (k+m) have exceeded the available OSDs of {{deviceCount}}. - + @if ( + form.showError('m', formDir, 'max') && + form.getValue('crushFailureDomain') === CrushFailureDomains.Osd + ) { + + Chunks (k+m) have exceeded the available OSDs of {{ deviceCount }}. + } - @if (form.showError('m', formDir, 'max') && form.getValue('crushFailureDomain') === CrushFailureDomains.Host) { - - Chunks (k+m+1) have exceeded the available hosts of {{deviceCount}}. - + @if ( + form.showError('m', formDir, 'max') && + form.getValue('crushFailureDomain') === CrushFailureDomains.Host + ) { + + Chunks (k+m+1) have exceeded the available hosts of {{ deviceCount }}. + }
@if (plugin === 'shec') { -
- - - - @if (form.showError('c', formDir, 'min')) { - - Must be equal to or greater than 1. - - } - @if (form.showError('c', formDir, 'cGreaterM')) { - - C has to be equal to or lower than m as m defines the amount of chunks that can be used. - - } - -
- } - - - @if (plugin === PLUGIN.CLAY) { -
-
+
+ + @if (form.showError('c', formDir, 'min')) { + + Must be equal to or greater than 1. + + } + @if (form.showError('c', formDir, 'cGreaterM')) { + + C has to be equal to or lower than m as m defines the amount of chunks that can be + used. + + } +
+ } + + @if (plugin === PLUGIN.CLAY) {
- @if(dCalc) { - - - - } @else { - - - - } -
- - - @if (!dCalc && (getDMin() < getDMax())) { -
+
+ - D can be set from {{getDMin()}} to {{getDMax()}} -
+ +
+ +
+ @if (dCalc) { + + + + } @else { + + + } - @if (!dCalc && getDMin() === getDMax()) { -
- D can only be set to {{getDMax()}} -
+
+ + + @if (!dCalc && getDMin() < getDMax()) { +
+ D can be set from {{ getDMin() }} to {{ getDMax() }} +
+ } + @if (!dCalc && getDMin() === getDMax()) { +
+ D can only be set to {{ getDMax() }} +
+ } + + + + D is automatically updated on k and m changes + + + @if (form.showError('d', formDir, 'dMin')) { + + D has to be greater than k ( {{ getDMin() }} ). + } - - - - - D is automatically updated on k and m changes - - - - @if (form.showError('d', formDir, 'dMin')) { - - D has to be greater than k ( {{getDMin()}} ). - - } - @if (form.showError('d', formDir, 'dMax')) { - - D has to be lower than k + m ( {{getDMax()}} ). - - } - + @if (form.showError('d', formDir, 'dMax')) { + + D has to be lower than k + m ( {{ getDMax() }} ). + + } + - - Helper chunks (d) - - - -
+ + Helper chunks (d) + + +
} @if (plugin === PLUGIN.LRC) { -
- - - - - - Locality groups: {{lrcGroups}} - - - - - @if (form.showError('l', formDir, 'required')) { - - This field is required! - - } - @if (form.showError('l', formDir, 'min')) { - - Must be equal to or greater than 1. - - } - @if (form.showError('l', formDir, 'unequal')) { - - Can't split up chunks (k+m) correctly with the current locality. - - } - + - - Locality (l) - - - -
+ + Locality groups: {{ lrcGroups }} + + + + @if (form.showError('l', formDir, 'required')) { + + This field is required! + + } + @if (form.showError('l', formDir, 'min')) { + + Must be equal to or greater than 1. + + } + @if (form.showError('l', formDir, 'unequal')) { + + Can't split up chunks (k+m) correctly with the current locality. + + } + + + + Locality (l) + + +
} -
+
- @if (!failureDomains) { - - } - @for (domain of failureDomainKeys; track domain) { - - } + @if (!failureDomains) { + + } + @for (domain of failureDomainKeys; track domain) { + + }
@@ -532,15 +484,16 @@ i18n > - + @@ -563,15 +516,16 @@ i18n > - + @@ -584,173 +538,147 @@ let-showMaxFailureDomains="showMaxFailureDomains" > @if (control?.errors) { - @if (control.hasError('required')) { - - {{ requiredText }} - - } - @if (showMaxFailureDomains && control.hasError('maxFailureDomains')) { - - The number of failure domains ({{ form.controls.crushNumFailureDomains.value }}) cannot exceed the available count ({{ failureDomains[form.controls.crushFailureDomain.value]?.length || 0 }}) for the selected failure domain type ({{ form.controls.crushFailureDomain.value }}). - - } - @if (control.hasError('pattern')) { - - Enter a valid positive number - - } + @if (control.hasError('required')) { + + {{ requiredText }} + + } + @if (showMaxFailureDomains && control.hasError('maxFailureDomains')) { + + The number of failure domains ({{ form.controls.crushNumFailureDomains.value }}) + cannot exceed the available count ({{ + failureDomains[form.controls.crushFailureDomain.value]?.length || 0 + }}) for the selected failure domain type ({{ + form.controls.crushFailureDomain.value + }}). + + } + @if (control.hasError('pattern')) { + + Enter a valid positive number + + } } @if (plugin === PLUGIN.LRC) { -
- - @if (!failureDomains) { - - } - @if (failureDomainKeys.length > 0) { - - } - @for (domain of failureDomainKeys; track domain) { - - } - -
+ @if (!failureDomains) { + + } + @if (failureDomainKeys.length > 0) { + + } + @for (domain of failureDomainKeys; track domain) { + + } + +
} @if (PLUGIN.CLAY === plugin) { -
- - @for (plugin of [PLUGIN.JERASURE, PLUGIN.ISA, PLUGIN.SHEC]; track plugin) { - - } - -
+ @for (plugin of [PLUGIN.JERASURE, PLUGIN.ISA, PLUGIN.SHEC]; track plugin) { + + } + +
} @if ([PLUGIN.JERASURE, PLUGIN.ISA, PLUGIN.CLAY].includes(plugin)) { -
- - @for (technique of techniques; track technique) { - - } - -
+ @for (technique of techniques; track technique) { + + } + +
} @if (plugin === PLUGIN.JERASURE) { -
- - - - @if (form.showError('packetSize', formDir, 'min')) { - - Must be equal to or greater than 1. - - } - -
+ + + @if (form.showError('packetSize', formDir, 'min')) { + + Must be equal to or greater than 1. + + } + +
} @if ([PLUGIN.JERASURE, PLUGIN.ISA, PLUGIN.CLAY].includes(plugin)) { -
- - - - -
+
+ + + +
} -
+
- + @for (deviceClass of devices; track deviceClass) { - + } @@ -778,20 +700,13 @@ i18n > Crush device class - - +
-
- +
+ Directory -
+
- Details + Details - + - - Performance Details + + Performance Details - + - - Configuration + + Configuration - - Cache Tiers Details + + Cache Tiers Details - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html index dfcd7523a08..8543484f9ef 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.html @@ -2,9 +2,7 @@ cdsCol [columnNumbers]="{ md: 4 }" > - + {{ action | titlecase }} {{ resource | upperFirst }} - @if (isStretchMode) { - - Stretch cluster is enabled. Only replicated pool type is supported in Stretch mode. - - } + @if (isStretchMode) { + + Stretch cluster is enabled. Only replicated pool type is supported in Stretch mode. + + }

-
+
@if (form.showError('name', formDir, 'required')) { - - This field is required! - + + This field is required! + } @if (form.showError('name', formDir, 'uniqueName')) { - - The chosen Ceph pool name is already in use. - + + The chosen Ceph pool name is already in use. + } @if (form.showError('name', formDir, 'rbdPool')) { - - It's not possible to create an RBD pool with '/' in the name. Please change the name - or remove 'rbd' from the applications list. - + + It's not possible to create an RBD pool with '/' in the name. Please change the name + or remove 'rbd' from the applications list. + } @if (form.showError('name', formDir, 'pattern')) { - - Pool name can only contain letters, numbers, '.', '-', '_' or '/'. - + + Pool name can only contain letters, numbers, '.', '-', '_' or '/'. + }
@@ -89,9 +85,7 @@ class="form-item" cdsRow > -
+
@if (isStretchMode) { - + + + @for (poolType of data.poolTypes; track poolType) { + + {{ poolType | upperFirst }} + + } + + + } @else { @for (poolType of data.poolTypes; track poolType) { - - {{ poolType | upperFirst }} - + + {{ poolType | upperFirst }} + } - - } @else { - - @for (poolType of data.poolTypes; track poolType) { - - {{ poolType | upperFirst }} - - } - } @if (form.showError('poolType', formDir, 'required')) { - - This field is required! - + + This field is required! + }

@if (isReplicated || isErasure) { -
- -
-
- - @for (mode of pgAutoscaleModes; track mode) { - - } - -
-
- - @if (form.getValue('pgAutoscaleMode') !== 'on') { -
+
+
- - - - @if (form.showError('pgNum', formDir, 'required')) { - - This field is required! - - } - @if (form.showError('pgNum', formDir, 'min')) { - - At least one placement group is needed! - - } - @if (form.showError('pgNum', formDir, 'pgMax')) { - + - The specified PG is out of range. A value from {{ getMinPgs() }} to {{ getMaxPgs() }} is allowed. - - } - - - - @if (externalPgChange) { - The current PGs settings were calculated for you, you should make sure the values suit your needs before submit. + @for (mode of pgAutoscaleModes; track mode) { + } - - - - + +

-
- } - - @if (isReplicated) { -
-
- + @if (form.getValue('pgAutoscaleMode') !== 'on') { +
- - - @if (form.showError('size', formDir)) { - - Invalid input. Replicated size must be between {{ getMinSize() }} and - {{ getMaxSize() }}. - - } - - - @if (isStretchMode) { - - The replicated size value is predefined for stretch cluster - - } - @if (form.getValue('size') === 1) { - - A size of 1 will not create a replication of the object. The 'Replicated size' - includes the object itself. - - } - -
-
- } - - @if (info?.is_all_bluestore && isErasure) { -
-
- + + + + @if (form.showError('pgNum', formDir, 'required')) { + + This field is required! + + } + @if (form.showError('pgNum', formDir, 'min')) { + + At least one placement group is needed! + + } + @if (form.showError('pgNum', formDir, 'pgMax')) { + + The specified PG is out of range. A value from {{ getMinPgs() }} to + {{ getMaxPgs() }} is allowed. + + } + + + + @if (externalPgChange) { + The current PGs settings were calculated for you, you should make sure the + values suit your needs before submit. + + } + + + + +
+
+ } + + @if (isReplicated) { +
- - Flags - - - EC Overwrites - - -
+
+ + + + @if (form.showError('size', formDir)) { + + Invalid input. Replicated size must be between {{ getMinSize() }} and + {{ getMaxSize() }}. + + } + + + @if (isStretchMode) { + The replicated size value is predefined for stretch cluster + } + @if (form.getValue('size') === 1) { + + A size of 1 will not create a replication of the object. The 'Replicated size' + includes the object itself. + + } + +
+
+ } + + @if (info?.is_all_bluestore && isErasure) { +
+
+ + Flags + EC Overwrites + +
+
+ }
- } -
} -
+
- - + - - Pools need to be associated with an application before use - + Pools need to be associated with an application before use
- @if ((permissions?.rbdMirroring?.create || (editing && permissions?.rbdMirroring?.update)) && data.applications.selected.includes('rbd')) { -
+ @if ( + (permissions?.rbdMirroring?.create || (editing && permissions?.rbdMirroring?.update)) && + data.applications.selected.includes('rbd') + ) {
- - Mirroring - - Check this option to enable Pool based mirroring on a Block(RBD) pool. - - +
+ + Mirroring + + Check this option to enable Pool based mirroring on a Block(RBD) pool. + + +

-
} @if (isErasure || isReplicated) { -
- - CRUSH - - - @if (isErasure) { -
-
+ - + + @if (isErasure) { +
- @if (!ecProfiles) { - - } - @if (ecProfiles && ecProfiles.length === 0) { - + } + @if (ecProfiles && ecProfiles.length === 0) { + + } + @for (ecp of ecProfiles; track ecp.name) { + + } + +
+ +
- -- No erasure code profile available -- - - } - @for (ecp of ecProfiles; track ecp.name) { - + + + +
+ @if (!editing) { +
+ + + +
+
+ @if (ecpUsage || ecProfiles?.length === 1) { + + + + + + } @else { + + + + } +
} - -
+
+ }
- - - +
+ @if (data.erasureInfo) { + + + + + + + + + + + + + + Profile is not in use. + + @if (ecpUsage) { +
+ @for (pool of ecpUsage; track pool) { +
+ {{ pool }} +
+ } +
+ } @else { + + } + + + } +

- @if (!editing) { -
- - - -
-
- @if (ecpUsage || ecProfiles?.length === 1) { - - - - - - } @else { - - - - } -
- } -
- } -
-
- @if (data.erasureInfo) { - + @if (isErasure && !editing) { +
- - - - - - - - + - - - - - - Profile is not in use. - - - @if (ecpUsage) { -
- @for (pool of ecpUsage; track pool) { -
- {{ pool }} -
+ Crush ruleset + +
+ @if (!msrCrush) { + + A new crush ruleset will be implicitly created. + + } @else { + + A new crush MSR ruleset will be implicitly created. When + crush-osds-per-failure-domain or crush-num-failure-domains is specified + } -
- } @else { - - } - - - } -
-
+
+
+
+ } - - @if (isErasure && !editing) { -
-
- + @if (isReplicated || editing) { +
- Crush ruleset - -
- @if (!msrCrush) { - - A new crush ruleset will be implicitly created. - + + + There are no rules. + + + + @if (current.rules.length > 0) { +
+ + @for (rule of current.rules; track rule.rule_name) { + + } + + + @if (form.showError('crushRule', formDir, 'required')) { + + This field is required! + + } + +
} @else { - - A new crush MSR ruleset will be implicitly created. When - crush-osds-per-failure-domain or crush-num-failure-domains is specified - +
+ +
} -
-
-
- } - - @if (isReplicated || editing) { -
- - - - There are no rules. - - - - - @if (current.rules.length > 0) { -
- - @for (rule of current.rules; track rule.rule_name) { - - } - - - @if (form.showError('crushRule', formDir, 'required')) { - - This field is required! - - } - -
- } @else { -
- -
- } - -
- - - - - -
- @if (isReplicated && !editing) { -
- - - -
- } - @if (!editing) { -
- @if (crushUsage || current?.rules?.length === 1) { - - - + +
+ @if (isReplicated && !editing) { +
- - - - } @else { - - - - } -
+ + + +
+ } + @if (!editing) { +
+ @if (crushUsage || current?.rules?.length === 1) { + + + + + + } @else { + + + + } +
+ } +
} -
- } -

- @if (data.crushInfo && form.getValue('crushRule')) { - - - - - - - - - - - + @if (data.crushInfo && form.getValue('crushRule')) { + - - - -
- @for (step of this.selectedCrushRule?.steps; track $index) { -
- {{ describeCrushStep(step) }} -
- } -
- - - - - Rule is not in use. - - - @if (crushUsage) { -
- @for (pool of crushUsage; track pool) { -
- {{ pool }} -
- } -
- } @else { - - } - - - } + + + + + + + + + + + + + +
+ @for (step of this.selectedCrushRule?.steps; track $index) { +
+ {{ describeCrushStep(step) }} +
+ } +
+ + + + Rule is not in use. + + @if (crushUsage) { +
+ @for (pool of crushUsage; track pool) { +
+ {{ pool }} +
+ } +
+ } @else { + + } + + + } +

-

} @if (info?.is_all_bluestore) { -

- - Compression - - -

+ - - @for (mode of info.compression_modes; track mode) { - - } - - - Policy used for compression algorithm. - {{ poolService.formTooltips.compressionModes[form.controls.compression.controls.mode.value] }} - -

- @if (hasCompressionEnabled()) { -

- + Compression + +

- @if (!info.compression_algorithms) { - - } - @if (info.compression_algorithms && info.compression_algorithms.length === 0) { - - } - @for (algorithm of info.compression_algorithms; track algorithm) { - + @for (mode of info.compression_modes; track mode) { + } -

- -

- - - - @if (form.showError('minBlobSize', formDir, 'min')) { - - Value should be greater than or equal to 0 - - } - @if (form.showError('minBlobSize', formDir, 'maximum')) { - Value should be less than the maximum blob size - - } + + Policy used for compression algorithm. + {{ + poolService.formTooltips.compressionModes[ + form.controls.compression.controls.mode.value + ] + }}

- - @for (minBlobSizeUnit of blobUnits; track minBlobSizeUnit) { - - } - -

- -

- + +

- - - @if (form.showError('maxBlobSize', formDir, 'min')) { - - Value should be greater than or equal to 0 - - } - @if (form.showError('maxBlobSize', formDir, 'minimum')) { - - Value should be greater than the minimum blob size - - } - -

- + + @if (!info.compression_algorithms) { + + } + @if (info.compression_algorithms && info.compression_algorithms.length === 0) { + + } + @for (algorithm of info.compression_algorithms; track algorithm) { + + } + +

+ +

- @for (maxBlobSizeUnit of blobUnits; track maxBlobSizeUnit) { - - } - -

- -

- + + + + @if (form.showError('minBlobSize', formDir, 'min')) { + + Value should be greater than or equal to 0 + + } + @if (form.showError('minBlobSize', formDir, 'maximum')) { + Value should be less than the maximum blob size + + } + +

+ + @for (minBlobSizeUnit of blobUnits; track minBlobSizeUnit) { + + } + +

+ +

- - - @if (form.showError('ratio', formDir, 'min') || form.showError('ratio', formDir, 'max')) { - - Value should be between 0.0 and 1.0 - - } - +

+ + + + @if (form.showError('maxBlobSize', formDir, 'min')) { + + Value should be greater than or equal to 0 + + } + @if (form.showError('maxBlobSize', formDir, 'minimum')) { + + Value should be greater than the minimum blob size + + } + +

+ + @for (maxBlobSizeUnit of blobUnits; track maxBlobSizeUnit) { + + } + +

+ +

+ + + + @if ( + form.showError('ratio', formDir, 'min') || + form.showError('ratio', formDir, 'max') + ) { + + Value should be between 0.0 and 1.0 + + } + +

+ }

- } -

}

- + Quotas @@ -1086,9 +1059,7 @@ cdsRow class="form-item form-item-append" > -

@if (form.showError('max_bytes', formDir, 'min')) { - The value should be greater or equal to 0 - + The value should be greater or equal to 0 + }

@for (maxBytesUnit of maxBytesUnits; track maxBytesUnit) { - + }

@@ -1134,9 +1103,7 @@ cdsRow class="form-item" > -

- - Leave it blank or specify 0 to disable this quota. - + Leave it blank or specify 0 to disable this quota.
- - A valid quota should be greater than 0. - + A valid quota should be greater than 0.

@if (form.showError('max_objects', formDir, 'min')) { - The value should be greater or equal to 0 - + The value should be greater or equal to 0 + }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html index 07b15e42f8b..76f32464202 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html @@ -1,48 +1,66 @@ -

- Pools List + Pools List

- - + + - +

- - Overall Performance + + Overall Performance

- +

@@ -50,12 +68,16 @@

- - + + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/bucket-tag-modal/bucket-tag-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/bucket-tag-modal/bucket-tag-modal.component.html index fe4023f6dfe..c262ea979db 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/bucket-tag-modal/bucket-tag-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/bucket-tag-modal/bucket-tag-modal.component.html @@ -1,75 +1,106 @@ - - + -

{{ getMode() }} Tag

+ {{ getMode() }} Tag +

- +

- Key - + Key +

- This field is required. - This key must be unique. - Length of the key must be maximum of 128 characters + This field is required. + This key must be unique. + Length of the key must be maximum of 128 characters

- Value - + Value +

- This field is required. - Length of the value must be a maximum of 128 characters + This field is required. + Length of the value must be a maximum of 128 characters

- + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html index 6bb030d29a6..5824aa5e200 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/create-rgw-service-entities/create-rgw-service-entities.component.html @@ -1,10 +1,16 @@ - +

Create Realm/Zonegroup/Zone

+ Create Realm/Zonegroup/Zone +

- The realm/zonegroup/zone created will be set as default and master. + The realm/zonegroup/zone created will be set as default and master.

Realm Name @@ -33,7 +43,8 @@ formControlName="realmName" [invalid]=" createMultisiteEntitiesForm.controls.realmName.invalid && - createMultisiteEntitiesForm.controls.realmName.dirty" + createMultisiteEntitiesForm.controls.realmName.dirty + " [autofocus]="true" modal-primary-focus /> @@ -51,8 +62,10 @@

Zonegroup Name @@ -63,8 +76,10 @@ id="zonegroupName" name="zonegroupName" formControlName="zonegroupName" - [invalid]="createMultisiteEntitiesForm.controls.zonegroupName.invalid && - createMultisiteEntitiesForm.controls.zonegroupName.dirty" + [invalid]=" + createMultisiteEntitiesForm.controls.zonegroupName.invalid && + createMultisiteEntitiesForm.controls.zonegroupName.dirty + " />

@@ -80,8 +95,10 @@

Zone Name @@ -92,8 +109,10 @@ id="zoneName" name="zoneName" formControlName="zoneName" - [invalid]="createMultisiteEntitiesForm.controls.zoneName.invalid && - createMultisiteEntitiesForm.controls.zoneName.dirty" + [invalid]=" + createMultisiteEntitiesForm.controls.zoneName.invalid && + createMultisiteEntitiesForm.controls.zoneName.dirty + " />

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zone-deletion-form/rgw-multisite-zone-deletion-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zone-deletion-form/rgw-multisite-zone-deletion-form.component.html index 84cc7ccc23c..7fb090aefcc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zone-deletion-form/rgw-multisite-zone-deletion-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zone-deletion-form/rgw-multisite-zone-deletion-form.component.html @@ -1,60 +1,80 @@ - +

Delete zone

+ Delete zone +

- - + + This will delete your {{ zone?.name }} Zone. @if (includedPools.size) { - - Do you want to delete the associated pools with the - {{ zone?.name }} Zone? - - - This will delete the following pools and any data stored in these pools: - + + Do you want to delete the associated pools with the + {{ zone?.name }} Zone? + + + This will delete the following pools and any data stored in these pools: + -

- @for (pool of includedPools; track pool) { -

- {{ pool }} +

+ @for (pool of includedPools; track pool) { +

+ {{ pool }} +

+ }

- } -

- Yes, I want to delete the pools. - -

+ Yes, I want to delete the pools. + +

- @if (displayText) { - - This will delete all the data in the pools! - - } + @if (displayText) { + + This will delete all the data in the pools! + + } }

- + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html index 98ac65ddf6e..2931daa4a79 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-multisite-zonegroup-deletion-form/rgw-multisite-zonegroup-deletion-form.component.html @@ -1,74 +1,97 @@ - +

Delete zonegroup

+ Delete zonegroup +

- + + This will delete your {{ zonegroup?.name }} Zonegroup. - @if (zonesList.length > 0) { - - - Do you want to delete the associated zones and pools with the {{zonegroup?.name}} Zonegroup? - + @if (zonesList.length > 0) { + + + Do you want to delete the associated zones and pools with the + {{ zonegroup?.name }} Zonegroup? + - @if (includedPools.size > 0) { - - - This will delete the following: - - - } + @if (includedPools.size > 0) { + + + This will delete the following: + + + } -

Zones:

- @for (zone of zonesList; track zone) { -

{{zone}}

- } -

- @if (includedPools.size > 0) { - -

Pools:

- @for (pool of includedPools; track pool) { -

{{ pool }}

Zones:

+ @for (zone of zonesList; track zone) { +

+ {{ zone }} +

} -

- - } - -

- +

@if (includedPools.size > 0) { - Yes, I want to delete the zones and their pools. - } @else { - Yes, I want to delete the zones. + +

Pools:

+ @for (pool of includedPools; track pool) { +

+ {{ pool }} +

+ } +

+ } - -

- @if (displayText) { - - This will delete all the data in the pools! - +

+ + @if (includedPools.size > 0) { + Yes, I want to delete the zones and their pools. + } @else { + Yes, I want to delete the zones. + } + +

+ + @if (displayText) { + + This will delete all the data in the pools! + + } + } - - }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-account-role-form/rgw-account-role-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-account-role-form/rgw-account-role-form.component.html index 641b3c9c94e..8f76fca74a1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-account-role-form/rgw-account-role-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-account-role-form/rgw-account-role-form.component.html @@ -1,175 +1,280 @@ - + @if (isEdit) { -

Role

Edit session duration

+ Role +

+ Edit session duration +

+ } @else { -

User account

Create role

+ User account +

+ Create role +

+ } -

@if (!isEdit) { - -

- Account -

+ +

+ + Account + +

- -

- Role name - +

+ - - - @if (form.showError('role_name', formDir, 'required')) { - This field is required. - } - -

+ [invalidText]="roleNameError" + helperText="Unique name used to identify this role within the account." + i18n-helperText + >Role name + + + + @if (form.showError('role_name', formDir, 'required')) { + This field is required. + } + +

- + } @else { -

- Role -

- + - {{ form.getValue('role_name') }} - -

- -

- User account:
- {{ accountName }} -

- -

+ Role + +

+ + {{ form.getValue('role_name') }} + +

+ +

+ User account:
+ {{ accountName }} +

+ +

} @if (!isEdit) { - -

- Role path - +

+ - - - @if (form.showError('role_path', formDir, 'required')) { - This field is required. - } - -

+ [invalidText]="pathError" + helperText='Specifies the hierarchy or namespace for the role. Use "/" for the root path.' + i18n-helperText + >Role path + Path + + + + @if (form.showError('role_path', formDir, 'required')) { + This field is required. + } + +

- -

- Trust policy - - - - @if (form.showError('role_assume_policy_doc', formDir, 'required')) { - This field is required. - } @if (form.showError('role_assume_policy_doc', formDir, 'json')) { - Must be a valid JSON. - } - -

+ helperText="Defines which principals can assume this role. Enter a valid JSON policy document." + i18n-helperText + >Trust policy + + + + @if (form.showError('role_assume_policy_doc', formDir, 'required')) { + This field is required. + } + @if (form.showError('role_assume_policy_doc', formDir, 'json')) { + Must be a valid JSON. + } + +

} @if (isEdit) { -

- - - - @if (form.showError('max_session_duration', formDir, 'required')) { - This field is required. - } @if (form.showError('max_session_duration', formDir, 'min')) { - Minimum value is 1 hour. - } @if (form.showError('max_session_duration', formDir, 'max')) { - Maximum value is 12 hours. - } - -

+ + + + @if (form.showError('max_session_duration', formDir, 'required')) { + This field is required. + } + @if (form.showError('max_session_duration', formDir, 'min')) { + Minimum value is 1 hour. + } + @if (form.showError('max_session_duration', formDir, 'max')) { + Maximum value is 12 hours. + } + +

}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-account-roles-list/rgw-account-roles-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-account-roles-list/rgw-account-roles-list.component.html index 209f15a6daa..d0cc9a34736 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-account-roles-list/rgw-account-roles-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-account-roles-list/rgw-account-roles-list.component.html @@ -1,14 +1,18 @@ - - + + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.html index 817088ad4b8..901a5acb730 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.html @@ -1,49 +1,83 @@ -

- Details + Details

- - +

- + - + - + - + - + - + - + @@ -52,29 +86,51 @@

Bucket quota -

Versioning	+ Versioning +	{{ selection.versioning }}
Encryption	+ Encryption +	{{ selection.encryption }}
Replication	+ Replication +	{{ replicationStatus }}
MFA Delete	+ MFA Delete +	{{ selection.mfa_delete }}
Index type	+ Index type +	{{ selection.index_type }}
Placement rule	+ Placement rule +	{{ selection.placement_rule }}
Last modification time	+ Last modification time +	{{ selection.mtime \| cdDate }}

- + - - + + - - + + @@ -86,23 +142,37 @@ Locking -

Enabled	+ Enabled +	{{ selection.bucket_quota.enabled \| booleanText }}
Maximum size	Unlimited	+ Maximum size +	+ Unlimited +	{{ selection.bucket_quota.max_size \| dimless }}
Maximum objects	Unlimited	+ Maximum objects +	+ Unlimited +	{{ selection.bucket_quota.max_objects }}

- + - + - + @@ -112,101 +182,153 @@ Tags -

Enabled	+ Enabled +	{{ selection.lock_enabled \| booleanText }}
Mode	+ Mode +	{{ selection.lock_mode }}
Days	+ Days +	{{ selection.lock_retention_period_days }}

- +

{{tag.key}}	+ {{ tag.key }} +	{{ tag.value }}

- +

- Policies + Policies

- +

- - + + - - - + - + - + - + - - + - - + - + - - + - - - + @if (row[identifier] === expanded?.[identifier] && !scrollable) { -

- -

+ +

} @else if (row[identifier] === expanded?.[identifier] && scrollable) { -

- -

+ +

} - + {{ value }} - +

- + {{ action.name }}

- - + {{ value }} - +

- +

- - {{ value }} + + {{ value }} - + @if (value | boolean) { - -} + + } - + {{ value | dimless }} /s - + @if (row.cdExecuting) { } @@ -502,181 +633,295 @@ {{ value }} @if (row.cdExecuting) { - ({{ row.cdExecuting }}) + ({{ row.cdExecuting }}) } - + - + {{ value }} - - {{value}} + + {{ value }} - - - - {{(column?.customTemplateConfig?.map && column?.customTemplateConfig?.map[item]?.value) ? column.customTemplateConfig.map[item].value : column?.customTemplateConfig?.prefix ? column.customTemplateConfig.prefix + item : item }} + + + + {{ + column?.customTemplateConfig?.map && column?.customTemplateConfig?.map[item]?.value + ? column.customTemplateConfig.map[item].value + : column?.customTemplateConfig?.prefix + ? column.customTemplateConfig.prefix + item + : item + }} - - {{ value | map:column?.customTemplateConfig }} + + {{ value | map: column?.customTemplateConfig }} - - + + - {{value}} - + class="{{ + column?.customTemplateConfig?.map && column?.customTemplateConfig?.map[item]?.class + ? column.customTemplateConfig.map[item].class + : '' + }}" + ngbTooltip="{{ + column?.customTemplateConfig?.map && column?.customTemplateConfig?.map[item]?.tooltip + ? column.customTemplateConfig.map[item].tooltip + : '' + }}" + > + {{ value }} + - - {{ value | truncate:column?.customTemplateConfig?.length:column?.customTemplateConfig?.omission }} + + {{ + value + | truncate: column?.customTemplateConfig?.length : column?.customTemplateConfig?.omission + }} - - + + - - {{ value | relativeDate }} + + {{ value | relativeDate }} - - + + - - + + - + @if (isCellEditing(row?.[identifier], column?.prop)) { - + +

+ + + + + @for ( + errorKey of formGroup?.get(row?.[identifier] + '-' + column?.prop)?.errors | keyvalue; + track $index + ) { + @if ( + formGroup?.showError(row?.[identifier] + '-' + column?.prop, formDir, errorKey.key) + ) { + + {{ + column.customTemplateConfig?.errorMessages?.[errorKey.key] || + 'Invalid ' + column.name + }} + + } + } + +

+ + + + + + +

+ + } @else {

- - - - - @for (errorKey of formGroup?.get(row?.[identifier] + '-' + column?.prop)?.errors | keyvalue; track $index) { - @if (formGroup?.showError(row?.[identifier] + '-' + column?.prop, formDir, errorKey.key)) { - - {{ column.customTemplateConfig?.errorMessages?.[errorKey.key] || ('Invalid ' + column.name) }} - - }} - +

+ {{ value }}

- - - - - +

+ + -

- - } @else { -

- {{ value }} -

- - - -

} - -@if (column.customTemplateConfig?.customRowProperty && row[column.customTemplateConfig?.customRowProperty]) { - {{value}} -} @else if (column.customTemplateConfig?.redirectLink) { - {{value}} -} @else { - {{ value }} -} + + @if ( + column.customTemplateConfig?.customRowProperty && + row[column.customTemplateConfig?.customRowProperty] + ) { + {{ value }} + } @else if (column.customTemplateConfig?.redirectLink) { + {{ + value + }} + } @else { + {{ value }} + } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/crud-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/crud-form.component.html index 002acb51e77..2dac4529402 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/crud-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/crud-form.component.html @@ -1,24 +1,35 @@

- - +

+ {{ formUISchema.title }} +

- +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-array-type/formly-array-type.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-array-type/formly-array-type.component.html index 71083238d37..a31de4da424 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-array-type/formly-array-type.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-array-type/formly-array-type.component.html @@ -1,42 +1,64 @@

- {{ props.label }} -

+ + {{ props.label }} + +

+ {{ props.description }} +

- +

- -

- +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-file-type/formly-file-type.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-file-type/formly-file-type.component.html index bf6dc6e89d9..ac77f989083 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-file-type/formly-file-type.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-file-type/formly-file-type.component.html @@ -1,4 +1,5 @@ - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-input-type/formly-input-type.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-input-type/formly-input-type.component.html index 2d807d02b82..23d2e0e61b3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-input-type/formly-input-type.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-input-type/formly-input-type.component.html @@ -1,3 +1,5 @@ - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-input-wrapper/formly-input-wrapper.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-input-wrapper/formly-input-wrapper.component.html index b8f1a478602..6968e6d3d66 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-input-wrapper/formly-input-wrapper.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-input-wrapper/formly-input-wrapper.component.html @@ -1,11 +1,16 @@

- + {{ props.label }} - + @@ -13,9 +18,11 @@

@@ -26,12 +33,17 @@ -

- {{ props.description }} + {{ props.description }}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-object-type/formly-object-type.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-object-type/formly-object-type.component.html index 84ec2ab6750..97d68342604 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-object-type/formly-object-type.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-object-type/formly-object-type.component.html @@ -1,17 +1,29 @@

- {{ props.label }} -

+ + {{ props.label }} + +

+ {{ props.description }} +

- +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-textarea-type/formly-textarea-type.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-textarea-type/formly-textarea-type.component.html index 603a3dd6033..2e505c7403e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-textarea-type/formly-textarea-type.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/crud-form/formly-textarea-type/formly-textarea-type.component.html @@ -1,9 +1,10 @@ - + diff --git a/src/pybind/mgr/dashboard/frontend/src/index.html b/src/pybind/mgr/dashboard/frontend/src/index.html index 183202cfed4..150565f6574 100644 --- a/src/pybind/mgr/dashboard/frontend/src/index.html +++ b/src/pybind/mgr/dashboard/frontend/src/index.html @@ -1,24 +1,37 @@ - - - Ceph + + + Ceph - - - - -

JavaScript required!

A browser with JavaScript enabled is required in order to use this service.

When using Internet Explorer, please check your security settings and add this address to your trusted sites.

+ + + + +

+ - - + +

Bucket policy

{{ selection.bucket_policy | json}}

+ Bucket policy +

{{ selection.bucket_policy | json }}

Lifecycle -

+ Lifecycle +

+ -

- - {{selection.lifecycle | json}} + + {{ selection.lifecycle | json }} - - {{ (selection.lifecycle | xml:{'Rules':'Rule'}) || '-'}} + + {{ (selection.lifecycle | xml: { Rules: 'Rule' }) || '-' }}

Lifecycle progress

- - + + {{ lifecycleProgress.status }} -

+ {{ lifecycleProgress?.started }} +

Replication policy

+ Replication policy +

- @if(hasSyncPolicyOnly) { - Sync policy configured. View on - Sync-policy page. - } @else { -

{{ replicationData?.policy | json}}

- } + @if (hasSyncPolicyOnly) { + Sync policy configured. View on + Sync-policy page. + } @else { +

{{ replicationData?.policy | json }}

+ }

ACL

+ ACL +

@@ -218,15 +340,15 @@ - + - + - +

Bucket Owner	{{ aclPermissions.Owner \|\| '-'}}	{{ aclPermissions.Owner \|\| '-' }}
Everyone	{{ aclPermissions.AllUsers \|\| '-'}}	{{ aclPermissions.AllUsers \|\| '-' }}
Authenticated users group	{{ aclPermissions.AuthenticatedUsers \|\| '-'}}	{{ aclPermissions.AuthenticatedUsers \|\| '-' }}

@@ -239,16 +361,24 @@ - Tiering + Tiering

- +

- Notification + Notification

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html index 5dc70c285c6..fd7f13e1295 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html @@ -1,77 +1,121 @@ -

- - -

+ +

+ {{ action | titlecase }} {{ resource | upperFirst }} +

Enabled + Enabled + {{ user.user_quota.enabled | booleanText }}

Maximum size + Maximum size + - + Unlimited @@ -150,11 +230,17 @@

Maximum objects + Maximum objects + - + Unlimited @@ -173,16 +259,26 @@ >

Enabled + Enabled + {{ user.bucket_quota.enabled | booleanText }}

Maximum size + Maximum size + - + Unlimited @@ -190,11 +286,17 @@

Maximum objects

+ Maximum objects +

Unlimited

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html index b016e0d2420..9daef795ab1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html @@ -1,51 +1,84 @@ -

- - @if(accounts.length > 0){ +

+ +

+ {{ action | titlecase }} {{ resource | upperFirst }} +

+ + @if (accounts.length > 0) {

- - - - + + + +

- Only accounts with the same tenant name can be linked to a tenanted user. + Only accounts with the same tenant name can be linked to a tenanted user.

Account membership is permanent. Once added, users cannot be removed from their account.

+ Account membership is permanent. Once added, users cannot be removed from their account. +

Ownership of all of the user's buckets will be transferred to the account.

- Account Root user - The account root user has full access to all resources and manages the account. - It's recommended to use this account for management tasks only and create additional users with specific permissions. +

+ Account Root user + The account root user has full access to all resources and manages the account. It's + recommended to use this account for management tasks only and create additional users + with specific permissions.

@@ -53,245 +86,360 @@

- User ID - + User ID +

- This field is required. - The value is not valid. - The chosen user ID is already in use. + This field is required. + The value is not valid. + The chosen user ID is already in use.

- Show Tenant + Show Tenant

- Tenant - +

+ Tenant +

- The value is not valid. - The chosen user ID exists in this tenant. + The value is not valid. + The chosen user ID exists in this tenant.

- Full name - + Full name +

- This field is required. - The value is not valid. + This field is required. + The value is not valid.

- Email address - + Email address +

- This is not a valid email address. - The chosen email address is already in use. + This is not a valid email address. + The chosen email address is already in use.

- - - - + + + +

- +

- This field is required. - The entered value must be >= 1. + This field is required. + The entered value must be >= 1.

- Suspended + Suspended Suspending the user disables the user and subuser.

- System user - System users are distinct from regular users, they are used by the RGW service to perform administrative tasks, manage buckets and objects + System user + System users are distinct from regular users, they are used by the RGW service to perform + administrative tasks, manage buckets and objects

- @if(userForm.getValue('account_id') && !userForm.getValue('account_root_user')) { - -

- Managed policies - - - -

+ @if (userForm.getValue('account_id') && !userForm.getValue('account_root_user')) { + +

+ + Managed policies + + + + +

}

- S3 key + + S3 key +

- Auto-generate key + Auto-generate key

- Access key - +

+ Access key + - +

- This field is required. + This field is required.

- Secret key - +

+ Secret key + - +

- This field is required. + This field is required.

@@ -299,168 +447,240 @@

- Subusers - - There are no subusers. - - - - -

- Subuser id - - -

- Permissions - - -

- - - - - - -

- -

- + + Subusers + + + There are no subusers. + + + +

+ Subuser id + + +

+ Permissions + + +

+ + + + + + +

+ +

- Keys + + Keys +

S3

- - There are no keys. + + There are no keys. - -

+ +

- +

- - + + - - + +

Swift

- - There are no keys. + + There are no keys. - -

+ +

- +

- - - + + +

@@ -468,73 +688,104 @@

- Capabilities - - There are no capabilities. + + Capabilities + + + There are no capabilities. - -

+ +

- Type - + Type +

- Permission - + Permission +

- - + + - - + +

@@ -544,78 +795,134 @@

- User quota + + User quota + - - Enabled + + Enabled

- Unlimited size +

+ Unlimited size

- Maximum size - +

+ Maximum size +

- This field is required. - The value is not valid. - Size must be a number or in a valid format. eg: 5 GiB + This field is required. + The value is not valid. + Size must be a number or in a valid format. eg: 5 GiB

- Unlimited objects +

+ Unlimited objects

- +

- This field is required. - The entered value must be >= 0. + This field is required. + The entered value must be >= 0.

@@ -623,77 +930,134 @@

- Bucket quota + + Bucket quota + - - Enabled + + Enabled

- Unlimited size +

+ Unlimited size

- Maximum size - +

+ Maximum size +

- Unlimited objects +

+ Unlimited objects

- +

- This field is required. - The entered value must be >= 0. + This field is required. + The entered value must be >= 0.

@@ -701,16 +1065,20 @@ - + - +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.html index daeff590c5f..87abe6acce6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.html @@ -1,62 +1,88 @@ - - + + - + - - + + - No Limit + No Limit - - + + - No Limit + No Limit - +

{{ row.uid }} @if (row.type === 'root') { - - - + + + }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html index 37defe3d34d..8e58016266c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.html @@ -1,118 +1,164 @@ - + - +

- Username - + Username + - + - +

- This field is required. + This field is required.

- Auto-generate key +

+ Auto-generate key

- Access key - +

+ Access key + - +

- This field is required. + This field is required.

- Secret key - +

+ Secret key + - +

- This field is required. + This field is required.

- + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.html index 5b1a2c3c6ca..c0404786830 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.html @@ -1,76 +1,113 @@ - + -

+ {{ action | titlecase }} {{ resource | upperFirst }} +

- Username - + Username +

- Subuser - + Subuser +

- This field is required. - The chosen subuser ID is already in use. + This field is required. + The chosen subuser ID is already in use.

- + - - - + +

- This field is required. + This field is required.

@@ -80,44 +117,59 @@

- Auto-generate key + Auto-generate key

- Secret key - +

+ Secret key + - +

- This field is required. + This field is required.

- - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.html index 3fede298cc8..9528afedfbe 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.html @@ -1,44 +1,62 @@ - +

+ {{ action | titlecase }} {{ resource | upperFirst }} +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html index bca61be2c95..38595d7205b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html @@ -1,19 +1,24 @@

- Users + Users
- Accounts + Accounts

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.html index 373ecfa4620..cac5ea679e6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.html @@ -1,53 +1,86 @@ - + -Neither hostname nor OSD ID given +Neither hostname nor OSD ID given - +

- +

- - + + - +

- +

- - - {{ "" | notAvailable }} - > {{value.min | i18nPlural: translationMapping}} - < {{value.max | i18nPlural: translationMapping}} - {{value.min}} to {{value.max | i18nPlural: translationMapping}} + + {{ '' | notAvailable }} + > {{ value.min | i18nPlural: translationMapping }} + < {{ value.max | i18nPlural: translationMapping }} + {{ value.min }} to {{ value.max | i18nPlural: translationMapping }} - - {{value}} + + {{ value }} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/feedback/feedback.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/feedback/feedback.component.html index 270f88c8443..65204929dd2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/feedback/feedback.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/feedback/feedback.component.html @@ -3,67 +3,85 @@ [open]="open" [hasScrollingContent]="false" (overlaySelected)="closeModal()" - > +> -

Report an issue

+ Report an issue +

+ @@ -99,13 +117,13 @@ i18n > @for (issueType of issueTypes; track issueType.value) { - + } @if (feedbackForm.showError('tracker', formDir, 'required')) { - Issue type is required. + Issue type is required. }

@@ -131,7 +149,7 @@ @if (feedbackForm.showError('subject', formDir, 'required')) { - Issue title is required. + Issue title is required. }

@@ -139,7 +157,9 @@

@if (feedbackForm.showError('description', formDir, 'required')) { - Description is required. + Description is required. }

@if (isFeedbackEnabled) { - - } - @else { - + + } @else { + } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html index c33632ebfac..1dfcb7b8a98 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html @@ -1,17 +1,21 @@ -

- +

+ See Logs for more details.

- - @if (legacyHealthChecks) { - {{ check.value.type }} - } @else { - {{ check.key }} - } - : {{ check.value.summary.message }}
+
+ + @if (legacyHealthChecks) { + {{ check.value.type }} + } @else { + {{ check.key }} + }: {{ check.value.summary.message }}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.html index 909f3e7ed6d..e654573ab2e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.html @@ -1,96 +1,152 @@ - Failed to retrieve SMART data. - The data received has the JSON format version 2.x and is currently incompatible with the - dashboard. + Failed to retrieve SMART data. + The data received has the JSON format version 2.x and is currently incompatible with the + dashboard.

- No SMART data available. + No SMART data available. - -

- + +

+ {{ device.value.device }} ({{ device.value.identifier }})

- {{ device.value.userMessage }} + {{ device.value.userMessage }}

- unknown + unknown

- passed + passed

- failed + failed

- -

+ +

- Device Information + Device Information

- - No device information available for this device. + + No device information available for this device.

- SMART + SMART

- - - - No SMART data available for this device. + + + + No SMART data available for this device.

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-form/smb-cluster-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-form/smb-cluster-form.component.html index 7263845999b..fa76060aab7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-form/smb-cluster-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-form/smb-cluster-form.component.html @@ -1,13 +1,19 @@ -

+ +

@@ -56,10 +62,18 @@ Stand-alone servers configuration." i18n-helperText > - - + +

- Active Directory (AD) Settings +

+ Active Directory (AD) Settings

- - + + - - + +

@@ -120,17 +148,22 @@ smbForm.get('domain_settings').hasError('required') && smbForm.controls.domain_settings.touched " - i18n>Specify the Realm and AD access resources in the Domain Settings field.Specify the Realm and AD access resources in the Domain Settings field.

- +

+ -

This field is required. + >This field is required.

+ class="cds--btn__icon" + >

@@ -215,16 +265,26 @@ formControlName="placement" id="placement" > - - + +

@if (smbForm.get('auth_mode').value === AUTHMODE.ActiveDirectory) { - -

+ +

DNS - + >DNS +

- + >

- - One or more IP Addresses that will be - applied to the Samba containers to override - the default DNS resolver(s). This option is - intended to be used when the host Ceph node - is not configured to resolve DNS entries within - AD domain(s). + One or more IP Addresses that will be applied to the Samba containers to override the + default DNS resolver(s). This option is intended to be used when the host Ceph node is + not configured to resolve DNS entries within AD domain(s).

} @@ -354,98 +424,124 @@ helperText="Default value indicates that clustering should be enabled if the placement count value is any value other than 1. Always value enables clustering regardless of the placement count. Never value disables clustering regardless of the placement count. " i18n-helperText > - +

- - - - -

- -

- Address - - - - - This field is required. - - -

- -

- Destination - - -

+ + +

- +

- - + Address + + + + + This field is required. + + +

+ +

+ Destination + + +

+ + + +

+ - - - Assign virtual IP addresses that will be managed - by the clustering subsystem and may automatically - move between nodes running Samba containers. + Assign virtual IP addresses that will be managed by the clustering subsystem and may + automatically move between nodes running Samba containers.

+ [selection]="expandedRow" + > diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-tabs/smb-cluster-tabs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-tabs/smb-cluster-tabs.component.html index e57a5b92eea..bbd0bfd5dc6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-tabs/smb-cluster-tabs.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-tabs/smb-cluster-tabs.component.html @@ -1,5 +1,3 @@ - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-domain-setting-modal/smb-domain-setting-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-domain-setting-modal/smb-domain-setting-modal.component.html index 638680db6e5..376bf28f556 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-domain-setting-modal/smb-domain-setting-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-domain-setting-modal/smb-domain-setting-modal.component.html @@ -1,17 +1,25 @@ - +

+ {{ action | titlecase }} {{ resource | upperFirst }} +

- +

+ class="form-item" + >

+ class="form-item form-item-append" + >

+ -

- +

This field is required.

- - +

+ +

- -

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-form/smb-join-auth-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-form/smb-join-auth-form.component.html index 52b4c054124..2854d4ca5b5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-form/smb-join-auth-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-form/smb-join-auth-form.component.html @@ -2,12 +2,16 @@ cdsCol [columnNumbers]="{ md: 4 }" > - -

+ +

@@ -20,7 +24,7 @@ i18n-helperText [invalid]="form.controls.authId.invalid && form.controls.authId.dirty" [invalidText]="jaError" - >Active directory access resource name + >Active directory access resource name Username - Username + + /> This field is required. + class="invalid-feedback" + *ngIf="form.showError('username', form, 'required')" + i18n + >This field is required.

@@ -74,7 +78,7 @@ i18n [invalid]="form.controls.password.invalid && form.controls.password.dirty" [invalidText]="passwordError" - >Password + >Password

This field is required. + class="invalid-feedback" + *ngIf="form.showError('password', form, 'required')" + i18n + >This field is required.

@@ -111,16 +115,22 @@ + -

+ (submitActionEvent)="submit()" + [form]="form" + [submitText]="(action | titlecase) + ' ' + (resource | upperFirst)" + wrappingClass="text-right" + >

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-list/smb-join-auth-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-list/smb-join-auth-list.component.html index ad6f0e46179..9377c992d99 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-list/smb-join-auth-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-join-auth-list/smb-join-auth-list.component.html @@ -15,7 +15,8 @@ + [tableActions]="tableActions" + >

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-overview/smb-overview.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-overview/smb-overview.component.html index 7821842c9d5..aaaf430443a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-overview/smb-overview.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-overview/smb-overview.component.html @@ -6,5 +6,6 @@ [grafanaPath]="'ceph-smb-overview?'" [type]="'metrics'" uid="feem6ehrmi2o0b" - grafanaStyle="three"> + grafanaStyle="three" +> diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-share-form/smb-share-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-share-form/smb-share-form.component.html index a9e3a662469..7340f26ffd1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-share-form/smb-share-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-share-form/smb-share-form.component.html @@ -1,18 +1,26 @@ -

+ +

- Share Name - + Share Name +

@@ -72,19 +84,25 @@ [invalidText]="volumeError" i18n-label > - - - @@ -98,8 +116,10 @@

- - +

- - + -

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-list/smb-usersgroups-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-list/smb-usersgroups-list.component.html index ea5ae0a958b..ec795bd2907 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-list/smb-usersgroups-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-usersgroups-list/smb-usersgroups-list.component.html @@ -13,18 +13,19 @@ (fetchData)="loadUsersGroups()" (updateSelection)="updateSelection($event)" > -

- - -

- - +

+ + +

+ +

Please set a new password.

You will be redirected to the login page afterwards.

- +

- - + +

- This field is required. - The old and new passwords must be different. + This field is required. + The old and new passwords must be different.

- - + +

- This field is required. - The old and new passwords must be different. - + This field is required. + The old and new passwords must be different. + {{ passwordValuation }}

@@ -63,29 +85,40 @@

- - + +

- This field is required. - Password confirmation doesn't match the new password. + This field is required. + Password confirmation doesn't match the new password.

- +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html index 32f16ef85df..39d01022a98 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html @@ -1,66 +1,92 @@ -

- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.html index ca4b6781bbf..0ee614b6c43 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.html @@ -1,11 +1,13 @@ - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.html index 7f79f92464d..e24e718a5e1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.html @@ -1,72 +1,87 @@ -

{{ action | titlecase }} {{ resource | upperFirst }} + +

+ {{ action | titlecase }} {{ resource | upperFirst }}

- +

- Name - - + Name + +

- - This field is required. - + This field is required. - - The chosen name is already in use. - + The chosen name is already in use.

- +

- Description - + Description +

Permissions - +

- +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.html index 46b21c92638..72b1717fe1d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.html @@ -1,21 +1,27 @@ - - + + - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html index 843c08e5b5c..409b84d1f9a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html @@ -1,7 +1,18 @@ -

+ +

@@ -119,10 +130,16 @@

{{ 'Password Expiration Date' }} - + The Dashboard setting defining the expiration interval of passwords is currently set to 0. This means if a date is set, the user password will only expire @@ -130,7 +147,9 @@ Consider configuring the Dashboard setting - USER_PWD_EXPIRATION_SPAN in order to let passwords expire periodically. @@ -154,9 +173,18 @@

- + Full Name - +

@@ -168,16 +196,28 @@ i18n > Email - +

- Invalid email.

- + Enabled

- - + + - - - {{ role }}{{ !isLast ? ", " : "" }} - + + {{ role }}{{ !isLast ? ', ' : '' }} - -

+ +

- - + + {{ row.remainingTimeWithoutSeconds / 1000 | duration }} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.html index 2c0ea4461b2..1c092d849c2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.html @@ -1,90 +1,123 @@ - -

+ +

+ [invalidText]="oldPasswordInvalid" + > Old Password - +

+ [helperText]="passwordPolicyHelpText" + > New Password - +

+ [invalidText]="confirmNewPasswordInvalid" + > Confirm New Password - +

- +

- -@if (control.errors) { -@for (err of control.errors | keyvalue; track err.key) { -{{ INVALID_TEXTS[err.key] }} -} -} + + @if (control.errors) { + @for (err of control.errors | keyvalue; track err.key) { + {{ INVALID_TEXTS[err.key] }} + } + }

- +

- + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.html index 1ab4e1743b3..66504fffbe0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.html @@ -1,18 +1,24 @@

- Users + Users
- Roles + Roles

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/context/context.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/context/context.component.html index bae77dfdbfd..9d7376310ed 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/context/context.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/context/context.component.html @@ -1,25 +1,54 @@ - - + +

- Object gateway: -

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/error/error.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/error/error.component.html index e0dcb07d542..d6773ed3c5e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/error/error.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/error/error.component.html @@ -1,37 +1,58 @@ Error Page - +

- +

Please consult the documentation on how to configure and enable - the {{ sectionInfo }} management functionality. +

+ {{ header }} +

+ {{ message }} +

+ Please consult the documentation on how to + configure and enable the {{ sectionInfo }} management functionality.

- - +

+ +

@@ -39,45 +60,66 @@

- + - - +

Page not Found

Sorry, we couldnât find what you were looking for. - The page you requested may have been changed or moved.

+ Sorry, we couldnât find what you were looking for. The page you requested may have been + changed or moved. +

- +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.html index bd92995be2d..5466a600c7c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.html @@ -1,6 +1,11 @@

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.html index 95d610d26d3..b8c59ddf44b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.html @@ -1,29 +1,46 @@

@if (enabledFeature$ | async; as features) { - - - @if (features.dashboard) { - - } + + + @if (features.dashboard) { + + } }

- @if(pageHeaderTitle) { - - + @if (pageHeaderTitle) { + + } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.html index 8e3346b8664..7bbb601f630 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.html @@ -1,30 +1,35 @@ - +

- +

- -

@@ -50,5 +55,3 @@

- - diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.html index 5eac4142b6b..d2d7b840707 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.html @@ -1,26 +1,43 @@ - + - - - Dashboard Settings + + Dashboard Settings diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/api-docs/api-docs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/api-docs/api-docs.component.html index 2dd0ff424c0..5d38371cae2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/api-docs/api-docs.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/api-docs/api-docs.component.html @@ -1,3 +1,4 @@ - -

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.html index 72d9cb8e1f6..fd912300e52 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.html @@ -1,13 +1,19 @@ - + - + {{ crumb.text }} - + {{ crumb.text }} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html index ea44b1057f3..7c43de237e6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html @@ -1,38 +1,59 @@ - +

- Documentation - + Documentation +

- About - Report an issue... + About + Report an issue... - - Help + + Help diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.html index c68c88d25c6..d3d1201ea14 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.html @@ -1,39 +1,58 @@ - - - - Logged in user + + Logged in user diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html index 80726f4fe13..ba607adba74 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html @@ -2,30 +2,41 @@ - @if(notificationService.panelState$ | async; as isNotifPanelOpen) { - - } + @if (notificationService.panelState$ | async; as isNotifPanelOpen) { + + } - - + + - - - - - {{ cluster.value.name }} - {{ cluster.value?.cluster_alias }} - {{ cluster.value?.user }} + + + + + {{ cluster.value.name }} - {{ cluster.value?.cluster_alias }} - + {{ cluster.value?.user }} @@ -34,18 +45,22 @@

@@ -57,10 +72,14 @@

@@ -68,13 +87,17 @@

+ -

@@ -83,197 +106,306 @@

- + - - - - Overview + + + Overview - - - Overview - Manage clusters + + + Overview + Manage clusters - - - Pools - Hosts - OSDs - Physical disks - CRUSH map - Monitors + + + Pools + Hosts + OSDs + Physical disks + CRUSH map + Monitors - - - Images - - Mirroring - + + + Images + + Mirroring + {{ summaryData?.rbd_mirroring?.warnings }} - + {{ summaryData?.rbd_mirroring?.errors }} - iSCSI - NVMe/TCP + iSCSI + NVMe/TCP - - - Overview - User management - Buckets - Notification destination - Storage class - Multi-site - Gateways - NFS - Configuration + + + Overview + User management + Buckets + Notification destination + Storage class + Multi-site + Gateways + NFS + Configuration - - - File systems + + + File systems - NFS - SMB + NFS + SMB - - - Logs - + + + Logs + Alerts - {{ prometheusAlertService.activeCriticalAlerts }} - {{ prometheusAlertService.activeWarningAlerts }} + {{ prometheusAlertService.activeCriticalAlerts }} + {{ prometheusAlertService.activeWarningAlerts }} - - - Services - Upgrade - Ceph users - Manager modules - Configuration + + + Services + Upgrade + Ceph users + Manager modules + Configuration

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-area/notification-area.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-area/notification-area.component.html index 623cae5cc2b..b0f26ee11a1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-area/notification-area.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-area/notification-area.component.html @@ -1,122 +1,138 @@

-@if (executingTasks.length > 0) { -

- Running tasks -

+ [ngClass]="{ + 'empty-body': todayNotifications.length === 0 && previousNotifications.length === 0 + }" + class="notification-area" +> + @if (executingTasks.length > 0) { +

+ Running tasks +

-@for (task of executingTasks; track task.begin_time) { -

- + @for (task of executingTasks; track task.begin_time) { +

+ -

- {{ task.description }} -

+ {{ task.description }} +

- - + + -

- - {{ task.begin_time | relativeDate }} - +

+ + {{ task.begin_time | relativeDate }} + - - {{ task.progress || 0 }} % - -

+ {{ task.progress || 0 }} % +

-} -} +

+ } + } - -

- - + +

+ + -

- {{ notification.timestamp | relativeDate }} -

- {{ notification.title }} -

+ {{ notification.timestamp | relativeDate }} +

+ {{ notification.title }} +

+ +

- + @if (!last) { +

+ }

+ - @if (!last) { -

- } -

- - -@if (todayNotifications.length > 0) { -

- Today -

+ @if (todayNotifications.length > 0) { +

+ Today +

-@for (notification of todayNotifications; track notification.id; let last = $last) { - - -} -} + @for (notification of todayNotifications; track notification.id; let last = $last) { + + + } + } -@if (previousNotifications.length > 0) { -

- Previous -

+ @if (previousNotifications.length > 0) { +

+ Previous +

-@for (notification of previousNotifications; track notification.id; let last = $last) { - - -} -} + @for (notification of previousNotifications; track notification.id; let last = $last) { + + + } + } -@if (todayNotifications.length === 0 && previousNotifications.length === 0) { -

No notifications

-} + @if (todayNotifications.length === 0 && previousNotifications.length === 0) { +

No notifications

+ }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-footer/notification-footer.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-footer/notification-footer.component.html index 3afd57c71bd..d7ef7a30631 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-footer/notification-footer.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-footer/notification-footer.component.html @@ -5,5 +5,7 @@ class="notification-footer__view-all-button" [routerLink]="['/notifications']" (click)="closePanel($event)" - i18n>View all + i18n + >View all

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-header/notification-header.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-header/notification-header.component.html index a7b765d9cd2..9698aeb2991 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-header/notification-header.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-header/notification-header.component.html @@ -2,14 +2,18 @@

Tasks and Notifications

+ class="cds--type-heading-compact-01" + > + Tasks and Notifications +

@@ -19,6 +23,8 @@ (checkedChange)="onToggleMute()" label="Mute notifications" i18n-label - hideLabel="true"> + hideLabel="true" + > +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-panel/notification-panel.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-panel/notification-panel.component.html index b9165ba7e2a..4b614761a3c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-panel/notification-panel.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-panel/notification-panel.component.html @@ -1,6 +1,7 @@

+ cdsTheme="g10" +>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.html index 92a8ea42442..d81e7dd6fd8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.html @@ -2,37 +2,49 @@ cdsGrid [useCssGrid]="false" [fullWidth]="true" - class="notifications-page__container"> + class="notifications-page__container" +>

+ [columnNumbers]="{ sm: 4, md: 4, lg: 6 }" + > + (valueChange)="onSearch($event)" + >

+ *ngIf="filteredNotifications.length > 0" + > + class="notification-row" + >

{{ notification.prometheusAlert.alertName }} + class="ml-2" + > {{ notification.prometheusAlert.status }} @@ -59,11 +71,13 @@

+ cdsRow + > + class="empty-icon" + >

No notifications match your search

No notifications available

@@ -71,50 +85,76 @@

+ [columnNumbers]="{ sm: 12, md: 12, lg: 10 }" + >

+ class="notification-details" + > +

+ class="details-list mt-4" + > Application: + class="detail-label" + >Application: {{ selectedNotification.application }}

Type: + class="detail-label" + >Type:

- {{ selectedNotification.type === 0 ? 'Error' : - selectedNotification.type === 1 ? 'Info' : - selectedNotification.type === 2 ? 'Success' : 'Warning' }} + [type]=" + selectedNotification.type === 0 + ? 'red' + : selectedNotification.type === 1 + ? 'blue' + : selectedNotification.type === 2 + ? 'green' + : 'yellow' + " + [size]="'sm'" + > + {{ + selectedNotification.type === 0 + ? 'Error' + : selectedNotification.type === 1 + ? 'Info' + : selectedNotification.type === 2 + ? 'Success' + : 'Warning' + }}

Date: + class="detail-label" + >Date: {{ formatDate(selectedNotification.timestamp) }}

Time: + class="detail-label" + >Time: {{ formatTime(selectedNotification.timestamp) }}

@@ -122,19 +162,33 @@ Alert Name: - {{ selectedNotification.prometheusAlert.alertName }} + class="detail-label" + >Alert Name: + {{ + selectedNotification.prometheusAlert.alertName + }}

Status: + class="detail-label" + >Status:

+ [type]=" + selectedNotification.prometheusAlert.status === 'active' || + selectedNotification.prometheusAlert.status === 'firing' + ? 'red' + : selectedNotification.prometheusAlert.status === 'resolved' + ? 'green' + : selectedNotification.prometheusAlert.status === 'suppressed' + ? 'gray' + : 'blue' + " + [size]="'sm'" + > {{ selectedNotification.prometheusAlert.status }}

@@ -142,13 +196,22 @@ Severity: + class="detail-label" + >Severity:

+ [type]=" + selectedNotification.prometheusAlert.severity === 'critical' + ? 'red' + : selectedNotification.prometheusAlert.severity === 'warning' + ? 'yellow' + : selectedNotification.prometheusAlert.severity === 'resolved' + ? 'green' + : 'blue' + " + [size]="'sm'" + > {{ selectedNotification.prometheusAlert.severity }}

@@ -156,35 +219,49 @@ Instance: - {{ selectedNotification.prometheusAlert.instance }} + class="detail-label" + >Instance: + {{ + selectedNotification.prometheusAlert.instance + }}

Job: + class="detail-label" + >Job: {{ selectedNotification.prometheusAlert.job }}

Description: + class="detail-label" + >Description: -

+ {{ selectedNotification.prometheusAlert.description }} +

Source: + class="detail-label" + >Source: + class="source-link" + > + size="16" + > View in Prometheus @@ -192,19 +269,26 @@ Fingerprint: + class="detail-label" + >Fingerprint: - {{ selectedNotification.prometheusAlert.fingerprint }} +

{{
+                    selectedNotification.prometheusAlert.fingerprint
+                  }}

+ *ngIf="selectedNotification.message && !selectedNotification.prometheusAlert" + > Message: + class="detail-label" + >Message:

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html index ea5dcc95386..ee41505a363 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html @@ -1,15 +1,19 @@ -@if(isMuted) { - - -} -@else if(!isMuted && ( hasRunningTasks || hasNotifications)) { - - -} -@else { - - +@if (isMuted) { + + +} @else if (!isMuted && (hasRunningTasks || hasNotifications)) { + + +} @else { + + } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.html index 1ce838ceeda..bbc1790da0c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.html @@ -1,20 +1,25 @@ - +

- diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/area-chart/area-chart.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/area-chart/area-chart.component.html index 248f6a19e8d..290255c689e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/area-chart/area-chart.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/area-chart/area-chart.component.html @@ -1,25 +1,27 @@ -@if(chartData && chartOptions){ -

- {{ chartTitle }} -

- @if(subHeading) { -

- {{ subHeading }} +@if (chartData && chartOptions) { +

+ {{ chartTitle }} +

+ @if (subHeading) { +

+ {{ subHeading }} +

+ }

+ @if (chartType === 'area') { + + + } @else { + + }

- @if(chartType === 'area') { - - - } @else { - - - } -

} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.html index 7eb83751f95..24a5e7c6ab8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.html @@ -1,10 +1,12 @@ - diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-group/card-group.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-group/card-group.component.html index df4ffa89a99..3b5d225e310 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-group/card-group.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-group/card-group.component.html @@ -1,8 +1,13 @@ -

- {{ groupTitle }} + {{ groupTitle }}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.html index e4976d6f61e..e57aa48b3e2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.html @@ -1,23 +1,27 @@ -

- @if (link && data !== null || total) { - - {{ total }} - {{ title }} - {{ title }} - {{ title }}s - - } @else { - {{title}} - - } + @if ((link && data !== null) || total) { + + {{ total }} + {{ title }} + {{ title }} + {{ title }}s + + } @else { + {{ title }} + + }

@@ -35,177 +39,186 @@

- -

@if (data === null) { - + } @else { - - - {{ data.success }} - - - {{ data.categoryPgAmount?.clean }} - - - - - - - {{ data.info }} + + + {{ data.success }} + + + {{ data.categoryPgAmount?.clean }} + + - - - - - - {{ data.warn }} + + + {{ data.info }} + + - - {{ data.categoryPgAmount?.warning }} + + + {{ data.warn }} + + + {{ data.categoryPgAmount?.warning }} + + - - - - - - {{ data.error }} + + + {{ data.error }} + + + {{ data.categoryPgAmount?.unknown }} + + - - {{ data.categoryPgAmount?.unknown }} + + + {{ data.categoryPgAmount?.working }} + + - - - - - - {{ data.categoryPgAmount?.working }} - - - }

@if (data === null) { - + } @else { - - {{ data.up }} - - - - - {{ data.up }} - - up + + {{ data.up }} + + + + {{ data.up }} + up - - - {{ data.in }} - - in + + {{ data.in }} + in - - - {{ data.down }} - - down + + {{ data.down }} + down - - - {{ data.out }} - - out + + {{ data.out }} + out - - - {{ data.nearfull }} - - nearfull - - {{ data.full }} - - full + + {{ data.nearfull }} + nearfull + + {{ data.full }} + full - }

@if (data === null || total === null) { - + } @else { - - {{ data?.up }} - - - - - {{ data?.down }} - - - - + + {{ data?.up }} + + + + + {{ data?.down }} + + }

@if (data === 0 || data) { - - {{ data }} - - + + {{ data }} + + } @else { } - - {{ data - dropdownTotalError }} - + + {{ data - dropdownTotalError }} + - {{ dropdownTotalError }} - + {{ dropdownTotalError }} + @@ -215,17 +228,19 @@ -@if (data !== null || total) { - - {{ total }} - {{ title }} - {{ title }} - {{ title }}s - -} @else { - {{ title }} -} + @if (data !== null || total) { + + {{ total }} + {{ title }} + {{ title }} + {{ title }}s + + } @else { + {{ title }} + }

@@ -233,10 +248,12 @@

- - {{ data.value.total }} + + {{ data.value.total }} {{ hwNames[data.key] }}

{{ hwNames[data.key] | pluralize }} @@ -245,16 +262,17 @@ {{ data.value.ok }} - + *ngIf="data.value.ok" + type="success" + > + - - {{ data.value.error }} - - + + {{ data.value.error }} +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.html index deb4bc366f9..94c5145bd99 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.html @@ -1,26 +1,48 @@ -

- +

+ {{ cardTitle }}

- {{ cardTitle }} +

+ {{ cardTitle }}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/cd-label/cd-label.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/cd-label/cd-label.component.html index 72819d55298..1d9fe1890e1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/cd-label/cd-label.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/cd-label/cd-label.component.html @@ -1,12 +1,14 @@ - + {{ value }} - - {{ key }}: {{ value }} + + {{ key }}: {{ value }} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/code-block/code-block.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/code-block/code-block.component.html index 47eac6364e4..9e14043f37c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/code-block/code-block.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/code-block/code-block.component.html @@ -11,8 +11,10 @@ -

+       {{codes}}
     
   
-    
-      
+    
+      
         {{ option.text }}
-        

+        

         
           {{ option.desc }}
-          
-            {{ option.long_desc }}
+           {{ option.long_desc }}
         
       
 
       
         
-          
-          
+          
+          
         
       
     
 
-    
-      {{ option.text }}
-        

+    
+      {{ option.text }}
+        

         
           {{ option.desc }}
-          
-            {{ option.long_desc }}
+           {{ option.long_desc }}
         
       
       
         
-          
-          
         
-        
-          {{ option.additionalTypeInfo.patternHelpText }}
-        
-          {{ option.additionalTypeInfo.patternHelpText }}
-        The entered value is too high! It must not be greater than {{ option.maxValue }}.
-        The entered value is too low! It must not be lower than {{ option.minValue }}.
+        
+          {{ option.additionalTypeInfo.patternHelpText }}
+        
+          {{ option.additionalTypeInfo.patternHelpText }}
+        The entered value is too high! It must not be greater than {{ option.maxValue }}.
+        The entered value is too low! It must not be lower than {{ option.minValue }}.
       
     
-    
+    
   
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.html
index 423d92838bb..e4e82fa3df8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.html
@@ -1,29 +1,38 @@
-
+
   
-    {{ titleText }}
+    
+      {{ titleText }}
+    
   
   
-    
+    
       
       
-        {{description}}
+        {{ description }}
       
     
   
 
-  
-
+  
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/copy2clipboard-button/copy2clipboard-button.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/copy2clipboard-button/copy2clipboard-button.component.html
index 0bf81d9bf4c..c0e965360f8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/copy2clipboard-button/copy2clipboard-button.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/copy2clipboard-button/copy2clipboard-button.component.html
@@ -1,16 +1,20 @@
-
-
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/custom-login-banner/custom-login-banner.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/custom-login-banner/custom-login-banner.component.html
index 7bb087c3f07..1cb0ececd2f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/custom-login-banner/custom-login-banner.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/custom-login-banner/custom-login-banner.component.html
@@ -1,2 +1,6 @@
-{{ bannerText }}
+
+  {{ bannerText }}
+
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/date-time-picker/date-time-picker.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/date-time-picker/date-time-picker.component.html
index ccdb70e39e4..44455e4322e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/date-time-picker/date-time-picker.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/date-time-picker/date-time-picker.component.html
@@ -1,31 +1,45 @@
 
-  
-    {{name}}
-      
+  
+    {{ name }}
+      
     
-  Select a time
-  
-  
-    
-    
-  
-
-
-
+    Select a time
+      
+        
+          
+          
+        
+      
+    
+  
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.html
index 9a7c5b02468..3787dd2077f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.html
@@ -1,126 +1,186 @@
-
+
   
     
   
 
   
-    
-      
+    
+      
         {{ infoMessage }}
       
       
       
         
           
-            Are you sure that you want to {{ actionDescription | lowercase }} {{ itemNames[0] }}?
+            
+              Are you sure that you want to {{ actionDescription | lowercase }}
+              {{ itemNames[0] }}?
+            
           
           
-            Are you sure that you want to {{ actionDescription | lowercase }} the selected items?
+            
+              Are you sure that you want to {{ actionDescription | lowercase }} the selected items?
+            
             
-              {{ itemName }}
+              
+                {{ itemName }}
+              
             
           
         
         
-          Are you sure that you want to {{ actionDescription | lowercase }} the selected {{ itemDescription }}?
+          
+            Are you sure that you want to {{ actionDescription | lowercase }} the selected
+            {{ itemDescription }}?
+          
         
-        
+        
         
           
-            Yes, I am sure.
+            Yes, I am sure.
           
           
             
-            @if (bodyContext?.deletionMessage) {
-            
-            } @else {
-            Deleting {{ itemNames[0] }} will remove all associated {{itemDescription}}.This action cannot be undone.
-            }
+              @if (bodyContext?.deletionMessage) {
+                
+              } @else {
+                Deleting {{ itemNames[0] }} will remove all associated
+                  {{ itemDescription }}.This action cannot be undone.
+              }
             
             
-              Type {{ itemNames[0] }} to confirm (required)
+              Type {{ itemNames[0] }} to confirm (required)
             
-            
-              
+            
+              
             
             
-              
+              
                 This field is required.
               
-              
+              
                 Enter the correct resource name.
               
             
             @if (bodyContext?.forceDeleteAcknowledgementMessage) {
-            
-              
-                {{ bodyContext.forceDeleteAcknowledgementMessage }}
-              
-            
+              
+                
+                  {{ bodyContext.forceDeleteAcknowledgementMessage }}
+                
+              
             }
           
         
       
     
   
-  
-
+  
 
 
   @if (impact === impactEnum.high) {
-  
-      {{(actionDescription | titlecase) + ' ' + itemDescription}}
-  
-  
+      {{ (actionDescription | titlecase) + ' ' + itemDescription }}
+    
+    
-    Confirm {{ actionDescription }}
-  
+      i18n
+    >
+      Confirm {{ actionDescription }}
+

} @else { -

- {{(actionDescription | titlecase) + ' ' + itemDescription}} -

+ {{ (actionDescription | titlecase) + ' ' + itemDescription }} +

} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/details-card/details-card.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/details-card/details-card.component.html index c3a784214b6..b227ff0ae68 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/details-card/details-card.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/details-card/details-card.component.html @@ -1,36 +1,50 @@ @if (cardTitle) { -

+ {{ cardTitle }} +

} -

@if (details && details.length > 0) { -

- @for (detail of getVisibleDetails(); track detail.label) { -

- {{ detail.label }} -

- @switch (detail.type) { - @case ('status') { -

- - {{ getDisplayValue(detail.value) }} -

- } +

+ @for (detail of getVisibleDetails(); track detail.label) { +

+ {{ detail.label }} +

+ @switch (detail.type) { + @case ('status') { +

+ + {{ getDisplayValue(detail.value) }} +

+ } - @default { - {{ getDisplayValue(detail.value) }} - } - } -

+ @default { + {{ getDisplayValue(detail.value) }} + } + } +

+ }

- } -

}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.html index c6b43418815..128056c55af 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.html @@ -1,3 +1,6 @@ -{{ docText }} +{{ docText }} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.html index 21ce6a76343..482ad63c2d2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.html @@ -1,30 +1,42 @@ -

- -

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/empty-state/empty-state.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/empty-state/empty-state.component.html index c2ca9930cc1..52477970b4b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/empty-state/empty-state.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/empty-state/empty-state.component.html @@ -1,14 +1,18 @@

+ [class.empty-state-title]="title" +>

- @if(title) { -

+ [alt]="text" + /> + @if (title) { +

} -

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-advanced-fieldset/form-advanced-fieldset.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-advanced-fieldset/form-advanced-fieldset.component.html index 5e59c032a8c..e3f3cddd904 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-advanced-fieldset/form-advanced-fieldset.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-advanced-fieldset/form-advanced-fieldset.component.html @@ -1,16 +1,24 @@

- - + +

+ {{ title }} +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-button-panel/form-button-panel.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-button-panel/form-button-panel.component.html index aa161811b12..938ce1d8518 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-button-panel/form-button-panel.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-button-panel/form-button-panel.component.html @@ -1,34 +1,44 @@

- - {{ submitText }} + + {{ submitText }}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html index 7cda7800b86..db778dcb087 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html @@ -1,104 +1,136 @@ - + -

+

- - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html index bb5b285602a..d191303aed3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.html @@ -1,37 +1,52 @@ -Loading panel data... +Loading panel data... -Please consult the on - how to configure and enable the monitoring functionality. +Please consult the on how to configure and enable + the monitoring functionality. -Grafana Dashboard doesn't exist. Please refer to - on how to add dashboards to Grafana. +Grafana Dashboard doesn't exist. Please refer to on how to add dashboards to Grafana.

@@ -40,32 +55,43 @@

- If no embedded Grafana Dashboard appeared below, please follow this link to check if Grafana is reachable and there are no HTTPS certificate issues. You may need to reload this page after accepting any Browser certificate exceptions +

+ If no embedded Grafana Dashboard appeared below, please follow this link to check if Grafana is reachable and there are no HTTPS certificate issues. You may + need to reload this page after accepting any Browser certificate exceptions

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/help-text/help-text.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/help-text/help-text.component.html index 65b889b060a..085ed6bb356 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/help-text/help-text.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/help-text/help-text.component.html @@ -1,10 +1,12 @@ -

- - All fields are required, except where marked optional. - +

+ + All fields are required, except where marked optional. + - - - -

+ + + +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.html index c9e5b3f2ad6..62a485a6d61 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.html @@ -1,38 +1,49 @@ @if (type === helperType.tooltip) { - - + + } @else { -

+ tabindex="0" + >

+ [size]="iconSize" + >

+ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/icon/icon.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/icon/icon.component.html index b393d255e1d..a805c8a9793 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/icon/icon.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/icon/icon.component.html @@ -1,4 +1,5 @@ - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/inline-message/inline-message.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/inline-message/inline-message.component.html index ee382632f2d..01d180a8736 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/inline-message/inline-message.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/inline-message/inline-message.component.html @@ -1,46 +1,62 @@ @if (!isDismissed) { -

- - + +

- +

+ -

- @if (title) { -

- } +

+ @if (title) { +

+ } -

@if (collapsible) { - - } + + }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.html index 649b8b45a4d..71c8c55a3be 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.html @@ -3,4 +3,3 @@ {{ lang.value }} - diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.html index 2c8ca2e0151..b4ac3db8620 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.html @@ -1,8 +1,12 @@ - + - +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.html index 6f1cf42cea2..62004e2298b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.html @@ -5,11 +5,12 @@ - +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/motd/motd.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/motd/motd.component.html index 2fbe5d7f87d..c0a76aa9c9c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/motd/motd.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/motd/motd.component.html @@ -1,8 +1,10 @@ - + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notification-toast/notification-toast.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notification-toast/notification-toast.component.html index 205972ad1c6..c4357632aca 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notification-toast/notification-toast.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notification-toast/notification-toast.component.html @@ -1,16 +1,17 @@

@for (toast of activeToasts$ | async; track $index) { - - + + }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.html index cca8ffc57bd..bd0eb2ba47f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.html @@ -1,144 +1,182 @@ -

- +

{{ executingTask.begin_time | cdDate }} - - {{ executingTask.progress || 0 }} % - + {{ executingTask.progress || 0 }} %

- -

- +

- - - -

- Duration: {{ notification.duration | duration }} + Duration: + {{ notification.duration | duration }} -
+
- {{ notification.timestamp | relativeDate }} - + {{ notification.timestamp | relativeDate }} +

There are no notifications.

+ There are no notifications. +

Tasks and Notifications - +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/number-with-unit/number-with-unit.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/number-with-unit/number-with-unit.component.html index 768f87e5cde..8a1ddb57d36 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/number-with-unit/number-with-unit.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/number-with-unit/number-with-unit.component.html @@ -23,7 +23,7 @@ [id]="unitControlName" > @for (unit of units; track unit) { - + }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.html index 3b6d9cfa3af..7b952c48123 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.html @@ -1,10 +1,15 @@ -The feature is not supported in the current Orchestrator. +The feature is not supported in the current Orchestrator. - Orchestrator is not available. - Please consult the on how to configure and - enable the functionality. + Orchestrator is not available. Please consult the on + how to configure and enable the functionality. diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/page-header/page-header.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/page-header/page-header.component.html index 3b51bd5a7e1..872447c163e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/page-header/page-header.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/page-header/page-header.component.html @@ -2,8 +2,8 @@

- @if(description) { -

+ @if (description) { +

}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/performance-card/performance-card.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/performance-card/performance-card.component.html index 166247ecc22..41b7259aac5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/performance-card/performance-card.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/performance-card/performance-card.component.html @@ -4,74 +4,93 @@ i18n-headerTitle [applyShadow]="false" > - -

Performance

- @if(!prometheusEmptyState && !storageEmptyState) { -

- -

- } - - @if(storageEmptyState) { - - } - @else if(prometheusEmptyState) { - - } - @else { -

- - -

- - + +

+ Performance +

+ @if (!prometheusEmptyState && !storageEmptyState) { +

+ +

+ } + + @if (storageEmptyState) { + + } @else if (prometheusEmptyState) { + + } @else { +

+ + +

- - -

- } + }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pie-chart/pie-chart.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pie-chart/pie-chart.component.html index 3013e1307a2..7fd2da0561a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pie-chart/pie-chart.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pie-chart/pie-chart.component.html @@ -1,5 +1,6 @@ + [options]="chartOptions" +> diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/productive-card/productive-card.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/productive-card/productive-card.component.html index 1304bb4bc29..beb40f53ea8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/productive-card/productive-card.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/productive-card/productive-card.component.html @@ -1,16 +1,20 @@ - +

- @if(!!footerTemplate) { - + @if (!!footerTemplate) { + } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/progress/progress.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/progress/progress.component.html index 377a903edf5..0692f5c4b62 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/progress/progress.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/progress/progress.component.html @@ -1,45 +1,61 @@

- +

+ - +

+

- + Finished {{ actionName }}: {{ completedItems }} @@ -48,23 +64,29 @@

- +

{{ value || 0 }} %

+

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.html index b1bc5150ab2..d891abbc138 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.html @@ -1,16 +1,34 @@ - -

Your password will expire in less than 1 day. Click - here to change it now.

Your password will expire in {{ expirationDays }} day(s). Click - here to change it now.

+ +

+ Your password will expire in less than 1 day. Click + here + to change it now. +

+ Your password will expire in {{ expirationDays }} day(s). Click + here + to change it now. +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html index bef3e49b1ae..0d9e9d61caf 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.html @@ -1,27 +1,35 @@ - - + +

{{ dataItem }} - - + +

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.html index e6580017b97..2ec03bc93a6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.html @@ -1,83 +1,105 @@ - -

+ -

- +

+ {{ messages.selectionLimit.text }}

- - + {{ messages.empty }} - + {{ messages.noOptions }} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/setup-step-card/setup-step-card.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/setup-step-card/setup-step-card.component.html index d2cd4c23f30..9d258fe5623 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/setup-step-card/setup-step-card.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/setup-step-card/setup-step-card.component.html @@ -1,4 +1,7 @@ -

{{ stepNumber }}. {{ title }} @@ -8,13 +11,13 @@

@if (isLoading) { - + } @else if (isConfigured) { - - {{ statusMessage }} + + {{ statusMessage }} } @else { - - {{ statusMessage }} + + {{ statusMessage }} }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/side-panel/side-panel.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/side-panel/side-panel.component.html index a591e49fb7d..61fa5ee37c0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/side-panel/side-panel.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/side-panel/side-panel.component.html @@ -1,23 +1,31 @@ -

- +

- + -

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sidebar-layout/sidebar-layout.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sidebar-layout/sidebar-layout.component.html index 493b776f4b1..cdacb9dd738 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sidebar-layout/sidebar-layout.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sidebar-layout/sidebar-layout.component.html @@ -1,21 +1,23 @@ @if (title) { - + }

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.html index d66efd2d006..331be5fed0d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.html @@ -1,13 +1,19 @@ -

- +

+} @else { + + + +

+ {{ title }} +

+ {{ description }} +

+ + @if (steps.length > 1) { +

+ + +

+ } +

+ @if (showRightInfluencer) { + +

+ +

+ } @else { + +

+ +

+ } + + + + @if (steps.length > 1) { + + } + @if (currentStep === lastStep) { + + } @else { + + } + +

+ } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.html index 444724d6723..05ab3fd49b3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.html @@ -1,16 +1,23 @@ - - Activate - Telemetry - : The Ceph community welcomes your support in enhancing our efforts. Please activate the telemetry module. + + Activate + + Telemetry : The Ceph community welcomes your support in enhancing our efforts. Please activate the + telemetry module. diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/text-label-list/text-label-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/text-label-list/text-label-list.component.html index 0a3a2016a78..37c2da3cf85 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/text-label-list/text-label-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/text-label-list/text-label-list.component.html @@ -1,21 +1,27 @@ @for (value of values; track $index) { - +

- - @if ($index > 0 ) { - - - + + @if ($index > 0) { + + + }

- {{$index === 0 ? label : ''}} + {{ $index === 0 ? label : '' }} } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/time-picker/time-picker.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/time-picker/time-picker.component.html index c1089b2cb8c..ccb43682fd6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/time-picker/time-picker.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/time-picker/time-picker.component.html @@ -5,6 +5,7 @@ [inline]="true" class="timepicker-dropdown" [label]="label" - i18n> + i18n +> diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/upgradable/upgradable.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/upgradable/upgradable.component.html index 4a4f0a06c33..417eeb0192c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/upgradable/upgradable.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/upgradable/upgradable.component.html @@ -1,26 +1,34 @@

+

Upgrade is paused

- + - Upgrading {{executingTask?.progress}}% + Upgrading {{ executingTask?.progress }}%

Upgrade available

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.html index fc9990b7422..a42843002ff 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.html @@ -6,10 +6,12 @@ {{ customLabel }} - + - {{noDataText}} + {{ noDataText }} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/vertical-navigation/vertical-navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/vertical-navigation/vertical-navigation.component.html index 10695fbb010..7d7b33a6ff1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/vertical-navigation/vertical-navigation.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/vertical-navigation/vertical-navigation.component.html @@ -1,27 +1,41 @@ -

- +

+ {{ title }} +

- _nogroup - {{item}} +
+ _nogroup + {{ item }}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/wizard/wizard.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/wizard/wizard.component.html index e5efa0b1e62..3480c7f4c04 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/wizard/wizard.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/wizard/wizard.component.html @@ -2,6 +2,7 @@ + [current]="currentStep?.stepIndex" + >

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/checked-table-form/checked-table-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/checked-table-form/checked-table-form.component.html index da5080f3cc2..e55dcd5aca8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/checked-table-form/checked-table-form.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/checked-table-form/checked-table-form.component.html @@ -1,54 +1,76 @@ - + - +

- - {{ value }} + + {{ value }}

- +

- - + +

- +

- - {{ column.name }} + + {{ column.name }}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/crud-table/crud-table.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/crud-table/crud-table.component.html index 4abcd7ca69a..ca5dadee2a6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/crud-table/crud-table.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/crud-table/crud-table.component.html @@ -1,76 +1,102 @@ -

- {{tab.name}} +
- + {{ tab.name }}
+ [data]="data$ | async" + [columns]="meta.table.columns" + [columnMode]="meta.table.columnMode" + (setExpandedRow)="setExpandedRow($event)" + [hasDetails]="meta.detail_columns.length > 0" + [selectionType]="meta.table.selectionType" + (updateSelection)="updateSelection($event)" + [toolHeader]="meta.table.toolHeader" + >
- +
- +
- - + +
{{ column }}
{{ expandedRow[column] }}
+ {{ column }} + +
{{ expandedRow[column] }}
+
-
- + - {{ instance.key }}: {{ instance.value }} + {{ instance.key }}: {{ instance.value }} - + {{ value | cdDate }} - + {{ value | duration }}
- {{ modalState.authExportData }} - - + {{ modalState.authExportData }} +
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html index 1846c419b9d..6021cfa1f5d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.html @@ -1,42 +1,49 @@ - - - - {{ action.name }} + + {{ action.name }} @@ -44,42 +51,54 @@ - - + - - {{ action.name }} + + {{ action.name }} - diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.html index faa517c768c..505ced9c2f2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.html @@ -1,25 +1,30 @@
- +
- + {{ value }} + >{{ value }} {{ value }} diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-pagination/table-pagination.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-pagination/table-pagination.component.html index 30f7ebfa9ef..4b0511bdd75 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-pagination/table-pagination.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-pagination/table-pagination.component.html @@ -1,6 +1,8 @@ -
+
@@ -46,35 +56,51 @@ - + - @if (columnFilters.length !== 0 || customFilter) { -
+ @if (columnFilters.length !== 0 || customFilter) { +
- + data-testid="filter-button" + > + -
- Filters - +
+ Filters +
@@ -82,175 +108,223 @@ cdsGrid [fullWidth]="true" [condensed]="true" - [narrow]="true"> - @if (columnFilters.length !== 0) { - @for (filter of columnFilters; track filter.column.name; let i = $index) { -
- - -
- Filter - - -
+ [narrow]="true" + > + @if (columnFilters.length !== 0) { + @for (filter of columnFilters; track filter.column.name; let i = $index) { +
+ +
+ Filter + + +
- -
- - - @for (option of filter.options; track option.raw) { - + +
+ + + @for (option of filter.options; track option.raw) { + + } + +
+
+ } + } + @if (customFilter) { + @for (filter of stagedCustomFilters; track filter.id; let i = $index) { + @if (isCustomFilterString) { +
+ Filter {{ customFilter }}: +
} +
+
+ Key + + +
- -
-
- }} - @if (customFilter) { - @for (filter of stagedCustomFilters; track filter.id; let i = $index) { - @if (isCustomFilterString) { -
- Filter {{ customFilter }}: -
- } -
-
- Key - - -
- -
- Value - - -
+
+ Value + + +
- @if (i !== 0) { -
- - - -
- } -
- } - @if (stagedCustomFilters.length < 5) { -
-
- -
+ @if (i !== 0) { +
+ + + +
+ } +
+ } + @if (stagedCustomFilters.length < 5) { +
+
+ +
+
+ } + }
- } - } -
-
- +
+ - -
+ +

} - + [kind]="status.type" + [disabled]="!fetchData?.observers?.length" + (click)="refreshBtn()" + [title]="status.msg" + [description]="status.msg" + i18n-title + i18n-description + class="toolbar-action" + placement="bottom" + *ngIf="fetchData?.observers?.length > 0" + > + - -
+
- {{ column.name }} - + {{ column.name }} +
@@ -261,139 +335,170 @@ - @if (toolHeader && columnFiltered) { + @if (toolHeader && columnFiltered) {

- @for (filter of activeFilters | slice:0:3; track filter.id) { + [gap]="2" + > + @for (filter of activeFilters | slice: 0 : 3; track filter.id) { @if (filter.value) { + (close)="onRemoveFilter(filter)" + > {{ filter.name }}={{ filter.value }} } } @if (activeFilters.length > 3) { - - +{{ activeFilters.length - 3 }} - + +{{ activeFilters.length - 3 }}
- @for (filter of activeFilters | slice:3; track filter.id) { - - {{ filter.name }}={{ filter.value }} - - } + [gap]="2" + > + @for (filter of activeFilters | slice: 3; track filter.id) { + + {{ filter.name }}={{ filter.value }} + + }
} -

} - - - - - - + + + + + + + - - - - - - + >

- +

{{ emptyStateTitle }} @@ -408,93 +513,119 @@

Name	+ Name +	{{ selection.name }}
Pool	+ Pool +	{{ selection.pool_name }}
Data Pool	+ Data Pool +	{{ selection.data_pool \| empty }}
Created	+ Created +	{{ selection.timestamp \| cdDate }}
Size	+ Size +	{{ selection.size \| dimlessBinary }}
Objects	+ Objects +	{{ selection.num_objs \| dimless }}
Object size	+ Object size +	{{ selection.obj_size \| dimlessBinary }}
Features	+ Features +	{{ feature }} @@ -61,14 +102,21 @@
Provisioned	+ Provisioned +	- N/A + N/A {{ selection.disk_usage \| dimlessBinary }} @@ -76,14 +124,21 @@
Total provisioned	+ Total provisioned +	- N/A + N/A {{ selection.total_disk_usage \| dimlessBinary }} @@ -91,37 +146,65 @@
Striping unit	+ Striping unit +	{{ selection.stripe_unit \| dimlessBinary }}
Striping count	+ Striping count +	{{ selection.stripe_count }}
Parent	+ Parent +	- {{ selection.parent.pool_name }}/{{ selection.parent.pool_namespace }}/{{ selection.parent.image_name }}@{{ selection.parent.snap_name }} + {{ selection.parent.pool_name + }}/{{ selection.parent.pool_namespace }}/{{ selection.parent.image_name }}@{{ selection.parent.snap_name }} -
Block name prefix	+ Block name prefix +	{{ selection.block_name_prefix }}
Order	+ Order +	{{ selection.order }}
Format Version	+ Format Version +	{{ selection.image_format }}

Create Bootstrap Token

+ Create Bootstrap Token +

Import Bootstrap Token

+ Import Bootstrap Token +

+

{mode, select, edit {Edit} other {Add}} pool mirror peer

- {{'Subsystem'}} + cdsModalHeaderLabel + i18n + > + {{ 'Subsystem' }}

+ + Edit Host Key - + i18n + > + Edit Host Key +

Edit Host Key

+ + Confirm changes - + i18n + > + Confirm changes +

Confirm changes

Manage {{ gatewayName }}

+ Manage {{ gatewayName }} +

Cannot delete gateway group

+ Cannot delete gateway group +

+

Add gateway nodes

Gateway nodes

+ Gateway nodes +

NVMe over Fabrics (TCP)

Select target nodes

Select target nodes

Namespace

Expand namespace

+ Namespace +

+ Expand namespace +

{{ title }}

Recommended first-time setup

+ Recommended first-time setup +

Subsystem details

+ Subsystem details +

Host access (Initiators)

+ Host access (Initiators) +

Add host manually

+ Add host manually +

Upload CSV file

+ Upload CSV file +

Added hosts ({{addedHostsLength}})

+ Added hosts ({{ addedHostsLength }}) +

Authentication

+ Authentication +

Subsystem authentication detail

+ Subsystem authentication detail +

Host authentication details

Review summary

+ Review summary +

Subsystem details

+ Subsystem details +

Host access control (Initiators)

+ Host access control (Initiators) +

Authentication details

+ Authentication details +

NVMe over Fabrics (TCP)

- + {{ section.heading }} - +

+

Create Namespace -

{{ action | titlecase }} {{ resource | upperFirst }}

+ {{ action | titlecase }} {{ resource | upperFirst }} +

Move an image to trash

+ Move an image to trash +

Purge Trash

+ Purge Trash +

Restore Image

+ Restore Image +

{{ action | titlecase }} {{ resource | upperFirst }}

+ {{ action | titlecase }} {{ resource | upperFirst }} +

+

Attach commands

+

Using Mount command

+

Using FUSE command

- Using NFS Command +

+ Using NFS Command

- {{ action | titlecase }} {{ resource | upperFirst }} +

+ {{ action | titlecase }} {{ resource | upperFirst }}

{{ action | titlecase }} {{ resource | upperFirst }}

+ {{ action | titlecase }} {{ resource | upperFirst }} +

{{ action | titlecase }} {{ resource | upperFirst }}

+ {{ action | titlecase }} {{ resource | upperFirst }} +

+ +
Edit Host Key
- + i18n + > + Edit Host Key +

+ +
Confirm changes
- + i18n + > + Confirm changes +

+
+
- Upgrade in progress {{executingTasks?.progress}}%
- View Details... + Upgrade in progress {{ executingTasks?.progress }}% +