3.7.0 release (#159)

Author: largetimmo

README.md

@@ -84,7 +84,7 @@ Helm is configured properly if the command `helm version` returns no error.
 ```
 - By default the publicly available [latest Docker image of PubSub+ Software Event Broker Standard Edition](https://hub.Docker.com/r/solace/solace-pubsub-standard/tags/) will be used. Specify a different image or [use a Docker image from a private registry](/docs/PubSubPlusK8SDeployment.md#using-private-registries) if required. If using a non-default image, add the `--set image.repository=<your-image-location>,image.tag=<your-image-tag>` values to the commands below.
 - Generally, for configuration options and ways to override default configuration values (using `--set` is one the options), consult the [PubSub+ Software Event Broker Helm Chart Reference](/pubsubplus/README.md#configuration).
-- Use one of the following chart variants to create a deployment: 
+- Use one of the following chart variants to create a deployment:
 
 a) Create a Solace PubSub+ Software Event Broker deployment for development purposes using `pubsubplus-dev`. It requires a minimum of 1 CPU and 2 GB of memory available to the event broker pod.
 ```bash
@@ -118,7 +118,7 @@ Refer to the detailed PubSub+ Kubernetes documentation for:
 
 ## Support
 
-Releases are ON Demand. Solace provides full support for the latest Helm Chart and technical support for an additional six months. 
+Releases are ON Demand. Solace provides full support for the latest Helm Chart and technical support for an additional six months.
 
 Refer [Technical Product Support | Solace](https://solace.com/legal/technical-product-support/) for support terminologies.
 
@@ -128,7 +128,7 @@ The following table shows:
 ![image](https://github.com/user-attachments/assets/df403828-04a8-4ca5-9b6c-303b270640e8)
 A green check mark shows that broker deployment using the Helm chart is supported and tested on the specific Kubernetes distribution.
 
- ![image](https://github.com/user-attachments/assets/bfefe455-d6d8-49a4-98d0-dee8d791dc66)
+![image](https://github.com/user-attachments/assets/bfefe455-d6d8-49a4-98d0-dee8d791dc66)
 A gray check mark shows the broker deployment using helm chart is supported but not fully tested on the specific kubernetes distribution. In addition, there may be known issues or additional work required to deploy event broker services on the Kubernetes cluster.
 
 | Kubernetes Distribution | Minimum Recommended Pubsub+ Event Broker Version | Supported |
@@ -160,4 +160,4 @@ For more information about Solace technology in general please visit these resou
 
 - The Solace Developer Portal website at: [solace.dev](//solace.dev/)
 - Understanding [Solace technology](//solace.com/products/platform/)
-- Ask the [Solace community](//dev.solace.com/community/).
+- Ask the [Solace community](//dev.solace.com/community/).

pubsubplus/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Deploy Solace PubSub+ Event Broker Singleton or HA redundancy group onto a Kubernetes Cluster
 name: pubsubplus
-version: 3.6.0
+version: 3.7.0
 icon: https://solaceproducts.github.io/pubsubplus-kubernetes-helm-quickstart/images/PubSubPlus.png
 kubeVersion: '>= 1.10.0-0'
 maintainers:

pubsubplus/README.md

@@ -115,4 +115,4 @@ For more ways to override default chart values, refer to [Customizing the Helm C
 | `storage.useStorageGroup`      | `true` to use a single mount point storage-group, as recommended from PubSub+ version 9.12. Undefined or `false` is legacy behavior. Note: legacy mount still works for newer versions but may be deprecated in the future. | Undefined                                                                       |
 
 ## Configuring Insights
-To configure Insights, please see [INSIGHTS.md](INSIGHTS.md).
+To configure Insights, please see [INSIGHTS.md](INSIGHTS.md).

pubsubplus/templates/solaceConfigMap.yaml

@@ -493,6 +493,32 @@ data:
             rm -f ${FINAL_ACTIVITY_LOGGED_TRACKING_FILE}; exit 1
           fi
         fi
+        broker_version=$(/mnt/disks/solace/semp_query.sh -n admin -p ${password} -u http://localhost:8080 \
+          -q "<rpc><show><version/></show></rpc>" \
+          -v "/rpc-reply/rpc/show/version/current-load[text()]")
+        broker_version=`echo ${broker_version} | xmllint -xpath "string(returnInfo/valueSearchResult)" - | cut -d'.' -f2`
+        if [[ "${broker_version}" -ge 8 ]]; then
+          # DMR cluster operation state
+          cluster_status=$(/mnt/disks/solace/semp_query.sh -n admin -p ${password} -u http://localhost:8080 \
+                  -q "<rpc><show><cluster><cluster-name-pattern>*</cluster-name-pattern></cluster></show></rpc>" \
+                  -v "/rpc-reply/rpc/show/cluster/clusters/cluster/oper-up[text()]")
+          cluster_status=`echo ${cluster_status} | xmllint -xpath "string(returnInfo/valueSearchResult)" -`
+          if [ "${cluster_status}" != "true" ] && [ "${cluster_status}" != "" ]; then
+            echo "$(date) INFO: ${APP}-DMR cluster operational state is down"
+            rm -f ${FINAL_ACTIVITY_LOGGED_TRACKING_FILE}; exit 1
+          fi
+        fi
+        if [[ "${broker_version}" -ge 11 ]]; then
+          # DMR sync state
+          cluster_sync_status=$(/mnt/disks/solace/semp_query.sh -n admin -p ${password} -u http://localhost:8080 \
+                -q "<rpc><show><cluster><cluster-name-pattern>*</cluster-name-pattern></cluster></show></rpc>" \
+                -v "/rpc-reply/rpc/show/cluster/clusters/cluster/sync-complete[text()]")
+          cluster_sync_status=`echo ${cluster_sync_status} | xmllint -xpath "string(returnInfo/valueSearchResult)" -`
+          if [ "${cluster_sync_status}" != "true" ] && [ "${cluster_sync_status}" != "" ]; then
+            echo "$(date) INFO: ${APP}-DMR cluster is not in-sync"
+            rm -f ${FINAL_ACTIVITY_LOGGED_TRACKING_FILE}; exit 1
+          fi
+        fi
         # Pass readiness check
         if [ ! -f ${FINAL_ACTIVITY_LOGGED_TRACKING_FILE} ]; then
           echo "`date` INFO: ${APP}-Redundancy is up and node is Mate Active"