include cluster spec names in prometheus snapshots metadata

Change-Id: If6121153f820b1480bd7e2f074a1b9080b128f8a
Reviewed-on: https://review.couchbase.org/c/perfrunner/+/245390
Reviewed-by: Salim Salim <salim.salim@couchbase.com>
Reviewed-by: Daniel Nagy <daniel.nagy@couchbase.com>
Tested-by: Build Bot <build@couchbase.com>

Author: m-tarhon

perfrunner/helpers/cluster.py

@@ -262,6 +262,10 @@ def rename(self):
             for server in self.cluster_spec.servers:
                 self.rest.rename(server)
 
+        for cluster_spec_name, servers in self.cluster_spec.clusters:
+            renamed_cluster = self.cluster_spec.cbmonitor_snapshot_cluster_name(cluster_spec_name)
+            self.rest.set_cluster_name(servers[0], renamed_cluster)
+
     def set_auth(self):
         for server in self.cluster_spec.servers:
             self.rest.set_auth(server)

perfrunner/helpers/rest.py

@@ -182,6 +182,13 @@ def set_auth(self, host: str):
         data = {"username": self.rest_username, "password": self.rest_password, "port": "SAME"}
         self.post(url=api, data=data)
 
+    def set_cluster_name(self, host: str, cluster_name: str):
+        logger.info(f"Configuring cluster object name on {host}: {cluster_name}")
+
+        api = self._get_api_url(host=host, path="pools/default")
+        data = {"clusterName": cluster_name}
+        self.post(url=api, data=data)
+
     def rename(self, host: str, new_host: str = None):
         new_host = new_host or host
         logger.info(f"Changing server name: {host} -> {new_host}")

perfrunner/settings.py

@@ -761,6 +761,13 @@ def parameters(self) -> dict:
         with ClusterMetadataFile(self.csp) as metadata_file:
             return metadata_file.get_parameters(cluster_name, overrides)
 
+    def cbmonitor_snapshot_cluster_name(self, cluster_spec_name: str) -> str:
+        """Build a stable cluster name for cbmonitor snapshot metadata.
+
+        Uses the parsed spec filename stem and the cluster section key.
+        """
+        return f"{self.name}_{cluster_spec_name}"
+
     @property
     def capella_cluster_ids(self) -> list[str]:
         return [

perfrunner/tests/__init__.py

@@ -114,9 +114,10 @@ def init_metrics_and_collector_agent(self):
         logger.info("Using Prometheus to collect metrics")
         self.collector_agent = PrometheusAgent(self.cluster_spec, self.stats_settings, self.rest)
         self.cbmonitor_snapshots.append(self.collector_agent.snapshot_id)
-        self.cbmonitor_clusters.append(
-            self.cluster_spec.name
-        )  # We dont use this when using Prometheus, just here for compatibility with the old store
+        for cluster_name, _ in self.cluster_spec.clusters:
+            self.cbmonitor_clusters.append(
+                self.cluster_spec.cbmonitor_snapshot_cluster_name(cluster_name)
+            )
 
         self.metrics = PrometheusMetricsHelper(self)