UI: Adds tidy_revoked_certs and revoked_cert_deleted_count to PKI tidy status page (#23232)

* add missing params

* add changelog
This commit is contained in:
claire bontempo
2023-09-21 14:05:32 -07:00
committed by GitHub
parent 3958bd0484
commit 8b12698780
3 changed files with 30 additions and 16 deletions

3
changelog/23232.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:improvement
ui: Adds tidy_revoked_certs to PKI tidy status page
```

View File

@@ -67,6 +67,12 @@
/> />
{{/each}} {{/each}}
{{#if this.isEnterprise}}
{{#each this.crossClusterOperation.status as |attr|}}
<InfoTableRow @label={{humanize (dasherize attr)}} @value={{get @tidyStatus attr}} @alwaysRender={{true}} />
{{/each}}
{{/if}}
<h2 class="title is-4 has-bottom-margin-xs has-top-margin-l has-border-bottom-light has-bottom-padding-s"> <h2 class="title is-4 has-bottom-margin-xs has-top-margin-l has-border-bottom-light has-bottom-padding-s">
{{if (eq this.tidyState "Running") "Current" "Last"}} {{if (eq this.tidyState "Running") "Current" "Last"}}
tidy settings tidy settings
@@ -81,7 +87,7 @@
{{/each}} {{/each}}
{{#if this.isEnterprise}} {{#if this.isEnterprise}}
{{#each this.crossClusterOperation as |attr|}} {{#each this.crossClusterOperation.config as |attr|}}
<InfoTableRow <InfoTableRow
@label={{humanize (dasherize attr)}} @label={{humanize (dasherize attr)}}
@value={{get @tidyStatus attr}} @value={{get @tidyStatus attr}}

View File

@@ -23,25 +23,28 @@ interface Args {
} }
interface TidyStatusParams { interface TidyStatusParams {
safety_buffer: number; // tidy banner
tidy_cert_store: boolean;
tidy_revoked_certs: boolean;
state: string; state: string;
error: string; error: string;
message: string;
// tidy status
time_started: string | null; time_started: string | null;
time_finished: string | null; time_finished: string | null;
message: string;
cert_store_deleted_count: number; cert_store_deleted_count: number;
revoked_cert_deleted_count: number; revoked_cert_deleted_count: number;
missing_issuer_cert_count: number; missing_issuer_cert_count: number;
revocation_queue_deleted_count: number; // enterprise only
cross_revoked_cert_deleted_count: number; // enterprise only
// tidy settings
tidy_cert_store: boolean;
tidy_revoked_certs: boolean;
tidy_expired_issuers: boolean; tidy_expired_issuers: boolean;
issuer_safety_buffer: string; safety_buffer: number;
tidy_move_legacy_ca_bundle: boolean; tidy_move_legacy_ca_bundle: boolean;
tidy_revocation_queue: boolean; issuer_safety_buffer: string;
revocation_queue_deleted_count: number; tidy_revocation_queue: boolean; // enterprise only
tidy_cross_cluster_revoked_certs: boolean; tidy_cross_cluster_revoked_certs: boolean; // enterprise only
cross_revoked_cert_deleted_count: number; revocation_queue_safety_buffer: string; // enterprise only
revocation_queue_safety_buffer: string;
} }
export default class PkiTidyStatusComponent extends Component<Args> { export default class PkiTidyStatusComponent extends Component<Args> {
@@ -57,16 +60,14 @@ export default class PkiTidyStatusComponent extends Component<Args> {
tidyStatusGeneralFields = [ tidyStatusGeneralFields = [
'time_started', 'time_started',
'time_finished', 'time_finished',
'last_auto_tidy_finished',
'cert_store_deleted_count', 'cert_store_deleted_count',
'revoked_cert_deleted_count',
'missing_issuer_cert_count', 'missing_issuer_cert_count',
'revocation_queue_deleted_count',
]; ];
tidyStatusConfigFields = [ tidyStatusConfigFields = [
'tidy_cert_store', 'tidy_cert_store',
'tidy_revocation_queue', 'tidy_revoked_certs',
'tidy_cross_cluster_revoked_certs',
'safety_buffer', 'safety_buffer',
'pause_duration', 'pause_duration',
'tidy_expired_issuers', 'tidy_expired_issuers',
@@ -74,7 +75,11 @@ export default class PkiTidyStatusComponent extends Component<Args> {
'issuer_safety_buffer', 'issuer_safety_buffer',
]; ];
crossClusterOperation = ['tidy_revocation_queue', 'revocation_queue_safety_buffer']; // enterprise only
crossClusterOperation = {
status: ['revocation_queue_deleted_count', 'cross_revoked_cert_deleted_count'],
config: ['tidy_revocation_queue', 'tidy_cross_cluster_revoked_certs', 'revocation_queue_safety_buffer'],
};
get isEnterprise() { get isEnterprise() {
return this.version.isEnterprise; return this.version.isEnterprise;