test fix
This commit is contained in:
parent
54a5398413
commit
daedc4d7c7
1 changed files with 9 additions and 1 deletions
|
@ -9,6 +9,7 @@ import com.provectus.kafka.ui.model.Metrics;
|
||||||
import com.provectus.kafka.ui.model.ServerStatusDTO;
|
import com.provectus.kafka.ui.model.ServerStatusDTO;
|
||||||
import com.provectus.kafka.ui.model.Statistics;
|
import com.provectus.kafka.ui.model.Statistics;
|
||||||
import com.provectus.kafka.ui.service.metrics.MetricsCollector;
|
import com.provectus.kafka.ui.service.metrics.MetricsCollector;
|
||||||
|
import com.provectus.kafka.ui.service.metrics.v2.scrape.ScrapedClusterState;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
@ -44,7 +45,9 @@ public class StatisticsService {
|
||||||
getLogDirInfo(description, ac),
|
getLogDirInfo(description, ac),
|
||||||
featureService.getAvailableFeatures(ac, cluster, description),
|
featureService.getAvailableFeatures(ac, cluster, description),
|
||||||
loadTopicConfigs(cluster),
|
loadTopicConfigs(cluster),
|
||||||
describeTopics(cluster)),
|
describeTopics(cluster),
|
||||||
|
loadClusterState(ac)
|
||||||
|
),
|
||||||
results ->
|
results ->
|
||||||
Statistics.builder()
|
Statistics.builder()
|
||||||
.status(ServerStatusDTO.ONLINE)
|
.status(ServerStatusDTO.ONLINE)
|
||||||
|
@ -55,6 +58,7 @@ public class StatisticsService {
|
||||||
.features((List<ClusterFeature>) results[2])
|
.features((List<ClusterFeature>) results[2])
|
||||||
.topicConfigs((Map<String, List<ConfigEntry>>) results[3])
|
.topicConfigs((Map<String, List<ConfigEntry>>) results[3])
|
||||||
.topicDescriptions((Map<String, TopicDescription>) results[4])
|
.topicDescriptions((Map<String, TopicDescription>) results[4])
|
||||||
|
.clusterState((ScrapedClusterState) results[5])
|
||||||
.build()
|
.build()
|
||||||
))))
|
))))
|
||||||
.doOnError(e ->
|
.doOnError(e ->
|
||||||
|
@ -76,4 +80,8 @@ public class StatisticsService {
|
||||||
return adminClientService.get(c).flatMap(ReactiveAdminClient::getTopicsConfig);
|
return adminClientService.get(c).flatMap(ReactiveAdminClient::getTopicsConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Mono<ScrapedClusterState> loadClusterState(ReactiveAdminClient ac){
|
||||||
|
return ScrapedClusterState.scrape(ac);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue