diff --git a/.secrets.baseline b/.secrets.baseline index 018293f2fc..f093e1ac71 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$", "lines": null }, - "generated_at": "2026-01-29T07:04:47Z", + "generated_at": "2026-02-10T22:36:12Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -454,7 +454,7 @@ "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 598, + "line_number": 618, "type": "Secret Keyword", "verified_result": null } @@ -690,7 +690,7 @@ "hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd", "is_secret": false, "is_verified": false, - "line_number": 23, + "line_number": 26, "type": "Secret Keyword", "verified_result": null } diff --git a/image/cli/mascli/functions/gitops_suite b/image/cli/mascli/functions/gitops_suite index 830628eef9..eda1178dc9 100644 --- a/image/cli/mascli/functions/gitops_suite +++ b/image/cli/mascli/functions/gitops_suite @@ -48,6 +48,9 @@ IBM Maximo Application Suite: --enhanced-dr ${COLOR_YELLOW}ENHANCED_DR${TEXT_RESET} To enable Enhanced Disaster Recovery --disable-postdelete-hooks ${COLOR_YELLOW}USE_POSTDELETE_HOOKS${TEXT_RESET} Unless set (or USE_POSTDELETE_HOOKS exported and set to false), PostDelete hooks will be deployed to ensure addon CRs are properly cleaned up by ArgoCD on deletion --is-non-shared-cluster ${COLOR_YELLOW}IS_NON_SHARED_CLUSTER${TEXT_RESET} To enable Non shared cluster + --mas-feature-usage ${COLOR_YELLOW}MAS_FEATURE_USAGE${TEXT_RESET} Flag to control feature adoption metrics used to understand feature usage and improve the product (optional, defaults to true) + --mas-deployment-progression ${COLOR_YELLOW}MAS_DEPLOYMENT_PROGRESSION${TEXT_RESET} Flag to control metrics used to understand progression of tasks and workflows within the product (optional, defaults to true) + --mas-usability-metrics ${COLOR_YELLOW}MAS_USABILITY_METRICS${TEXT_RESET} Flag to control user interface interaction metrics to improve usability (optional, defaults to true) --suite-spec-additional-properties-yaml ${COLOR_YELLOW}SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML${TEXT_RESET} Additional properties to be set in Suite CR spec --suite-spec-settings-additional-properties-yaml ${COLOR_YELLOW}SUITE_SPEC_SETTINGS_ADDITIONAL_PROPERTIES_YAML${TEXT_RESET} Additional properties to be set in Suite CR spec.settings @@ -141,6 +144,11 @@ function gitops_suite_noninteractive() { # cert-manager namespace, in case redhat default value is cert-manager export CERT_MANAGER_NAMESPACE=${CERT_MANAGER_NAMESPACE:-"cert-manager"} + + # Enable adoption metrics reporting by default + export MAS_FEATURE_USAGE=${MAS_FEATURE_USAGE:-"true"} + export MAS_DEPLOYMENT_PROGRESSION=${MAS_DEPLOYMENT_PROGRESSION:-"true"} + export MAS_USABILITY_METRICS=${MAS_USABILITY_METRICS:-"true"} #GenericAddon default export EXTENSIONS=${EXTENSIONS:-"false"} @@ -257,6 +265,15 @@ function gitops_suite_noninteractive() { --mas-wipe-mongo-data) export MAS_WIPE_MONGO_DATA=$1 && shift ;; + --mas-feature-usage) + export MAS_FEATURE_USAGE=$1 && shift + ;; + --mas-deployment-progression) + export MAS_DEPLOYMENT_PROGRESSION=$1 && shift + ;; + --mas-usability-metrics) + export MAS_USABILITY_METRICS=$1 && shift + ;; --suite-spec-additional-properties-yaml) export SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML=$1 && shift ;; @@ -579,6 +596,9 @@ function gitops_suite() { echo_reset_dim "Enhanced Disaster Recovery ................. ${COLOR_MAGENTA}${ENHANCED_DR}" echo_reset_dim "Non shared cluster ......................... ${COLOR_MAGENTA}${IS_NON_SHARED_CLUSTER}" echo_reset_dim "Java or 3rd Party Code Extensions .......... ${COLOR_MAGENTA}${EXTENSIONS}" + echo_reset_dim "Report feature use metrics ................. ${COLOR_MAGENTA}${MAS_FEATURE_USAGE}" + echo_reset_dim "Report deployment progression metrics ...... ${COLOR_MAGENTA}${MAS_DEPLOYMENT_PROGRESSION}" + echo_reset_dim "Report usability metrics ................... ${COLOR_MAGENTA}${MAS_USABILITY_METRICS}" echo_reset_dim "Use PostDelete Hooks? ...................... ${COLOR_MAGENTA}${USE_POSTDELETE_HOOKS}" echo_reset_dim "Suite Spec Additional Properties ........... ${COLOR_MAGENTA}${SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML}" echo_reset_dim "Suite Spec Settings Additional Properties .. ${COLOR_MAGENTA}${SUITE_SPEC_SETTINGS_ADDITIONAL_PROPERTIES_YAML}" diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-suite.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-suite.yaml.j2 index 0e69a277a8..0e1ee0fabd 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-suite.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-suite.yaml.j2 @@ -4,6 +4,9 @@ ibm_mas_suite: cert_manager_namespace: "{{ CERT_MANAGER_NAMESPACE }}" ibm_entitlement_key: "" domain: "{{ DOMAIN }}" + mas_feature_usage: "{{ MAS_FEATURE_USAGE }}" + mas_deployment_progression: "{{ MAS_DEPLOYMENT_PROGRESSION }}" + mas_usability_metrics: "{{ MAS_USABILITY_METRICS }}" {%- if DNS_PROVIDER is defined and DNS_PROVIDER !='' %} # suite dns diff --git a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 index 41b6ed22d1..63020b9971 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -170,6 +170,15 @@ spec: - name: mas_wipe_mongo_data type: string default: "false" + - name: mas_feature_usage + type: string + default: "true" + - name: mas_deployment_progression + type: string + default: "true" + - name: mas_usability_metrics + type: string + default: "true" - name: mas_pod_template_yaml type: string default: "" @@ -454,6 +463,12 @@ spec: value: $(params.mas_pod_template_yaml) - name: mas_wipe_mongo_data value: $(params.mas_wipe_mongo_data) + - name: mas_feature_usage + value: $(params.mas_feature_usage) + - name: mas_deployment_progression + value: $(params.mas_deployment_progression) + - name: mas_usability_metrics + value: $(params.mas_usability_metrics) - name: suite_spec_additional_properties_yaml value: $(params.suite_spec_additional_properties_yaml) - name: suite_spec_settings_additional_properties_yaml diff --git a/tekton/src/tasks/gitops/gitops-suite.yml.j2 b/tekton/src/tasks/gitops/gitops-suite.yml.j2 index 3f2c20e2ee..b2338139d1 100644 --- a/tekton/src/tasks/gitops/gitops-suite.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-suite.yml.j2 @@ -122,6 +122,15 @@ spec: - name: mas_wipe_mongo_data type: string default: "false" + - name: mas_feature_usage + type: string + default: "true" + - name: mas_deployment_progression + type: string + default: "true" + - name: mas_usability_metrics + type: string + default: "true" - name: suite_spec_additional_properties_yaml type: string default: "" @@ -244,6 +253,12 @@ spec: value: $(params.mas_pod_template_yaml) - name: MAS_WIPE_MONGO_DATA value: $(params.mas_wipe_mongo_data) + - name: MAS_FEATURE_USAGE + value: $(params.mas_feature_usage) + - name: MAS_DEPLOYMENT_PROGRESSION + value: $(params.mas_deployment_progression) + - name: MAS_USABILITY_METRICS + value: $(params.mas_usability_metrics) - name: SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML value: $(params.suite_spec_additional_properties_yaml) - name: SUITE_SPEC_SETTINGS_ADDITIONAL_PROPERTIES_YAML