Fixes: mosip/mosip-infra#1957 - Rapid deployment changes for standalone monitoring and alerting.

.github/scripts/wg-peer-allocation.tsv

@@ -1 +1,2 @@
 env_name	tf_peer	wg0_peer	wg1_peer	allocated_at
+MI-issue-1957	peer43	peer44	peer45	2026-10-08T05:25:32Z

.github/workflows/helmsman_external.yml

@@ -36,6 +36,10 @@ on:
         description: "Environment name (e.g. sandbox, dev, staging)"
         required: false
         type: string
+      mail_id: 
+        description: "Organization mail id for cluster alert notifications (e.g. xyz@gmail.com)"
+        required: true
+        type: string
       slack_channel_name:
         description: "Slack channel name for alerting (e.g. #mosip-alerts)"
         required: false
@@ -68,12 +72,14 @@ jobs:
           errors=()
           DOMAIN="${{ github.event.inputs.domain_name || vars.DOMAIN_NAME }}"
           ENV="${{ github.event.inputs.env_name || vars.ENV_NAME }}"
+          MAIL_ID="${{ github.event.inputs.mail_id || vars.MAIL_ID }}"
           CLUSTER="${{ github.event.inputs.clusterid || vars.CLUSTER_ID }}"
           SLACK_CH="${{ github.event.inputs.slack_channel_name || vars.SLACK_CHANNEL_NAME }}"
           DB_PORT="${{ github.event.inputs.db_port || vars.DB_PORT }}"
           ESIGNET_DB_PORT="${{ github.event.inputs.esignet_db_port || vars.ESIGNET_DB_PORT }}"
           [ -z "$DOMAIN" ]          && errors+=("domain_name is empty — set vars.DOMAIN_NAME under Environment '${{ github.ref_name }}'")
           [ -z "$ENV" ]             && errors+=("env_name is empty — set vars.ENV_NAME under Environment '${{ github.ref_name }}'")
+          [ -z "$MAIL_ID" ]         && errors+=("mail_id is empty — set vars.MAIL_ID under Environment '${{ github.ref_name }}'") 
           [ -z "$CLUSTER" ]         && errors+=("clusterid is empty — set vars.CLUSTER_ID under Environment '${{ github.ref_name }}'")
           [ -z "$SLACK_CH" ]        && errors+=("slack_channel_name is empty — set vars.SLACK_CHANNEL_NAME under Environment '${{ github.ref_name }}'")
           [ -z "$DB_PORT" ]         && errors+=("db_port is empty — set vars.DB_PORT under Environment '${{ github.ref_name }}'")
@@ -86,6 +92,7 @@ jobs:
           fi
           echo "✓ domain_name        = $DOMAIN"
           echo "✓ env_name           = $ENV"
+          echo "✓ mail_id            = $MAIL_ID"
           echo "✓ clusterid          = $CLUSTER"
           echo "✓ slack_channel_name = $SLACK_CH"
           echo "✓ db_port            = $DB_PORT"
@@ -119,6 +126,7 @@ jobs:
           save_var "DB_PORT"            "${{ github.event.inputs.db_port }}"
           save_var "ESIGNET_DB_PORT"    "${{ github.event.inputs.esignet_db_port }}"
           save_var "ENV_NAME"           "${{ github.event.inputs.env_name }}"
+          save_var "MAIL_ID"            "${{ github.event.inputs.mail_id }}"
           save_var "CLUSTER_ID"         "${{ github.event.inputs.clusterid }}"
           save_var "SLACK_CHANNEL_NAME" "${{ github.event.inputs.slack_channel_name }}"
 
@@ -201,9 +209,11 @@ jobs:
       db_port:             ${{ github.event.inputs.db_port             || vars.DB_PORT }}
       esignet_db_port:     ${{ github.event.inputs.esignet_db_port     || vars.ESIGNET_DB_PORT }}
       env_name:            ${{ github.event.inputs.env_name            || vars.ENV_NAME }}
+      mail_id:             ${{ github.event.inputs.mail_id             || vars.MAIL_ID }}
       slack_channel_name:  ${{ github.event.inputs.slack_channel_name  || vars.SLACK_CHANNEL_NAME }}
       SLACK_WEBHOOK_URL:   ${{ github.event.inputs.slack_webhook_url   || secrets.SLACK_WEBHOOK_URL }}
       CLUSTER_ID:          ${{ github.event.inputs.clusterid           || vars.CLUSTER_ID }}
+      SMTP_PASSWORD:       ${{ secrets.SMTP_PASSWORD }}
       ESIGNET_CAPTCHA_SITE_KEY: ${{ secrets.ESIGNET_CAPTCHA_SITE_KEY }}
       ESIGNET_CAPTCHA_SECRET_KEY: ${{ secrets.ESIGNET_CAPTCHA_SECRET_KEY }}
       PREREG_CAPTCHA_SITE_KEY: ${{ secrets.PREREG_CAPTCHA_SITE_KEY }}
@@ -224,6 +234,7 @@ jobs:
 
       - name: Mask sensitive secrets
         run: |
+          echo "::add-mask::${{ secrets.SMTP_PASSWORD }}"
           echo "::add-mask::${{ secrets.ESIGNET_CAPTCHA_SITE_KEY }}"
           echo "::add-mask::${{ secrets.ESIGNET_CAPTCHA_SECRET_KEY }}"
           echo "::add-mask::${{ secrets.PREREG_CAPTCHA_SITE_KEY }}"
@@ -387,6 +398,7 @@ jobs:
         run: |
           echo "domain_name        = $domain_name"
           echo "env_name           = $env_name"
+          echo "mail_id            = $mail_id"
           echo "slack_channel_name = $slack_channel_name"
           echo "CLUSTER_ID         = $CLUSTER_ID"
 
@@ -440,10 +452,11 @@ jobs:
           MODE: ${{ github.event.inputs.mode }}
           DOMAIN_NAME: ${{ github.event.inputs.domain_name || vars.DOMAIN_NAME }}
           ENV_NAME: ${{ github.event.inputs.env_name || vars.ENV_NAME }}
+          MAIL_ID: ${{ github.event.inputs.mail_id || vars.MAIL_ID }}
         run: |
           curl -X POST \
             -H "Accept: application/vnd.github+json" \
             -H "Authorization: Bearer $GITHUB_TOKEN" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
             https://api.github.com/repos/$GITHUB_REPO/actions/workflows/helmsman_mosip.yml/dispatches \
-            -d '{"ref":"'"$BRANCH"'","inputs":{"mode":"'"${MODE:-apply}"'","profile":"'"${{ needs.set-matrix.outputs.profile }}"'","domain_name":"'"$DOMAIN_NAME"'","env_name":"'"$ENV_NAME"'"}}'
+            -d '{"ref":"'"$BRANCH"'","inputs":{"mode":"'"${MODE:-apply}"'","profile":"'"${{ needs.set-matrix.outputs.profile }}"'","domain_name":"'"$DOMAIN_NAME"'","env_name":"'"$ENV_NAME"'","mail_id":"'"$MAIL_ID"'"}}'

Helmsman/dsf/mosip-platform-1.2.0.x/external-dsf.yaml

@@ -317,11 +317,12 @@ apps:
   # https://cloud.google.com/security/products/recaptcha
   # https://www.google.com/recaptcha/admin/create
 
-  kafka: 
+   kafka:
     namespace: kafka
     enabled: true
     version: 18.3.1
     chart: bitnami/kafka
+    valuesFile: "$WORKDIR/utils/kafka-values.yaml"
     set:
       # Add these for image overrides
       image.repository: "mosipid/kafka"
@@ -337,16 +338,16 @@ apps:
       replicaCount: "5"
       autoCreateTopicsEnable: "true"
       deleteTopicEnable: "true"
-      persistence.enabled: "true"
+      persistence.enabled: "false"
       persistence.accessModes[0]: "ReadWriteOnce"
       persistence.size: "8Gi"
       zookeeper.enabled: "true"
+      zookeeper.replicaCount: "5"
       zookeeper.resources.requests.cpu: "150m"
       zookeeper.resources.requests.memory: "600Mi"
       zookeeper.resources.limits.cpu: "300m"
       zookeeper.resources.limits.memory: "1200Mi"
-      zookeeper.replicaCount: "5"
-      zookeeper.persistence.enabled: "true"
+      zookeeper.persistence.enabled: "false"
       zookeeper.persistence.size: "2Gi"
       resources.limits.cpu: "1000m"
       resources.limits.memory: "3500Mi"
@@ -382,7 +383,7 @@ apps:
     wait: true
     timeout: 1200
     priority: -6
-
+    
   istio-addons-kafka:
     namespace: kafka
     enabled: true

Helmsman/dsf/mosip-platform-1.2.1.x/external-dsf.yaml

@@ -329,7 +329,7 @@ apps:
     enabled: true
     version: 18.3.1
     chart: bitnami/kafka
-    valuesFile: "$WORKDIR/utils/kafka-values.yaml"
+    valuesFile: "$WORKDIR/utils/Kafka-values.yaml"
     set:
       # Add these for image overrides
       image.repository: "mosipid/kafka"
@@ -345,7 +345,7 @@ apps:
       replicaCount: "5"
       autoCreateTopicsEnable: "true"
       deleteTopicEnable: "true"
-      persistence.enabled: "true"
+      persistence.enabled: "false"
       persistence.accessModes[0]: "ReadWriteOnce"
       persistence.size: "8Gi"
       zookeeper.enabled: "true"
@@ -354,7 +354,7 @@ apps:
       zookeeper.resources.requests.memory: "600Mi"
       zookeeper.resources.limits.cpu: "300m"
       zookeeper.resources.limits.memory: "1200Mi"
-      zookeeper.persistence.enabled: "true"
+      zookeeper.persistence.enabled: "false"
       zookeeper.persistence.size: "2Gi"
       resources.limits.cpu: "1000m"
       resources.limits.memory: "3500Mi"

Helmsman/dsf/mosip-platform-1.2.1.x/prereq-dsf.yaml

@@ -7,105 +7,170 @@ helmRepos:
   bitnami: https://charts.bitnami.com/bitnami
   mosip: https://mosip.github.io/mosip-helm
   banzaicloud-stable: https://charts.helm.sh/stable
+  grafana: https://grafana.github.io/helm-charts
+  grafana-community: https://grafana-community.github.io/helm-charts
+  prometheus-community: https://prometheus-community.github.io/helm-charts
 
 # Note: Based on your requirement disable the namespaces which you want to use, by default all the namespaces are protected.
 namespaces:
   kube-system:
     protected: true
-  cattle-monitoring-system:
-    protected: true
-  cattle-logging-system:
+  monitoring:
     protected: true
+  # As part of a move to a standalone observability stack, we're replacing rancher-monitoring with the upstream kube-prometheus-stack (Prometheus, Alertmanager, node-exporter) and rancher-logging with Loki. Metrics, logs, and alerting are unaffected in coverage — what changes is the backend, where data surfaces (a single standalone Grafana for both metrics and logs), and the alerting destination (email via Alertmanager). The stack is now independent of Rancher.
+  # cattle-monitoring-system:
+  #  protected: true
+  # cattle-logging-system:
+  #   protected: true
   istio-system:
     protected: true
   istio-operator:
     protected: true
   httpbin:
     protected: true
+  logging:
+    protected: true
 
 apps:
-  rancher-monitoring-crd:
-    namespace: cattle-monitoring-system
+  kube-prometheus-stack:
+    namespace: monitoring
     enabled: true
-    version: 103.1.1+up45.31.1
-    chart: mosip/rancher-monitoring-crd
+    version: 88.6.2        
+    chart: prometheus-community/kube-prometheus-stack
+    valuesFile: "$WORKDIR/utils/loki-monitoring-values.yaml"
     wait: true
     timeout: 900
     priority: -6
     hooks:
+      preInstall: "$WORKDIR/hooks/monitoring-preinstall.sh ${SMTP_PASSWORD}"
       postInstall: "$WORKDIR/hooks/install-istio-and-httpbin.sh ${domain_name} ${env_name}"
       postUpgrade: "$WORKDIR/hooks/install-istio-and-httpbin.sh ${domain_name} ${env_name}"
+
+  # rancher-monitoring-crd:
+  #   namespace: cattle-monitoring-system
+  #   enabled: true
+  #   version: 103.1.1+up45.31.1
+  #   chart: mosip/rancher-monitoring-crd
+  #   wait: true
+  #   timeout: 900
+  #   priority: -6
+  #   hooks:
+  #     postInstall: "$WORKDIR/hooks/install-istio-and-httpbin.sh ${domain_name} ${env_name}"
+  #    postUpgrade: "$WORKDIR/hooks/install-istio-and-httpbin.sh ${domain_name} ${env_name}"
 
-  rancher-monitoring:
-    namespace: cattle-monitoring-system
-    enabled: true
-    version: 103.1.0+up45.31.1
-    chart: mosip/rancher-monitoring
-    set:
-      grafana.global.cattle.clusterId: "$CLUSTER_ID"
-      global.cattle.clusterId: "$CLUSTER_ID"
-    wait: true
-    valuesFile: "$WORKDIR/utils/monitoring_values.yaml"
-    priority: -5
-    timeout: 600
-    hooks:
-      postInstall: "$WORKDIR/hooks/alerting-setup.sh ${slack_channel_name} ${SLACK_WEBHOOK_URL} ${env_name}"
+  # rancher-monitoring:
+  #   namespace: cattle-monitoring-system
+  #   enabled: true
+  #   version: 103.1.0+up45.31.1
+  #   chart: mosip/rancher-monitoring
+  #   set:
+  #     grafana.global.cattle.clusterId: "$CLUSTER_ID"
+  #     global.cattle.clusterId: "$CLUSTER_ID"
+  #   wait: true
+  #   valuesFile: "$WORKDIR/utils/monitoring_values.yaml"
+  #   priority: -5
+  #   timeout: 600
+  #   hooks:
+  #     postInstall: "$WORKDIR/hooks/alerting-setup.sh ${slack_channel_name} ${SLACK_WEBHOOK_URL} ${env_name}"
+
+  # As part of a move to a standalone monitoring stack, we're replacing rancher-logging with Loki. Cluster logging and log collection are unaffected — only the backend and where logs surface are changing.
+  # elasticsearch:
+  #   namespace: cattle-logging-system
+  #   enabled: true
+  #   version: 17.9.25
+  #   chart: mosip/elasticsearch
+  #   set:
+  #     image.repository: "mosipint/elasticsearch"
+  #     image.tag: "7.17.2-debian-10-r4"
+  #     # Kibana configuration and image
+  #     global.kibanaEnabled: "true"
+  #     kibana.image.repository: "mosipid/kibana"
+  #     kibana.image.tag: "7.17.2-debian-10-r0"
+  #     kibana.image.pullPolicy: IfNotPresent
+  #     data.heapSize: "728m"
+  #     data.persistence.enabled: "true"
+  #     data.persistence.size: "64Gi"
+  #     data.resources.requests.memory: "1100Mi"
+  #     master.heapSize: "1024m"
+  #     master.persistence.enabled: "true"
+  #     master.persistence.size: "4Gi"
+  #     master.resources.requests.memory: "1536Mi"
+  #     kibana.persistence.enabled: "false"
+  #     sysctlImage.repository: "mosipid/os-shell"
+  #     sysctlImage.tag: "12-debian-12-r46"
+  #   wait: true
+  #   timeout: 900
+  #   priority: -4
+
+  # istio-addons-logging:
+  #   namespace: cattle-logging-system
+  #   enabled: true
+  #   version: 0.1.0
+  #   chart: $WORKDIR/utils/istio-addons/logging-istio-addons-0.1.0.tgz
+  #   set:
+  #     kibanaHost: "kibana.${domain_name}"
+  #     installName: "elasticsearch-kibana"
+  #   wait: true
+  #   priority: -3
 
-  elasticsearch:
-    namespace: cattle-logging-system
+  # rancher-logging-crd:
+  #   namespace: cattle-logging-system
+  #   enabled: true
+  #   version: 103.1.1+up4.4.0
+  #   chart: mosip/rancher-logging-crd
+  #   wait: true
+  #   priority: -2
+
+  # rancher-logging:
+  #   namespace: cattle-logging-system
+  #   enabled: true
+  #   version: 103.1.1+up4.4.0
+  #   chart: mosip/rancher-logging
+  #   valuesFile: "$WORKDIR/utils/rancher-logging-values.yaml"
+  #   wait: true
+  #   priority: -1
+  #   timeout: 1200
+  #   hooks:
+  #     postInstall: "$WORKDIR/hooks/post_logging-setup.sh"
+
+  loki:
+    namespace: logging
     enabled: true
-    version: 17.9.25
-    chart: mosip/elasticsearch
-    set:
-      image.repository: "mosipint/elasticsearch"
-      image.tag: "7.17.2-debian-10-r4"
-      # Kibana configuration and image
-      global.kibanaEnabled: "true"
-      kibana.image.repository: "mosipid/kibana"
-      kibana.image.tag: "7.17.2-debian-10-r0"
-      kibana.image.pullPolicy: IfNotPresent
-      data.heapSize: "728m"
-      data.persistence.enabled: "true"
-      data.persistence.size: "64Gi"
-      data.resources.requests.memory: "1100Mi"
-      master.heapSize: "1024m"
-      master.persistence.enabled: "true"
-      master.persistence.size: "4Gi"
-      master.resources.requests.memory: "1536Mi"
-      kibana.persistence.enabled: "false"
-      sysctlImage.repository: "mosipid/os-shell"
-      sysctlImage.tag: "12-debian-12-r46"
+    version: 6.55.0
+    chart: grafana/loki
+    valuesFile: "$WORKDIR/utils/loki-values.yaml"
     wait: true
-    timeout: 900
     priority: -4
+    timeout: 300
 
-  istio-addons-logging:
-    namespace: cattle-logging-system
+  grafana:
+    namespace: logging
     enabled: true
-    version: 0.1.0
-    chart: $WORKDIR/utils/istio-addons/logging-istio-addons-0.1.0.tgz
-    set:
-      kibanaHost: "kibana.${domain_name}"
-      installName: "elasticsearch-kibana"
+    version: 12.11.2
+    chart: grafana-community/grafana
+    valuesFile: "$WORKDIR/utils/grafana-values.yaml"
     wait: true
     priority: -3
+    timeout: 300
+    hooks:
+      postInstall: "$WORKDIR/hooks/import-dashboards.sh"
 
-  rancher-logging-crd:
-    namespace: cattle-logging-system
+  alloy:
+    namespace: logging
     enabled: true
-    version: 103.1.1+up4.4.0
-    chart: mosip/rancher-logging-crd
+    version: 1.6.2
+    chart: grafana/alloy
+    valuesFile: "$WORKDIR/utils/alloy-values.yaml"
     wait: true
     priority: -2
+    timeout: 300
 
-  rancher-logging:
-    namespace: cattle-logging-system
+  istio-addons-loki:
+    namespace: logging
     enabled: true
-    version: 103.1.1+up4.4.0
-    chart: mosip/rancher-logging
-    valuesFile: "$WORKDIR/utils/rancher-logging-values.yaml"
+    version: 0.0.1-develop
+    chart: $WORKDIR/utils/istio-addons/loki-istio-addons-0.0.1-develop.tgz
+    set:
+      istio.host: "grafana.${domain_name}"
     wait: true
     priority: -1
-    timeout: 1200
-    hooks:
-      postInstall: "$WORKDIR/hooks/post_logging-setup.sh"