Add new telemetry IDs from sCs and nCs (#51)

Cray-HPE · Sep 14, 2023 · 0535b6f · 0535b6f
1 parent f5c6c5b
commit 0535b6f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.25.0
+2.25.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,11 @@ Removed - for now removed features
 Fixed - for any bug fixes
 Security - in case of vulnerabilities
 -->
+## [2.25.1] - 2023-09-14
+
+### Added
+- CASMHMS-5831 - Handle new telemetry IDs from Olympus nCs and cCs
+
 ## [2.25.0] - 2023-01-19
 
 ### Changed

diff --git a/cmd/hmcollector/rest.go b/cmd/hmcollector/rest.go
@@ -1,6 +1,6 @@
 // MIT License
 //
-// (C) Copyright [2020-2022] Hewlett Packard Enterprise Development LP
+// (C) Copyright [2020-2023] Hewlett Packard Enterprise Development LP
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -194,6 +194,14 @@ func parseRequest(w http.ResponseWriter, r *http.Request) {
  writeToKafka("cray-telemetry-liquidflow", eventsString, &kafkaMessageKey)
  } else if strings.HasSuffix(event.MessageId, "Humidity") {
  writeToKafka("cray-telemetry-humidity", eventsString, &kafkaMessageKey)
+ } else if strings.HasSuffix(event.MessageId, "Metric") {
+ writeToKafka("cray-telemetry-metric", eventsString, &kafkaMessageKey)
+ } else if strings.HasSuffix(event.MessageId, "PowerFactor") {
+ writeToKafka("cray-telemetry-powerfactor", eventsString, &kafkaMessageKey)
+ } else if strings.HasSuffix(event.MessageId, "Frequency") {
+ writeToKafka("cray-telemetry-frequency", eventsString, &kafkaMessageKey)
+ } else if strings.HasSuffix(event.MessageId, "Percent") {
+ writeToKafka("cray-telemetry-percent", eventsString, &kafkaMessageKey)
  } else {
  logger.Error("Event MessageId has registry prefix CrayTelemetry, but the SensorType is unknown!",
  zap.Any("event", event))

diff --git a/configs/kafka_brokers-local.json b/configs/kafka_brokers-local.json
@@ -8,6 +8,10 @@
  "cray-telemetry-energy": null,
  "cray-telemetry-fan": null,
  "cray-telemetry-pressure": null,
+ "cray-telemetry-metric": null,
+ "cray-telemetry-powerfactor": null,
+ "cray-telemetry-frequency": null,
+ "cray-telemetry-percent": null,
  "cray-fabric-telemetry": null,
  "cray-fabric-perf-telemetry": null,
  "cray-fabric-crit-telemetry": null,

diff --git a/configs/kafka_brokers-local_dual.json b/configs/kafka_brokers-local_dual.json
@@ -8,6 +8,10 @@
  "cray-telemetry-energy": null,
  "cray-telemetry-fan": null,
  "cray-telemetry-pressure": null,
+ "cray-telemetry-metric": null,
+ "cray-telemetry-powerfactor": null,
+ "cray-telemetry-frequency": null,
+ "cray-telemetry-percent": null,
  "cray-fabric-telemetry": null,
  "cray-fabric-perf-telemetry": null,
  "cray-fabric-crit-telemetry": null,
@@ -23,6 +27,10 @@
  "cray-telemetry-energy": null,
  "cray-telemetry-fan": null,
  "cray-telemetry-pressure": null,
+ "cray-telemetry-metric": null,
+ "cray-telemetry-powerfactor": null,
+ "cray-telemetry-frequency": null,
+ "cray-telemetry-percent": null,
  "cray-fabric-telemetry": null,
  "cray-fabric-perf-telemetry": null,
  "cray-fabric-crit-telemetry": null,