(nifi) branch main updated: NIFI-13337: (#8915)
This is an automated email from the ASF dual-hosted git repository.
scottyaslan 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 e142341ceb NIFI-13337: (#8915)
e142341ceb is described below
commit e142341ceb46d2d7a0b6e91bffeff0630f5ee91b
Author: Matt Gilman
AuthorDate: Mon Jun 3 20:30:21 2024 -0400
NIFI-13337: (#8915)
- Adjust column widths of the queue listing table.
---
.../flowfile-table/flowfile-table.component.scss | 12
1 file changed, 12 insertions(+)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.scss
index c8f1a75870..2fdf010f56 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.scss
@@ -18,9 +18,21 @@
.flowfile-table {
.listing-table {
table {
+.mat-column-position {
+width: 100px;
+}
+
.mat-column-flowFileUuid {
width: 25%;
}
+
+.mat-column-fileName {
+width: 25%;
+}
+
+.mat-column-penalized {
+width: 100px;
+}
}
}
}
(nifi) branch main updated: NIFI-13352 Adjusted Shutdown handling in ListenOTLP and Test Class This closes #8913
This is an automated email from the ASF dual-hosted git repository.
joewitt 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 ab2cea4c22 NIFI-13352 Adjusted Shutdown handling in ListenOTLP and
Test Class This closes #8913
ab2cea4c22 is described below
commit ab2cea4c229f71ff9c967cb36e70328b3027fa57
Author: exceptionfactory
AuthorDate: Mon Jun 3 16:10:23 2024 -0500
NIFI-13352 Adjusted Shutdown handling in ListenOTLP and Test Class
This closes #8913
- Added quick duration for shutdown quiet period in ListenOTLP
HttpServerFactory
- Added TestRunner.stop() to ListenOTLPTest to close listening sockets
- Increased Connect Timeout from 5 to 10 seconds in ListenOTLPTest
Signed-off-by: Joseph Witt
---
.../nifi/processors/opentelemetry/server/HttpServerFactory.java | 5 +
.../org/apache/nifi/processors/opentelemetry/ListenOTLPTest.java | 8 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git
a/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/src/main/java/org/apache/nifi/processors/opentelemetry/server/HttpServerFactory.java
b/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/src/main/java/org/apache/nifi/processors/opentelemetry/server/HttpServerFactory.java
index 48ef1f97db..3cf206eb97 100644
---
a/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/src/main/java/org/apache/nifi/processors/opentelemetry/server/HttpServerFactory.java
+++
b/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/src/main/java/org/apache/nifi/processors/opentelemetry/server/HttpServerFactory.java
@@ -20,6 +20,8 @@ import com.google.protobuf.Message;
import io.netty.handler.codec.http2.Http2SecurityUtil;
import io.netty.handler.ssl.ApplicationProtocolNames;
import io.netty.handler.ssl.SupportedCipherSuiteFilter;
+import org.apache.nifi.event.transport.configuration.ShutdownQuietPeriod;
+import org.apache.nifi.event.transport.configuration.ShutdownTimeout;
import org.apache.nifi.event.transport.configuration.TransportProtocol;
import org.apache.nifi.event.transport.netty.NettyEventServerFactory;
import
org.apache.nifi.event.transport.netty.channel.LogExceptionChannelHandler;
@@ -55,6 +57,9 @@ public class HttpServerFactory extends
NettyEventServerFactory {
new HttpProtocolNegotiationHandler(log, messages),
logExceptionChannelHandler
));
+
+setShutdownQuietPeriod(ShutdownQuietPeriod.QUICK.getDuration());
+setShutdownTimeout(ShutdownTimeout.QUICK.getDuration());
}
private SSLParameters getApplicationSslParameters(final SSLContext
sslContext) {
diff --git
a/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/src/test/java/org/apache/nifi/processors/opentelemetry/ListenOTLPTest.java
b/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/src/test/java/org/apache/nifi/processors/opentelemetry/ListenOTLPTest.java
index cdee2ef8fc..15cdb560aa 100644
---
a/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/src/test/java/org/apache/nifi/processors/opentelemetry/ListenOTLPTest.java
+++
b/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/src/test/java/org/apache/nifi/processors/opentelemetry/ListenOTLPTest.java
@@ -45,6 +45,7 @@ import org.apache.nifi.web.client.api.HttpResponseEntity;
import org.apache.nifi.web.client.api.HttpResponseStatus;
import org.apache.nifi.web.client.api.WebClientService;
import org.apache.nifi.web.client.ssl.TlsContext;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -125,7 +126,7 @@ class ListenOTLPTest {
private static final byte[] EMPTY_BYTES = new byte[]{};
-private static final Duration CONNECT_TIMEOUT = Duration.ofSeconds(5);
+private static final Duration CONNECT_TIMEOUT = Duration.ofSeconds(10);
private static final Duration READ_TIMEOUT = Duration.ofSeconds(5);
@@ -205,6 +206,11 @@ class ListenOTLPTest {
webClientService = standardWebClientService;
}
+@AfterEach
+void stopRunner() {
+runner.stop();
+}
+
@Test
void testRequiredProperties() throws InitializationException {
runner.assertNotValid();
(nifi) branch main updated (210e0b1655 -> b768b23e0f)
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 210e0b1655 NIFI-13350: (#8912) add b768b23e0f NIFI-13138 Add Bundle extensions name and description in NiFi Registry No new revisions were added by this update. Summary of changes: .../registry/nf-registry-grid-list-viewer.html | 73 ++ .../src/main/webapp/services/nf-registry.api.js| 25 .../main/webapp/services/nf-registry.service.js| 21 +++ .../explorer/grid-list/_structureElements.scss | 2 +- 4 files changed, 109 insertions(+), 12 deletions(-)
(nifi) branch main updated (5e3f1dbaf6 -> 210e0b1655)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 5e3f1dbaf6 Update BinFiles not to write attributes to FlowFiles for auto-terminated ORIGINAL relationship add 210e0b1655 NIFI-13350: (#8912) No new revisions were added by this update. Summary of changes: .../manager/process-group-manager.service.ts | 15 -- .../controller-services.effects.ts | 5 .../pages/flow-designer/state/flow/flow.effects.ts | 5 .../parameter-context-listing.effects.ts | 32 ++ .../edit-parameter-context.component.ts| 3 +- .../nifi/src/app/service/nifi-common.service.ts| 6 ++-- 6 files changed, 60 insertions(+), 6 deletions(-)
(nifi) branch main updated (f9aefc2d5e -> 5e3f1dbaf6)
This is an automated email from the ASF dual-hosted git repository. mattyb149 pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from f9aefc2d5e NIFI-11078: Adds Component UUID to Flow Configuration History Table (#8909) add 5e3f1dbaf6 Update BinFiles not to write attributes to FlowFiles for auto-terminated ORIGINAL relationship No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java| 4 +++- .../main/java/org/apache/nifi/processors/standard/JoinEnrichment.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
(nifi) branch main updated (34c24f759a -> f9aefc2d5e)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 34c24f759a NIFI-13342 restored sts dependency in aws service api add f9aefc2d5e NIFI-11078: Adds Component UUID to Flow Configuration History Table (#8909) No new revisions were added by this update. Summary of changes: .../flow-configuration-history-table.component.html | 15 ++- .../flow-configuration-history-table.component.ts | 17 +++-- .../src/main/webapp/js/nf/history/nf-history-table.js | 8 3 files changed, 37 insertions(+), 3 deletions(-)
(nifi) branch main updated: NIFI-13342 restored sts dependency in aws service api
This is an automated email from the ASF dual-hosted git repository. mattyb149 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 34c24f759a NIFI-13342 restored sts dependency in aws service api 34c24f759a is described below commit 34c24f759ac5478b4f335d6df5ff46e01dfc132d Author: Joseph Witt AuthorDate: Mon Jun 3 11:02:36 2024 -0700 NIFI-13342 restored sts dependency in aws service api Signed-off-by: Matt Burgess This closes #8910 --- nifi-extension-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml index 8dbbe1af95..ff7ddaa39d 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml @@ -50,6 +50,10 @@ com.amazonaws aws-java-sdk-s3 - + +com.amazonaws +aws-java-sdk-sts +runtime +
(nifi) branch main updated: NIFI-13329 - Updating the standard content viewer to render an error message when there is an error formatting.
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 48edbeed90 NIFI-13329 - Updating the standard content viewer to render
an error message when there is an error formatting.
48edbeed90 is described below
commit 48edbeed9066a564bfe6f80778f4b603c46a
Author: Matt Gilman
AuthorDate: Fri May 31 14:29:26 2024 -0400
NIFI-13329 - Updating the standard content viewer to render an error
message when there is an error formatting.
Co-authored-by: Pierre Villard
Signed-off-by: Pierre Villard
This closes #8905.
---
.../nifi-standard-content-viewer/pom.xml | 1 +
.../nifi/web/StandardContentViewerController.java | 138 +++--
.../src/main/webapp/WEB-INF/jsp/format-error.jsp | 22
.../src/main/webapp/css/main.css | 30 +
4 files changed, 124 insertions(+), 67 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
index 02095ac086..6eec34603d 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
@@ -57,6 +57,7 @@
WEB-INF/jsp
codemirror.jsp
+format-error.jsp
true
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
index e07d613713..e41ebec606 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
@@ -25,8 +25,9 @@ import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericDatumReader;
import org.apache.avro.io.DatumReader;
import org.apache.nifi.web.ViewableContent.DisplayMode;
-import org.apache.nifi.xml.processing.ProcessingException;
import org.apache.nifi.xml.processing.transform.StandardTransformProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
@@ -44,6 +45,8 @@ import java.util.Set;
public class StandardContentViewerController extends HttpServlet {
+private static final Logger logger =
LoggerFactory.getLogger(StandardContentViewerController.class);
+
private static final Set supportedMimeTypes = new HashSet<>();
static {
@@ -84,16 +87,15 @@ public class StandardContentViewerController extends
HttpServlet {
if (DisplayMode.Original.equals(content.getDisplayMode())) {
formatted = content.getContent();
} else {
-if ("application/json".equals(contentType)) {
-// format json
-final ObjectMapper mapper = new ObjectMapper();
-final Object objectJson =
mapper.readValue(content.getContentStream(), Object.class);
-formatted =
mapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectJson);
-} else if ("application/xml".equals(contentType) ||
"text/xml".equals(contentType)) {
-// format xml
-final StringWriter writer = new StringWriter();
-
-try {
+try {
+if ("application/json".equals(contentType)) {
+// format json
+final ObjectMapper mapper = new ObjectMapper();
+final Object objectJson =
mapper.readValue(content.getContentStream(), Object.class);
+formatted =
mapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectJson);
+} else if ("application/xml".equals(contentType) ||
"text/xml".equals(contentType)) {
+// format xml
+final StringWriter writer = new StringWriter();
final StreamSource source = new
StreamSource(content.getContentStream());
final StreamResult result = new StreamResult(writer);
@@ -101,67 +103,69 @@ public class StandardContentViewerController extends
HttpServlet {
transformProvider.setIndent(true);
(nifi) branch main updated: NIFI-12801 Add local file upload option in PutHDFS processor
This is an automated email from the ASF dual-hosted git repository.
turcsanyi 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 a21c2544ad NIFI-12801 Add local file upload option in PutHDFS processor
a21c2544ad is described below
commit a21c2544ad6c961b7ba8330481d462981e5e0d7d
Author: shubhamsharma
AuthorDate: Thu Feb 15 10:31:09 2024 -0800
NIFI-12801 Add local file upload option in PutHDFS processor
This closes #8415.
Signed-off-by: Peter Turcsanyi
---
.../nifi-hdfs-processors/pom.xml | 15 +
.../org/apache/nifi/processors/hadoop/PutHDFS.java | 14 -
.../apache/nifi/processors/hadoop/PutHDFSTest.java | 64 ++
3 files changed, 91 insertions(+), 2 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
index a405c449a2..22eede1958 100644
--- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
@@ -112,6 +112,21 @@
org.apache.nifi
nifi-kerberos-user-service-api
+
+org.apache.nifi
+nifi-resource-transfer
+2.0.0-SNAPSHOT
+
+
+org.apache.nifi
+nifi-file-resource-service-api
+
+
+org.apache.nifi
+nifi-file-resource-service
+2.0.0-SNAPSHOT
+test
+
com.github.ben-manes.caffeine
caffeine
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
index f2d1ed111e..8acce88fd2 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
@@ -48,6 +48,7 @@ import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.fileresource.service.api.FileResource;
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.RequiredPermission;
import org.apache.nifi.components.ValidationContext;
@@ -80,6 +81,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import java.io.InputStream;
+import org.apache.nifi.processors.transfer.ResourceTransferSource;
+import static
org.apache.nifi.processors.transfer.ResourceTransferProperties.FILE_RESOURCE_SERVICE;
+import static
org.apache.nifi.processors.transfer.ResourceTransferProperties.RESOURCE_TRANSFER_SOURCE;
+import static
org.apache.nifi.processors.transfer.ResourceTransferUtils.getFileResource;
/**
* This processor copies FlowFiles to HDFS.
@@ -260,6 +266,8 @@ public class PutHDFS extends AbstractHadoopProcessor {
props.add(REMOTE_GROUP);
props.add(COMPRESSION_CODEC);
props.add(IGNORE_LOCALITY);
+props.add(RESOURCE_TRANSFER_SOURCE);
+props.add(FILE_RESOURCE_SERVICE);
return props;
}
@@ -402,7 +410,9 @@ public class PutHDFS extends AbstractHadoopProcessor {
// Write FlowFile to temp file on HDFS
final StopWatch stopWatch = new StopWatch(true);
-session.read(putFlowFile, in -> {
+final ResourceTransferSource resourceTransferSource =
context.getProperty(RESOURCE_TRANSFER_SOURCE).asAllowableValue(ResourceTransferSource.class);
+try (final InputStream in =
getFileResource(resourceTransferSource, context, flowFile.getAttributes())
+.map(FileResource::getInputStream).orElseGet(() ->
session.read(flowFile))) {
OutputStream fos = null;
Path createdFile = null;
try {
@@ -463,7 +473,7 @@ public class PutHDFS extends AbstractHadoopProcessor {
}
fos = null;
}
-});
+}
stopWatch.stop();
final String dataRate =
stopWatch.calculateDataRate(putFlowFile.getSize());
final long millis =
stopWatch.getDuration(TimeUnit.MILLISECONDS);
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/
(nifi) branch main updated: [NIFI-13325] update dark mode theme density to match light mode (#8904)
This is an automated email from the ASF dual-hosted git repository. rfellows 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 30a44464f7 [NIFI-13325] update dark mode theme density to match light mode (#8904) 30a44464f7 is described below commit 30a44464f709ea68b39897f930e20a3feb382073 Author: Scott Aslan AuthorDate: Mon Jun 3 08:14:57 2024 -0400 [NIFI-13325] update dark mode theme density to match light mode (#8904) * [NIFI-13325] update dark mode theme density to match light mode * remove density from nifi themes as only colors are used from this theme This closes #8904 --- .../src/main/nifi/apps/nifi/src/assets/themes/material.scss | 2 +- .../src/main/nifi/apps/nifi/src/assets/themes/nifi.scss | 6 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/material.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/material.scss index a87c77e4d5..c07460535f 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/material.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/material.scss @@ -164,6 +164,6 @@ $material-theme-dark: mat.define-dark-theme( warn: $warn-dark ), typography: $typography-config, -density: 0 +density: -3 ) ); diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/nifi.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/nifi.scss index 829f6965c0..8b243eb13d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/nifi.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/nifi.scss @@ -116,8 +116,7 @@ $nifi-theme-light: mat.define-light-theme( primary: $surface-light-palette, accent: $success-light-palette, warn: $caution-light-palette -), -density: -3 +) ) ); @@ -133,7 +132,6 @@ $nifi-theme-dark: mat.define-dark-theme( primary: $surface-dark-palette, accent: $success-dark-palette, warn: $caution-dark-palette -), -density: -3 +) ) );
(nifi-minifi-cpp) branch MINIFICPP-2367 created (now b143f0f4f)
This is an automated email from the ASF dual-hosted git repository. lordgamez pushed a change to branch MINIFICPP-2367 in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git at b143f0f4f Fix after rebase No new revisions were added by this update.
