Skip to content

Commit 8a0857c

Browse files
committed
Add JMX username to cluster information
1 parent 00ca613 commit 8a0857c

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

src/server/src/main/java/io/cassandrareaper/resources/ClusterResource.java

+10
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,18 @@ public Response getCluster(
114114
.build();
115115

116116
} else {
117+
118+
final String jmxUsername;
119+
120+
if (context.jmxConnectionFactory.getJmxCredentialsForCluster(clusterName).isPresent()) {
121+
jmxUsername = context.jmxConnectionFactory.getJmxCredentialsForCluster(clusterName).get().getUsername();
122+
} else {
123+
jmxUsername = "";
124+
}
125+
117126
ClusterStatus clusterStatus = new ClusterStatus(
118127
cluster.get(),
128+
jmxUsername,
119129
context.storage.getClusterRunStatuses(cluster.get().getName(), limit.orElse(Integer.MAX_VALUE)),
120130
context.storage.getClusterScheduleStatuses(cluster.get().getName()),
121131
getNodesStatus(cluster).orElse(null));

src/server/src/main/java/io/cassandrareaper/resources/view/ClusterStatus.java

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public final class ClusterStatus {
2929
@JsonProperty
3030
public final String name;
3131

32+
@JsonProperty("jmx_username")
33+
public final String jmxUsername;
34+
3235
@JsonProperty("seed_hosts")
3336
public final Set<String> seedHosts;
3437

@@ -43,11 +46,13 @@ public final class ClusterStatus {
4346

4447
public ClusterStatus(
4548
Cluster cluster,
49+
String jmxUsername,
4650
Collection<RepairRunStatus> repairRuns,
4751
Collection<RepairScheduleStatus> repairSchedules,
4852
NodesStatus nodesStatus) {
4953

5054
this.name = cluster.getName();
55+
this.jmxUsername = jmxUsername;
5156
this.seedHosts = cluster.getSeedHosts();
5257
this.repairRuns = repairRuns;
5358
this.repairSchedules = repairSchedules;

0 commit comments

Comments
 (0)