From eb0f7e1cb06b421388405aca18fe3403324b7726 Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Wed, 29 Oct 2025 12:11:15 -0400 Subject: [PATCH 01/11] [patch] Add adoption metrics reporting flag for gitops --- image/cli/mascli/functions/gitops_suite | 8 ++++++++ .../appset-configs/cluster/instance/ibm-mas-suite.yaml.j2 | 1 + tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 | 5 +++++ tekton/src/tasks/gitops/gitops-suite.yml.j2 | 5 +++++ 4 files changed, 19 insertions(+) diff --git a/image/cli/mascli/functions/gitops_suite b/image/cli/mascli/functions/gitops_suite index 273d6d312aa..9a22816c606 100644 --- a/image/cli/mascli/functions/gitops_suite +++ b/image/cli/mascli/functions/gitops_suite @@ -44,6 +44,7 @@ IBM Maximo Application Suite: --extensions ${COLOR_YELLOW}EXTENSIONS${TEXT_RESET} To enable JAVA or 3rd party code extensions --enhanced-dr ${COLOR_YELLOW}ENHANCED_DR${TEXT_RESET} To enable Enhanced Disaster Recovery --is-non-shared-cluster ${COLOR_YELLOW}IS_NON_SHARED_CLUSTER${TEXT_RESET} To enable Non shared cluster + --mas-report-adoption-metrics ${COLOR_YELLOW}MAS_REPORT_ADOPTION_METRICS${TEXT_RESET} To enable adoption metrics reporting (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 @@ -136,6 +137,9 @@ 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_REPORT_ADOPTION_METRICS=${MAS_REPORT_ADOPTION_METRICS:-"true"} while [[ $# -gt 0 ]] do @@ -226,6 +230,9 @@ function gitops_suite_noninteractive() { --mas-wipe-mongo-data) export MAS_WIPE_MONGO_DATA=$1 && shift ;; + --mas-report-adoption-metrics) + export MAS_REPORT_ADOPTION_METRICS=$1 && shift + ;; --suite-spec-additional-properties-yaml) export SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML=$1 && shift ;; @@ -528,6 +535,7 @@ 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 adoption metrics .................... ${COLOR_MAGENTA}${MAS_REPORT_ADOPTION_METRICS}" 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}" if [[ -n "$INTERNAL_CERT_AUTHORITY" ]]; then 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 40549bfcd3d..b136acca1e6 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,7 @@ ibm_mas_suite: cert_manager_namespace: "{{ CERT_MANAGER_NAMESPACE }}" ibm_entitlement_key: "" domain: "{{ DOMAIN }}" + mas_report_adoption_metrics: "{{ MAS_REPORT_ADOPTION_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 cef8e9daa65..056517cef25 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -170,6 +170,9 @@ spec: - name: mas_wipe_mongo_data type: string default: "false" + - name: mas_report_adoption_metrics + type: string + default: "true" - name: mas_pod_template_yaml type: string default: "" @@ -430,6 +433,8 @@ spec: value: $(params.mas_pod_template_yaml) - name: mas_wipe_mongo_data value: $(params.mas_wipe_mongo_data) + - name: mas_report_adoption_metrics + value: $(params.mas_report_adoption_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 30f24907c2b..31727f1e699 100644 --- a/tekton/src/tasks/gitops/gitops-suite.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-suite.yml.j2 @@ -122,6 +122,9 @@ spec: - name: mas_wipe_mongo_data type: string default: "false" + - name: mas_report_adoption_metrics + type: string + default: "true" - name: suite_spec_additional_properties_yaml type: string default: "" @@ -235,6 +238,8 @@ spec: value: $(params.mas_pod_template_yaml) - name: MAS_WIPE_MONGO_DATA value: $(params.mas_wipe_mongo_data) + - name: MAS_REPORT_ADOPTION_METRICS + value: $(params.mas_report_adoption_metrics) - name: SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML value: $(params.suite_spec_additional_properties_yaml) - name: SUITE_SPEC_SETTINGS_ADDITIONAL_PROPERTIES_YAML From 33f24dbeff21fdb785fd158009065345bd85c45c Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Thu, 30 Oct 2025 14:18:55 -0400 Subject: [PATCH 02/11] [patch] update .secrets.baseline --- .secrets.baseline | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 360b8603c74..bbee095c4d0 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2025-10-24T15:33:48Z", + "generated_at": "2025-10-30T18:18:23Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -700,7 +700,7 @@ "hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd", "is_secret": false, "is_verified": false, - "line_number": 23, + "line_number": 24, "type": "Secret Keyword", "verified_result": null } From 04d04eb84d362c6f7de9e51cad70b5650f1ea5d7 Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Thu, 30 Oct 2025 14:56:55 -0400 Subject: [PATCH 03/11] [patch] Update again --- .secrets.baseline | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index bbee095c4d0..9acd60d5587 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2025-10-30T18:18:23Z", + "generated_at": "2025-10-30T18:25:34Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -444,7 +444,7 @@ "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 545, + "line_number": 553, "type": "Secret Keyword", "verified_result": null } From 7d62b9331877a41364d3d06b195d233ffa2ad51b Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Tue, 10 Feb 2026 13:48:06 -0700 Subject: [PATCH 04/11] [patch] add additional opt out flags --- image/cli/mascli/functions/gitops_suite | 23 ++++++++++++++----- .../cluster/instance/ibm-mas-suite.yaml.j2 | 4 +++- .../gitops/gitops-mas-instance.yml.j2 | 16 ++++++++++--- tekton/src/tasks/gitops/gitops-suite.yml.j2 | 16 ++++++++++--- 4 files changed, 46 insertions(+), 13 deletions(-) diff --git a/image/cli/mascli/functions/gitops_suite b/image/cli/mascli/functions/gitops_suite index e36a9c5f030..be77acfd6d7 100644 --- a/image/cli/mascli/functions/gitops_suite +++ b/image/cli/mascli/functions/gitops_suite @@ -48,7 +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-report-adoption-metrics ${COLOR_YELLOW}MAS_REPORT_ADOPTION_METRICS${TEXT_RESET} To enable adoption metrics reporting (optional, defaults to true) + --mas_feature_use ${COLOR_YELLOW}MAS_FEATURE_USE${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 ${COLOR_YELLOW}MAS_USABILITY${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 @@ -144,8 +146,9 @@ function gitops_suite_noninteractive() { export CERT_MANAGER_NAMESPACE=${CERT_MANAGER_NAMESPACE:-"cert-manager"} # Enable adoption metrics reporting by default - export MAS_REPORT_ADOPTION_METRICS=${MAS_REPORT_ADOPTION_METRICS:-"true"} - + export MAS_FEATURE_USE=${MAS_FEATURE_USE:-"true"} + export MAS_DEPLOYMENT_PROGRESSION=${MAS_DEPLOYMENT_PROGRESSION:-"true"} + export MAS_USABILITY=${MAS_USABILITY:-"true"} #GenericAddon default export EXTENSIONS=${EXTENSIONS:-"false"} @@ -262,8 +265,14 @@ function gitops_suite_noninteractive() { --mas-wipe-mongo-data) export MAS_WIPE_MONGO_DATA=$1 && shift ;; - --mas-report-adoption-metrics) - export MAS_REPORT_ADOPTION_METRICS=$1 && shift + --mas-feature-use) + export MAS_FEATURE_USE=$1 && shift + ;; + --mas-deployment-progression) + export MAS_DEPLOYMENT_PROGRESSION=$1 && shift + ;; + --mas-usability) + export MAS_USABILITY=$1 && shift ;; --suite-spec-additional-properties-yaml) export SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML=$1 && shift @@ -587,7 +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 adoption metrics .................... ${COLOR_MAGENTA}${MAS_REPORT_ADOPTION_METRICS}" + echo_reset_dim "Report feature use metrics ................. ${COLOR_MAGENTA}${MAS_FEATURE_USE}" + echo_reset_dim "Report deployment progression metrics ...... ${COLOR_MAGENTA}${MAS_DEPLOYMENT_PROGRESSION}" + echo_reset_dim "Report usability metrics ................... ${COLOR_MAGENTA}${MAS_USABILITY}" 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 85aa8595316..f18cd85e6f4 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,7 +4,9 @@ ibm_mas_suite: cert_manager_namespace: "{{ CERT_MANAGER_NAMESPACE }}" ibm_entitlement_key: "" domain: "{{ DOMAIN }}" - mas_report_adoption_metrics: "{{ MAS_REPORT_ADOPTION_METRICS }}" + mas_feature_use: "{{ MAS_FEATURE_USE }}" + mas_deployment_progression: "{{ MAS_DEPLOYMENT_PROGRESSION }}" + mas_usability: "{{ MAS_USABILITY }}" {%- 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 6f95e454cd9..f8efe566292 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -170,7 +170,13 @@ spec: - name: mas_wipe_mongo_data type: string default: "false" - - name: mas_report_adoption_metrics + - name: mas_feature_use + type: string + default: "true" + - name: mas_deployment_progression + type: string + default: "true" + - name: mas_usability type: string default: "true" - name: mas_pod_template_yaml @@ -457,8 +463,12 @@ spec: value: $(params.mas_pod_template_yaml) - name: mas_wipe_mongo_data value: $(params.mas_wipe_mongo_data) - - name: mas_report_adoption_metrics - value: $(params.mas_report_adoption_metrics) + - name: mas_feature_use + value: $(params.mas_feature_use) + - name: mas_deployment_progression + value: $(params.mas_deployment_progression) + - name: mas_usability + value: $(params.mas_usability) - 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 d3b57559722..0c1e715c9c8 100644 --- a/tekton/src/tasks/gitops/gitops-suite.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-suite.yml.j2 @@ -122,7 +122,13 @@ spec: - name: mas_wipe_mongo_data type: string default: "false" - - name: mas_report_adoption_metrics + - name: mas_feature_use + type: string + default: "true" + - name: mas_deployment_progression + type: string + default: "true" + - name: mas_usability type: string default: "true" - name: suite_spec_additional_properties_yaml @@ -247,8 +253,12 @@ spec: value: $(params.mas_pod_template_yaml) - name: MAS_WIPE_MONGO_DATA value: $(params.mas_wipe_mongo_data) - - name: MAS_REPORT_ADOPTION_METRICS - value: $(params.mas_report_adoption_metrics) + - name: MAS_FEATURE_USE + value: $(params.mas_feature_use) + - name: MAS_DEPLOYMENT_PROGRESSION + value: $(params.mas_deployment_progression) + - name: MAS_USABILITY + value: $(params.mas_usability) - name: SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML value: $(params.suite_spec_additional_properties_yaml) - name: SUITE_SPEC_SETTINGS_ADDITIONAL_PROPERTIES_YAML From 59b53a79048ed7b871a6df41f3a69a9c250074bb Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Tue, 10 Feb 2026 15:10:32 -0700 Subject: [PATCH 05/11] [patch] update secrets baseline --- .secrets.baseline | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 56b82e39f73..5458ef8788e 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-10T20:50:46Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -690,7 +690,7 @@ "hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd", "is_secret": false, "is_verified": false, - "line_number": 24, + "line_number": 26, "type": "Secret Keyword", "verified_result": null } From 1f4f275563af3bf4bace9e50c2d3da5814c1980b Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Tue, 10 Feb 2026 15:38:09 -0700 Subject: [PATCH 06/11] [patch] update secrets.baseline --- .secrets.baseline | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 5458ef8788e..f093e1ac713 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-02-10T20:50:46Z", + "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 } From 0cd8e0f7d1df1a4982462751a5e8e8c32098cf8b Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Tue, 10 Feb 2026 17:23:51 -0700 Subject: [PATCH 07/11] [patch] set flags to false --- tekton/src/tasks/gitops/gitops-suite.yml.j2 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tekton/src/tasks/gitops/gitops-suite.yml.j2 b/tekton/src/tasks/gitops/gitops-suite.yml.j2 index 0c1e715c9c8..627efc6bc48 100644 --- a/tekton/src/tasks/gitops/gitops-suite.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-suite.yml.j2 @@ -341,6 +341,15 @@ spec: if [[ -z "${DELETE_WILDCARDS}" ]]; then DELETE_WILDCARDS="false" fi + if [[ -z "${MAS_FEATURE_USE}" ]]; then + MAS_FEATURE_USE="false" + fi + if [[ -z "${MAS_DEPLOYMENT_PROGRESSION}" ]]; then + MAS_DEPLOYMENT_PROGRESSION="false" + fi + if [[ -z "${MAS_USABILITY}" ]]; then + MAS_USABILITY="false" + fi sed -n -e 's/^.*api.fvtsaas.//p' | cut -d: -f1 mkdir -p /tmp/init-suite From 23acba71039324dac0fc1fc6f190ebe8972df089 Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Thu, 12 Feb 2026 10:23:52 -0700 Subject: [PATCH 08/11] [patch] upgrade buildx --- build/bin/.functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/bin/.functions.sh b/build/bin/.functions.sh index ef732db790c..e890d99987b 100644 --- a/build/bin/.functions.sh +++ b/build/bin/.functions.sh @@ -52,7 +52,7 @@ function echo_highlight() { # - https://stackoverflow.com/questions/65365797/docker-buildx-exec-user-process-caused-exec-format-error function install_buildx() { mkdir -vp ~/.docker/cli-plugins/ - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" > ~/.docker/cli-plugins/docker-buildx + curl --silent -L "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" > ~/.docker/cli-plugins/docker-buildx chmod a+x ~/.docker/cli-plugins/docker-buildx sudo apt-get update From 21f25246c026c5bd57aa98f53e0ac461d4ac0bb2 Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Thu, 12 Feb 2026 12:29:53 -0700 Subject: [PATCH 09/11] [patch] update flag names --- image/cli/mascli/functions/gitops_suite | 22 +++++++++---------- .../cluster/instance/ibm-mas-suite.yaml.j2 | 4 ++-- .../gitops/gitops-mas-instance.yml.j2 | 12 +++++----- tekton/src/tasks/gitops/gitops-suite.yml.j2 | 20 ++++++++--------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/image/cli/mascli/functions/gitops_suite b/image/cli/mascli/functions/gitops_suite index be77acfd6d7..eda1178dc9c 100644 --- a/image/cli/mascli/functions/gitops_suite +++ b/image/cli/mascli/functions/gitops_suite @@ -48,9 +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_use ${COLOR_YELLOW}MAS_FEATURE_USE${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 ${COLOR_YELLOW}MAS_USABILITY${TEXT_RESET} Flag to control user interface interaction metrics to improve usability (optional, defaults to true) + --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 @@ -146,9 +146,9 @@ function gitops_suite_noninteractive() { export CERT_MANAGER_NAMESPACE=${CERT_MANAGER_NAMESPACE:-"cert-manager"} # Enable adoption metrics reporting by default - export MAS_FEATURE_USE=${MAS_FEATURE_USE:-"true"} + export MAS_FEATURE_USAGE=${MAS_FEATURE_USAGE:-"true"} export MAS_DEPLOYMENT_PROGRESSION=${MAS_DEPLOYMENT_PROGRESSION:-"true"} - export MAS_USABILITY=${MAS_USABILITY:-"true"} + export MAS_USABILITY_METRICS=${MAS_USABILITY_METRICS:-"true"} #GenericAddon default export EXTENSIONS=${EXTENSIONS:-"false"} @@ -265,14 +265,14 @@ function gitops_suite_noninteractive() { --mas-wipe-mongo-data) export MAS_WIPE_MONGO_DATA=$1 && shift ;; - --mas-feature-use) - export MAS_FEATURE_USE=$1 && shift + --mas-feature-usage) + export MAS_FEATURE_USAGE=$1 && shift ;; --mas-deployment-progression) export MAS_DEPLOYMENT_PROGRESSION=$1 && shift ;; - --mas-usability) - export MAS_USABILITY=$1 && shift + --mas-usability-metrics) + export MAS_USABILITY_METRICS=$1 && shift ;; --suite-spec-additional-properties-yaml) export SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML=$1 && shift @@ -596,9 +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_USE}" + 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}" + 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 f18cd85e6f4..0e1ee0fabdd 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,9 +4,9 @@ ibm_mas_suite: cert_manager_namespace: "{{ CERT_MANAGER_NAMESPACE }}" ibm_entitlement_key: "" domain: "{{ DOMAIN }}" - mas_feature_use: "{{ MAS_FEATURE_USE }}" + mas_feature_usage: "{{ MAS_FEATURE_USAGE }}" mas_deployment_progression: "{{ MAS_DEPLOYMENT_PROGRESSION }}" - mas_usability: "{{ MAS_USABILITY }}" + 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 f8efe566292..63020b99712 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2 @@ -170,13 +170,13 @@ spec: - name: mas_wipe_mongo_data type: string default: "false" - - name: mas_feature_use + - name: mas_feature_usage type: string default: "true" - name: mas_deployment_progression type: string default: "true" - - name: mas_usability + - name: mas_usability_metrics type: string default: "true" - name: mas_pod_template_yaml @@ -463,12 +463,12 @@ spec: value: $(params.mas_pod_template_yaml) - name: mas_wipe_mongo_data value: $(params.mas_wipe_mongo_data) - - name: mas_feature_use - value: $(params.mas_feature_use) + - name: mas_feature_usage + value: $(params.mas_feature_usage) - name: mas_deployment_progression value: $(params.mas_deployment_progression) - - name: mas_usability - value: $(params.mas_usability) + - 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 627efc6bc48..c54bad2f121 100644 --- a/tekton/src/tasks/gitops/gitops-suite.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-suite.yml.j2 @@ -122,13 +122,13 @@ spec: - name: mas_wipe_mongo_data type: string default: "false" - - name: mas_feature_use + - name: mas_feature_usage type: string default: "true" - name: mas_deployment_progression type: string default: "true" - - name: mas_usability + - name: mas_usability_metrics type: string default: "true" - name: suite_spec_additional_properties_yaml @@ -253,12 +253,12 @@ spec: value: $(params.mas_pod_template_yaml) - name: MAS_WIPE_MONGO_DATA value: $(params.mas_wipe_mongo_data) - - name: MAS_FEATURE_USE - value: $(params.mas_feature_use) + - name: MAS_FEATURE_USAGE + value: $(params.mas_feature_usage) - name: MAS_DEPLOYMENT_PROGRESSION value: $(params.mas_deployment_progression) - - name: MAS_USABILITY - value: $(params.mas_usability) + - 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 @@ -341,14 +341,14 @@ spec: if [[ -z "${DELETE_WILDCARDS}" ]]; then DELETE_WILDCARDS="false" fi - if [[ -z "${MAS_FEATURE_USE}" ]]; then - MAS_FEATURE_USE="false" + if [[ -z "${MAS_FEATURE_USAGE}" ]]; then + MAS_FEATURE_USAGE="false" fi if [[ -z "${MAS_DEPLOYMENT_PROGRESSION}" ]]; then MAS_DEPLOYMENT_PROGRESSION="false" fi - if [[ -z "${MAS_USABILITY}" ]]; then - MAS_USABILITY="false" + if [[ -z "${MAS_USABILITY_METRICS}" ]]; then + MAS_USABILITY_METRICS="false" fi sed -n -e 's/^.*api.fvtsaas.//p' | cut -d: -f1 From 2673f30990460d095c9c0f7ccdbc4660d18d2614 Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Thu, 19 Feb 2026 13:15:58 -0500 Subject: [PATCH 10/11] Sending string remove overwrite --- tekton/src/tasks/gitops/gitops-suite.yml.j2 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tekton/src/tasks/gitops/gitops-suite.yml.j2 b/tekton/src/tasks/gitops/gitops-suite.yml.j2 index c54bad2f121..b2338139d1b 100644 --- a/tekton/src/tasks/gitops/gitops-suite.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-suite.yml.j2 @@ -341,15 +341,6 @@ spec: if [[ -z "${DELETE_WILDCARDS}" ]]; then DELETE_WILDCARDS="false" fi - if [[ -z "${MAS_FEATURE_USAGE}" ]]; then - MAS_FEATURE_USAGE="false" - fi - if [[ -z "${MAS_DEPLOYMENT_PROGRESSION}" ]]; then - MAS_DEPLOYMENT_PROGRESSION="false" - fi - if [[ -z "${MAS_USABILITY_METRICS}" ]]; then - MAS_USABILITY_METRICS="false" - fi sed -n -e 's/^.*api.fvtsaas.//p' | cut -d: -f1 mkdir -p /tmp/init-suite From 9e5ff76c686fe1da0af14f1ebec402c364d47d67 Mon Sep 17 00:00:00 2001 From: Ashley Tate Date: Thu, 19 Feb 2026 14:00:06 -0500 Subject: [PATCH 11/11] [patch] force build