Add dash and slash to the regexp of allowed characters in the pool_name parsing (#623)

Author: burmanm

CHANGELOG.md

@@ -11,6 +11,8 @@ Changelog for Management API, new PRs should update the `main / unreleased` sect
 
 ## unreleased
 
+* [BUGFIX] [#577](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/577) pool_name can include dashes and slashes.
+
 ## v0.1.100 [2-25-03-24]
 * [ENHANCEMENT] [#620](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/620) Update Dependnecies
 * [BUGFIX] [#438](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/438) Add Cassandra 5.1 Agent

management-api-agent-common/src/main/resources/default-metric-settings.yaml

@@ -34,7 +34,7 @@ relabels:
     sourceLabels:
       - __origname__
     targetLabel: pool_type
-  - regex: "org\\.apache\\.cassandra\\.metrics\\.ThreadPools\\.(\\w+)\\.(\\w+)\\.(\\w+).*"
+  - regex: "org\\.apache\\.cassandra\\.metrics\\.ThreadPools\\.(\\w+)\\.(\\w+)\\.([\\w-/]+).*"
     replacement: $3
     sourceLabels:
       - __origname__

management-api-agent-common/src/test/java/io/k8ssandra/metrics/builder/relabel/CassandraMetricsTest.java

@@ -68,6 +68,39 @@ public void smokeTest() {
     assertEquals("Path", threadPoolMetric.getLabelValues().get(0));
     assertEquals("ThreadPoolName", threadPoolMetric.getLabelValues().get(1));
 
+    // DSE TPC ThreadPool Metrics have dash or slash in the pool_name
+    CassandraMetricDefinition tpcThreadPoolMetric =
+        parser.parseDropwizardMetric(
+            "org.apache.cassandra.metrics.ThreadPools.MetricName.Path.Thread-Pool-Name",
+            "",
+            Lists.newArrayList(),
+            Lists.newArrayList());
+    assertEquals(
+        "org_apache_cassandra_metrics_thread_pools_metric_name",
+        tpcThreadPoolMetric.getMetricName());
+    assertEquals(2, tpcThreadPoolMetric.getLabelNames().size());
+    assertEquals(2, tpcThreadPoolMetric.getLabelValues().size());
+    assertEquals("pool_type", tpcThreadPoolMetric.getLabelNames().get(0));
+    assertEquals("pool_name", tpcThreadPoolMetric.getLabelNames().get(1));
+    assertEquals("Path", tpcThreadPoolMetric.getLabelValues().get(0));
+    assertEquals("Thread-Pool-Name", tpcThreadPoolMetric.getLabelValues().get(1));
+
+    CassandraMetricDefinition tpcThreadPoolMetricSlash =
+        parser.parseDropwizardMetric(
+            "org.apache.cassandra.metrics.ThreadPools.MetricName.Path.Thread/Pool/Name",
+            "",
+            Lists.newArrayList(),
+            Lists.newArrayList());
+    assertEquals(
+        "org_apache_cassandra_metrics_thread_pools_metric_name",
+        tpcThreadPoolMetricSlash.getMetricName());
+    assertEquals(2, tpcThreadPoolMetricSlash.getLabelNames().size());
+    assertEquals(2, tpcThreadPoolMetricSlash.getLabelValues().size());
+    assertEquals("pool_type", tpcThreadPoolMetricSlash.getLabelNames().get(0));
+    assertEquals("pool_name", tpcThreadPoolMetricSlash.getLabelNames().get(1));
+    assertEquals("Path", tpcThreadPoolMetricSlash.getLabelValues().get(0));
+    assertEquals("Thread/Pool/Name", tpcThreadPoolMetricSlash.getLabelValues().get(1));
+
     // Client Request Metrics
     CassandraMetricDefinition clientRequestMetric =
         parser.parseDropwizardMetric(