Merge pull request #48 from Cray-HPE/CASMSMF-7120-update

Updated PR for CASMSMF-7120

.version

@@ -1 +1 @@
-2.24.0
+2.25.0

CHANGELOG.md

@@ -23,6 +23,11 @@ Removed - for now removed features
 Fixed - for any bug fixes
 Security - in case of vulnerabilities
 -->
+## [2.25.0] - 2023-01-19
+
+### Changed
+- CASMSMF-7120: Update for Cray Fabric Health Telemetry and Events to be sent to a common kafka topic cray-fabric-health instead of cray-fabric-health-events and cray-fabric-health-telemetry.
+
 ## [2.24.0] - 2023-01-10
 
 ### Added

cmd/hmcollector/rest.go

@@ -206,9 +206,7 @@ func parseRequest(w http.ResponseWriter, r *http.Request) {
 			strings.HasPrefix(event.MessageId, "CrayFabricCriticalTelemetry") {
 			writeToKafka("cray-fabric-crit-telemetry", eventsString, &kafkaMessageKey)
 		} else if strings.HasPrefix(event.MessageId, "CrayFabricHealth") {
-			writeToKafka("cray-fabric-health-events", eventsString, &kafkaMessageKey)
-                } else if strings.HasPrefix(event.MessageId, "CrayAlerts") {
-			writeToKafka("cray-fabric-health-telemetry", eventsString, &kafkaMessageKey)
+			writeToKafka("cray-fabric-health", eventsString, &kafkaMessageKey)
 		} else {
 			// If we get to this point then we don't have a specific topic this should go on,
 			// dump it on the generic one.