Troubleshooting.

Signed-off-by: AWSHurneyt <[email protected]>
AWSHurneyt · Oct 4, 2023 · 6406c5b · 6406c5b
1 parent 7fceb54
commit 6406c5b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/InputService.kt b/alerting/src/main/kotlin/org/opensearch/alerting/InputService.kt
@@ -121,20 +121,23 @@ class InputService(
                     }
                     is ClusterMetricsInput -> {
                         logger.debug("ClusterMetricsInput clusterMetricType: ${input.clusterMetricType}")
-
                         logger.info("hurneyt ClusterMetricsInput::clustersAliases = ${input.clusters}")
                         if (input.clusters.isNotEmpty()) {
+                            logger.info("hurneyt ClusterMetricsInput HAS REMOTE CLUSTERS")
                             client.threadPool().threadContext.stashContext().use {
                                 scope.launch {
+                                    val responseMap = mutableMapOf<String, Map<String, Any>>()
                                     input.clusters.forEach { cluster ->
                                         logger.info("hurneyt ClusterMetricsInput::cluster = $cluster")
                                         val targetClient = CrossClusterMonitorUtils.getClientForCluster(cluster, client, clusterService)
                                         val response = executeTransportAction(input, targetClient)
 
                                         // Not all supported API reference the cluster name in their response.
-                                        // Mapping each response to the cluster name.
-                                        results += mapOf(cluster to response.toMap())
+                                        // Mapping each response to the cluster name before adding to results.
+                                        // Not adding this same logic for local-only monitors to avoid breaking existing monitors.
+                                        responseMap[cluster] = response.toMap()
                                     }
+                                    results += responseMap
                                 }
                             }
                         } else {