Skip to content

NIFI-16456 Include nested Process Groups in MiNiFi C2 heartbeat flow info #11807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vinz2168 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NIFI-16456 Include nested Process Groups in MiNiFi C2 heartbeat flow info #11807

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions ...rk/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/C2NifiClientService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import org.apache.nifi.c2.serializer.C2Serializer;
import org.apache.nifi.controller.FlowController;
import org.apache.nifi.controller.Triggerable;
import org.apache.nifi.controller.status.ProcessGroupStatus;
import org.apache.nifi.diagnostics.SystemDiagnostics;
import org.apache.nifi.extension.manifest.parser.jaxb.JAXBExtensionManifestParser;
import org.apache.nifi.groups.ProcessGroup;
Expand Down Expand Up @@ -97,6 +98,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Supplier;
import java.util.stream.Stream;

import static java.lang.Boolean.parseBoolean;
import static java.lang.Integer.parseInt;
Expand Down Expand Up @@ -356,10 +358,8 @@ private AgentRepositories getAgentRepositories() {
}

private Map<String, FlowQueueStatus> getQueueStatus() {
return flowController.getEventAccess()
.getGroupStatus(ROOT_GROUP_ID)
.getConnectionStatus()
.stream()
return getAllGroupStatuses()
.flatMap(groupStatus -> groupStatus.getConnectionStatus().stream())
.map(connectionStatus -> {
FlowQueueStatus flowQueueStatus = new FlowQueueStatus();
flowQueueStatus.setSize((long) connectionStatus.getQueuedCount());
Expand All @@ -373,12 +373,8 @@ private Map<String, FlowQueueStatus> getQueueStatus() {

private List<ProcessorBulletin> getBulletins(int processorBulletinLimit) {
if (processorBulletinLimit > 0) {
String groupId = flowController.getEventAccess()
.getGroupStatus(ROOT_GROUP_ID)
.getId();
BulletinQuery query = new BulletinQuery.Builder()
.sourceType(ComponentType.PROCESSOR)
.groupIdMatches(groupId)
.limit(processorBulletinLimit)
.build();

Expand Down Expand Up @@ -407,16 +403,24 @@ private List<ProcessorBulletin> getBulletins(int processorBulletinLimit) {

private List<ProcessorStatus> getProcessorStatus(boolean processorStatusEnabled) {
if (processorStatusEnabled) {
return flowController.getEventAccess()
.getGroupStatus(ROOT_GROUP_ID)
.getProcessorStatus()
.stream()
return getAllGroupStatuses()
.flatMap(groupStatus -> groupStatus.getProcessorStatus().stream())
.map(this::convertProcessorStatus)
.toList();
}
return null;
}

private Stream<ProcessGroupStatus> getAllGroupStatuses() {
return flattenGroupStatus(flowController.getEventAccess().getGroupStatus(ROOT_GROUP_ID));
}

private Stream<ProcessGroupStatus> flattenGroupStatus(ProcessGroupStatus groupStatus) {
return Stream.concat(
Stream.of(groupStatus),
groupStatus.getProcessGroupStatus().stream().flatMap(this::flattenGroupStatus));
}

private ProcessorStatus convertProcessorStatus(org.apache.nifi.controller.status.ProcessorStatus processorStatus) {
ProcessorStatus result = new ProcessorStatus();
result.setId(processorStatus.getId());
Expand Down
Loading