From 80fdd79f22719fcbb0cfea6088502a7d0759a15f Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Wed, 29 Sep 2021 09:58:48 -0400 Subject: [SO] Add properties for history cleanup window These properties define a time window where the history cleanup job is allowed to run. Without these properties the cleanup job would not be triggered automatically. Also set mso.bpmn-history-ttl (days). This ttl value will be applied to all bpmn definitions, which will set a removal date for historic data. Remove old historyTimeToLive property which is no longer used. Issue-ID: SO-3770 Signed-off-by: Jozsef Csongvai Change-Id: I5baee0a3ba8700b4ce177e3af4d480a8ae737e5f --- .../so-bpmn-infra/resources/config/overrides/override.yaml | 8 +++++--- kubernetes/so/components/so-bpmn-infra/values.yaml | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml index c64e10597a..360936d2ba 100755 --- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml @@ -34,6 +34,10 @@ camunda: job-execution: max-pool-size: 30 core-pool-size: 3 + generic-properties: + properties: + sunday-history-cleanup-batch-window-start-time: {{ quote .Values.camunda.sundayCleanupWindowStartTime }} + sunday-history-cleanup-batch-window-end-time: {{ quote .Values.camunda.sundayCleanupWindowEndTime }} entitymanager: packagesToScan: com pnf: @@ -113,9 +117,6 @@ mso: timeout: PT5M callback: endpoint: http://so-oof-adapter.{{ include "common.namespace" . }}:8090/so/adapters/oof/callback/v1 - bpmn: - process: - historyTimeToLive: '30' callbackRetryAttempts: '5' catalog: db: @@ -285,6 +286,7 @@ mso: naming: endpoint: http://naming.demo.onap.com:8081/web/service/v1/genNetworkElementName auth: Basic bTA0NzY4QG5vbi1wcm9kLm1zby5lY29tcC5hdHQuY29tOkF0dG0wNDc2OExpZmUhQA== + bpmn-history-ttl: {{ .Values.bpmn.historyTTL }} policy: auth: Basic dGVzdHBkcDphbHBoYTEyMw== default: diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml index 405017c400..e5d9f0a442 100755 --- a/kubernetes/so/components/so-bpmn-infra/values.yaml +++ b/kubernetes/so/components/so-bpmn-infra/values.yaml @@ -66,6 +66,13 @@ secrets: image: onap/so/bpmn-infra:1.9.0 pullPolicy: Always +bpmn: + historyTTL: 14 + +camunda: + sundayCleanupWindowStartTime: "04:00" + sundayCleanupWindowEndTime: "10:00" + db: userName: so_user userPassword: so_User123 -- cgit 1.2.3-korg