[nifi] branch main updated: NIFI-9543: Add bring-to-front functionality to labels (#5765)
This is an automated email from the ASF dual-hosted git repository. mcgilman pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 6cd30e3 NIFI-9543: Add bring-to-front functionality to labels (#5765) 6cd30e3 is described below commit 6cd30e3d0aa6e7f8763afc7c4cb007b32273 Author: Shane Ardell AuthorDate: Thu Mar 3 18:50:15 2022 -0500 NIFI-9543: Add bring-to-front functionality to labels (#5765) * NIFI-9543: add bring-to-front functionality to labels * NIFI-9543: update zIndex changes to persist after shutdown * NIFI-9543: remove commented code * NIFI-9543: update flow comparator and snippet to account for zIndex * NIFI-9543: changed add function to sort labels when a new label is added * NIFI-9543: remove unnecessary call to position * NIFI-9543: only register difference if zIndex is not default value * NIFI-9543: add null checks to prevent primitive Long This closes #5765 --- .../java/org/apache/nifi/flow/VersionedLabel.java | 12 .../java/org/apache/nifi/web/api/dto/LabelDTO.java | 15 .../apache/nifi/web/api/entity/LabelEntity.java| 16 + .../nifi/connectable/StandardConnection.java | 3 +- .../nifi/controller/label/StandardLabel.java | 13 .../groups/StandardProcessGroupSynchronizer.java | 4 ++ .../flow/mapping/NiFiRegistryFlowMapper.java | 1 + .../apache/nifi/util/FlowDifferenceFilters.java| 56 ++- .../org/apache/nifi/controller/label/Label.java| 4 ++ .../nifi/controller/StandardFlowSnippet.java | 8 +++ .../nifi/controller/XmlFlowSynchronizer.java | 7 ++ .../serialization/FlowFromDOMFactory.java | 1 + .../serialization/StandardFlowSerializer.java | 1 + .../org/apache/nifi/web/api/dto/DtoFactory.java| 2 + .../org/apache/nifi/web/api/dto/EntityFactory.java | 1 + .../apache/nifi/web/dao/impl/StandardLabelDAO.java | 6 ++ .../src/main/webapp/js/nf/canvas/nf-actions.js | 81 -- .../main/webapp/js/nf/canvas/nf-context-menu.js| 2 +- .../src/main/webapp/js/nf/canvas/nf-label.js | 18 - .../nifi/registry/flow/diff/DifferenceType.java| 5 ++ .../registry/flow/diff/StandardFlowComparator.java | 2 + 21 files changed, 214 insertions(+), 44 deletions(-) diff --git a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedLabel.java b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedLabel.java index 61e7ebb..0020309 100644 --- a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedLabel.java +++ b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedLabel.java @@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty; public class VersionedLabel extends VersionedComponent { private String label; +private Long zIndex; private Double width; private Double height; @@ -66,6 +67,17 @@ public class VersionedLabel extends VersionedComponent { this.width = width; } +@ApiModelProperty( +value = "The z index of the connection.", +name = "zIndex") // Jackson maps this method name to JSON key "zIndex", but Swagger does not by default +public Long getzIndex() { +return zIndex; +} + +public void setzIndex(Long zIndex) { +this.zIndex = zIndex; +} + @Override public ComponentType getComponentType() { return ComponentType.LABEL; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java index 81c6e39..27421ce 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java @@ -31,6 +31,7 @@ public class LabelDTO extends ComponentDTO { private Double width; private Double height; +private Long zIndex; // font-size = 12px // background-color = #eee @@ -40,6 +41,20 @@ public class LabelDTO extends ComponentDTO { } /** + * @return z index for this label + */ +@ApiModelProperty( +value = "The z index of the label." +) +public Long getzIndex() { +return zIndex; +} + +public void setzIndex(Long zIndex) { +this.zIndex = zIndex; +} + +/** * The text that appears in the label. * * @return The label text diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/LabelEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/
[nifi] branch main updated (c91f543 -> 6f5fda5)
This is an automated email from the ASF dual-hosted git repository. mtien pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git. from c91f543 NIFI-9425: Added auto-load NAR capability to MiNiFi add 6f5fda5 [NIFI-9746] NiFi Registy Bucket Side Nav no longer fails to open (#5831) No new revisions were added by this update. Summary of changes: .../administration/users/dialogs/add-user/nf-registry-add-user.js | 2 +- .../users/dialogs/create-new-group/nf-registry-create-new-group.js | 2 +- .../add-policy-to-bucket/nf-registry-add-policy-to-bucket.js| 6 +++--- .../workflow/dialogs/create-bucket/nf-registry-create-bucket.js | 4 ++-- .../dialogs/edit-bucket-policy/nf-registry-edit-bucket-policy.js| 6 +++--- .../nifi-registry-web-ui/src/main/webapp/nf-registry.js | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)
[nifi] branch main updated (d2e90dd -> c91f543)
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git. from d2e90dd NIFI-9751 - Poll as needed during system-tests to ensure expected state add c91f543 NIFI-9425: Added auto-load NAR capability to MiNiFi No new revisions were added by this update. Summary of changes: .../main/assembly/dependencies-windows-service.xml | 9 + .../src/main/assembly/dependencies.xml | 9 + .../minifi/bootstrap/util/ConfigTransformer.java | 1 + .../minifi-framework-nar/pom.xml | 32 +-- .../minifi-framework/minifi-framework-core/pom.xml | 5 --- .../main/java/org/apache/nifi/minifi/MiNiFi.java | 2 +- .../minifi-framework/minifi-server/pom.xml | 15 .../apache/nifi/minifi/StandardMiNiFiServer.java | 6 ++- .../minifi-server-nar/pom.xml | 15 .../minifi-framework-bundle/pom.xml| 5 +++ .../java/org/apache/nifi/nar/NarAutoLoader.java| 12 -- .../apache/nifi/headless/HeadlessNiFiServer.java | 45 +++--- 12 files changed, 129 insertions(+), 27 deletions(-)
[nifi] branch main updated (7a16619 -> d2e90dd)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git. from 7a16619 [NIFI-9690] Display icon on Connection Label to show when head of the queue is penalized (#5812) add d2e90dd NIFI-9751 - Poll as needed during system-tests to ensure expected state No new revisions were added by this update. Summary of changes: .../apache/nifi/tests/system/NiFiClientUtil.java | 6 +-- .../org/apache/nifi/tests/system/NiFiSystemIT.java | 19 ++-- .../SpawnedStandaloneNiFiInstanceFactory.java | 3 +- .../system/clustering/FlowSynchronizationIT.java | 50 -- .../nifi/tests/system/clustering/OffloadIT.java| 21 - .../tests/system/loadbalance/LoadBalanceIT.java| 27 +++- ...usteredVerifiableControllerServiceSystemIT.java | 2 +- .../ClusteredVerifiableProcessorSystemIT.java | 2 +- .../ClusteredVerifiableReportingTaskSystemIT.java | 2 +- .../VerifiableReportingTaskSystemIT.java | 2 +- .../resources/conf/clustered/node1/logback.xml | 8 ++-- .../resources/conf/clustered/node1/nifi.properties | 3 +- .../resources/conf/clustered/node2/logback.xml | 8 ++-- .../resources/conf/clustered/node2/nifi.properties | 3 +- .../test/resources/conf/default/nifi.properties| 3 +- .../src/test/resources/simplelogger.properties | 2 + 16 files changed, 81 insertions(+), 80 deletions(-) create mode 100644 nifi-system-tests/nifi-system-test-suite/src/test/resources/simplelogger.properties
[nifi-minifi-cpp] branch main updated: MINIFICPP-1734 Add integration test for Kubernetes log collection
This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git The following commit(s) were added to refs/heads/main by this push: new f811c79 MINIFICPP-1734 Add integration test for Kubernetes log collection f811c79 is described below commit f811c79c5b6df20ecb5eb2cbdf0f1ad2c77df328 Author: Ferenc Gerlits AuthorDate: Thu Mar 3 16:44:55 2022 +0100 MINIFICPP-1734 Add integration test for Kubernetes log collection Signed-off-by: Adam Debreceni This closes #1270 --- .github/workflows/ci.yml | 2 +- cmake/DockerConfig.cmake | 1 + docker/Dockerfile | 3 + .../test/integration/features/kubernetes.feature | 58 ++ .../controllers/KubernetesControllerService.py | 28 + docker/test/integration/minifi/core/Container.py | 21 .../integration/minifi/core/DockerTestCluster.py | 26 + docker/test/integration/minifi/core/ImageStore.py | 27 + docker/test/integration/minifi/core/KindProxy.py | 124 + docker/test/integration/minifi/core/LogSource.py | 19 .../minifi/core/MinifiAsPodInKubernetesCluster.py | 59 ++ .../integration/minifi/core/MinifiContainer.py | 20 +++- .../minifi/core/SingleNodeDockerCluster.py | 19 .../kubernetes/minifi-conf/minifi-log.properties | 3 + .../kubernetes/pods-etc/daemon.namespace.yml | 6 + .../kubernetes/pods-etc/hello-world-one.pod.yml| 12 ++ .../kubernetes/pods-etc/hello-world-two.pod.yml| 12 ++ .../kubernetes/pods-etc/log-collector.pod.yml | 29 + .../pods-etc/namespace-reader.clusterrole.yml | 9 ++ .../namespace-reader.clusterrolebinding.yml| 12 ++ .../kubernetes/pods-etc/pod-reader.clusterrole.yml | 9 ++ .../pods-etc/pod-reader.clusterrolebinding.yml | 12 ++ docker/test/integration/steps/steps.py | 105 +++-- 23 files changed, 581 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60628c6..1c2e75e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -202,7 +202,7 @@ jobs: if [ -d ~/.ccache ]; then mv ~/.ccache .; fi mkdir build cd build - cmake -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT -DENABLE_JNI=OFF -DDISABLE_JEMALLOC=ON -DENABLE_AWS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_AZURE=ON -DENABLE_SQL=ON -DENABLE_SPLUNK=ON -DENABLE_OPC=ON -DENABLE_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DDOCKER_BUILD_ONLY=ON -DDOCKER_CCACHE_DUMP_LOCATION=$HOME/.ccache .. + cmake -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT -DENABLE_JNI=OFF -DDISABLE_JEMALLOC=ON -DENABLE_AWS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_AZURE=ON -DENABLE_SQL=ON -DENABLE_SPLUNK=ON -DENABLE_OPC=ON -DENABLE_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DDOCKER_BUILD_ONLY=ON -DDOCKER_CCACHE_DUMP_LOCATION=$HOME/.ccache .. make docker - id: install_deps run: | diff --git a/cmake/DockerConfig.cmake b/cmake/DockerConfig.cmake index dd05f65..226439f 100644 --- a/cmake/DockerConfig.cmake +++ b/cmake/DockerConfig.cmake @@ -47,6 +47,7 @@ add_custom_target( -c ENABLE_SPLUNK=${ENABLE_SPLUNK} -c ENABLE_SCRIPTING=${ENABLE_SCRIPTING} -c ENABLE_LUA_SCRIPTING=${ENABLE_LUA_SCRIPTING} +-c ENABLE_KUBERNETES=${ENABLE_KUBERNETES} -c DISABLE_CURL=${DISABLE_CURL} -c DISABLE_JEMALLOC=${DISABLE_JEMALLOC} -c DISABLE_CIVET=${DISABLE_CIVET} diff --git a/docker/Dockerfile b/docker/Dockerfile index 9a8f2e1..3ec9856 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -62,6 +62,7 @@ ARG DISABLE_BZIP2=OFF ARG ENABLE_SCRIPTING=OFF ARG DISABLE_PYTHON_SCRIPTING= ARG ENABLE_LUA_SCRIPTING= +ARG ENABLE_KUBERNETES=OFF ARG DISABLE_CONTROLLER=OFF ARG CMAKE_BUILD_TYPE=Release @@ -121,6 +122,7 @@ RUN cmake -DSTATIC_BUILD= -DSKIP_TESTS=true -DENABLE_ALL="${ENABLE_ALL}" -DENABL -DDISABLE_EXPRESSION_LANGUAGE="${DISABLE_EXPRESSION_LANGUAGE}" -DDISABLE_ROCKSDB="${DISABLE_ROCKSDB}" \ -DDISABLE_LIBARCHIVE="${DISABLE_LIBARCHIVE}" -DDISABLE_LZMA="${DISABLE_LZMA}" -DDISABLE_BZIP2="${DISABLE_BZIP2}" \ -DENABLE_SCRIPTING="${ENABLE_SCRIPTING}" -DDISABLE_PYTHON_SCRIPTING="${DISABLE_PYTHON_SCRIPTING}" -DENABLE_LUA_SCRIPTING="${ENABLE_LUA_SCRIPTING}" \ +-DENABLE_KUBERNETES="${ENABLE_KUBERNETES}" \ -DDISABLE_CONTROLLER="${DISABLE_CONTROLLER}" -DENABLE_ENCRYPT_CONFIG="${ENABLE_ENCRYPT_CONFIG}" -DAWS_ENABLE_UNITY_BUILD=OFF -DEXCLUDE_BOOST=ON -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \ make -j "$(nproc)" package && \ tar -xzvf "${MINIFI_BASE_DIR}/build/nifi-minifi-cpp-${MINIFI_VERSION}.tar.gz" -C "${MINIFI_BASE_DIR}" @@ -144,6 +146,7 @@ ARG ENABLE_BUSTAC
[nifi] branch main updated: [NIFI-9690] Display icon on Connection Label to show when head of the queue is penalized (#5812)
This is an automated email from the ASF dual-hosted git repository. mcgilman pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 7a16619 [NIFI-9690] Display icon on Connection Label to show when head of the queue is penalized (#5812) 7a16619 is described below commit 7a16619969a90655b5aed6bf938fa0a3019ab673 Author: Adam Kocsis AuthorDate: Thu Mar 3 15:13:00 2022 +0100 [NIFI-9690] Display icon on Connection Label to show when head of the queue is penalized (#5812) This closes #5812 --- .../nifi-web-ui/src/main/webapp/css/graph.css | 2 +- .../src/main/webapp/js/nf/canvas/nf-connection.js | 35 ++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css index f47771b..89dbc5c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css @@ -320,7 +320,7 @@ g.connection path.connection-path.unauthorized { stroke-dasharray: 3,3; } -text.connection-from-run-status, text.connection-to-run-status, text.expiration-icon, text.load-balance-icon { +text.connection-from-run-status, text.connection-to-run-status, text.expiration-icon, text.load-balance-icon, text.penalized-icon { fill: #728e9b; font-family: FontAwesome; font-size: 12px; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js index 454252b..ad1b086 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js @@ -1637,6 +1637,41 @@ return; } +// penalized icon +var connectionLabelContainer = updated.select('g.connection-label-container'); +if (connectionLabelContainer.select('text.penalized-icon').empty()) { +connectionLabelContainer.select('g.queued-container') +.append('text') +.attrs({ +'class': 'penalized-icon', +'y': 14 +}) +.text(function () { +return '\uf252'; +}) +.append('title'); +} + +// determine whether or not to show the penalized icon +connectionLabelContainer.select('text.penalized-icon') +.classed('hidden', function (d) { +var flowFileAvailability = _.get(d, 'status.aggregateSnapshot.flowFileAvailability', null) +return flowFileAvailability !== 'HEAD_OF_QUEUE_PENALIZED'; +}) +.attr('x', function () { +var offset = 0; +if (!connectionLabelContainer.select('text.expiration-icon').classed('hidden')) { +offset += 16; +} +if (!connectionLabelContainer.select('text.load-balance-icon').classed('hidden')) { +offset += 16; +} +return 208 - offset; +}) +.select('title').text(function () { +return 'A FlowFile is currently penalized and data cannot be processed at this time.'; +}); + // update data size var dataSizeDeferred = $.Deferred(function (deferred) { // queued count value