Sanitise cluster and host names going into metric names.

 ref: Convert cluster names for Graphite ingestion #385 – #385

Author: michaelsembwever

src/server/src/main/java/io/cassandrareaper/jmx/JmxProxyImpl.java

@@ -1075,18 +1075,25 @@ public String getColumnFamily() {
 
   private void registerConnectionsGauge() {
     try {
-      if (!this.metricRegistry
+      if (!metricRegistry
           .getGauges()
           .containsKey(
               MetricRegistry.name(
-                  JmxProxyImpl.class, this.clusterName, this.host, "repairStatusHandlers"))) {
-        this.metricRegistry.register(
+                  JmxProxyImpl.class,
+                  clusterName.replace('.', '-'),
+                  host.replace('.', '-'),
+                  "repairStatusHandlers"))) {
+
+        metricRegistry.register(
             MetricRegistry.name(
-                JmxProxyImpl.class, this.clusterName, this.host, "repairStatusHandlers"),
-            (Gauge<Integer>) () -> this.repairStatusHandlers.size());
+                JmxProxyImpl.class,
+                clusterName.replace('.', '-'),
+                host.replace('.', '-'),
+                "repairStatusHandlers"),
+            (Gauge<Integer>) () -> repairStatusHandlers.size());
       }
     } catch (IllegalArgumentException e) {
-      LOG.warn("Cannot create connection gauge for node {}", this.host, e);
+      LOG.warn("Cannot create connection gauge for node {}", host, e);
     }
   }
 

src/server/src/main/java/io/cassandrareaper/service/Heart.java

@@ -115,12 +115,16 @@ private void updateRequestedNodeMetrics() {
                       .forEach(req -> {
 
                         LOG.info("Got metric request for node {} in {}", req.getNode(), req.getCluster());
-                        try (Timer.Context t1 = timer(context, req.getCluster(), req.getNode())) {
+                        try (Timer.Context t1 = timer(
+                            context,
+                            req.getCluster().replace('.', '-'),
+                            req.getNode().replace('.', '-'))) {
+
                           try {
                             JmxProxy nodeProxy
                                 = context.jmxConnectionFactory.connect(
                                    Node.builder().withClusterName(req.getCluster()).withHostname(req.getNode()).build(),
-                                  jmxTimeoutSeconds);
+                                   jmxTimeoutSeconds);
 
                             storage.storeNodeMetrics(
                                 runId,

src/server/src/main/java/io/cassandrareaper/service/SegmentRunner.java

@@ -172,7 +172,12 @@ private static void postpone(
   static void abort(AppContext context, RepairSegment segment, JmxProxy jmxConnection) {
     postpone(context, segment, context.storage.getRepairUnit(segment.getRepairUnitId()));
     LOG.info("Aborting repair on segment with id {} on coordinator {}", segment.getId(), segment.getCoordinatorHost());
-    String metric = MetricRegistry.name(SegmentRunner.class, "abort", segment.getCoordinatorHost());
+
+    String metric = MetricRegistry.name(
+        SegmentRunner.class,
+        "abort",
+        Optional.fromNullable(segment.getCoordinatorHost()).or("null").replace('.', '-'));
+
     context.metricRegistry.counter(metric).inc();
     jmxConnection.cancelAllRepairs();
   }