(nifi) 02/02: Merge branch 'support/nifi-1.x' of https://gitbox.apache.org/repos/asf/nifi into support/nifi-1.x
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit 7d72664854de796459a9866d633d28c7f6787784 Merge: 41b63ffcc7 34b5297c93 Author: Pierre Villard AuthorDate: Sun Jul 7 19:33:19 2024 +0200 Merge branch 'support/nifi-1.x' of https://gitbox.apache.org/repos/asf/nifi into support/nifi-1.x .../apache/nifi/processors/beats/ListenBeats.java | 2 + .../nifi/processors/cipher/DecryptContent.java | 2 + .../cipher/DecryptContentCompatibility.java| 2 + .../processors/email/ExtractTNEFAttachments.java | 2 + .../apache/nifi/processors/email/ListenSMTP.java | 2 + .../apache/nifi/processors/enrich/QueryDNS.java| 3 +- .../apache/nifi/processors/enrich/QueryWhois.java | 3 +- .../processors/hadoop/AbstractHadoopProcessor.java | 34 ++--- .../dto/status/ConnectionStatusSnapshotDTO.java| 1 + .../dto/status/ProcessGroupStatusSnapshotDTO.java | 43 +- .../entity/ConnectionStatisticsSnapshotEntity.java | 1 + .../api/entity/ConnectionStatusSnapshotEntity.java | 1 + .../web/api/entity/PortStatusSnapshotEntity.java | 1 + .../entity/ProcessGroupStatusSnapshotEntity.java | 1 + .../api/entity/ProcessorStatusSnapshotEntity.java | 1 + .../RemoteProcessGroupStatusSnapshotEntity.java| 1 + .../apache/nifi/cluster/manager/StatusMerger.java | 6 ++- .../nifi/controller/kudu/KuduLookupService.java| 2 + .../org/apache/nifi/processors/kudu/PutKudu.java | 3 +- .../reporting/prometheus/PrometheusRecordSink.java | 3 +- .../prometheus/PrometheusReportingTask.java| 2 + .../nifi/processors/standard/ConvertJSONToSQL.java | 2 + .../nifi/processors/standard/ListenRELP.java | 2 + .../nifi/processors/standard/ListenTCPRecord.java | 2 + .../apache/nifi/processors/standard/ParseCEF.java | 3 +- .../reporting/ganglia/StandardGangliaReporter.java | 2 + 26 files changed, 107 insertions(+), 20 deletions(-)
(nifi) 02/02: Merge branch 'support/nifi-1.x' of https://gitbox.apache.org/repos/asf/nifi into support/nifi-1.x
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit 2ac7a160c7ec841f0c8f7b0c339ca71f73e3ad47 Merge: b3297c5593 79b3083546 Author: Pierre Villard AuthorDate: Tue Jan 30 18:15:51 2024 +0400 Merge branch 'support/nifi-1.x' of https://gitbox.apache.org/repos/asf/nifi into support/nifi-1.x .../operation/SupportedOperationsProvider.java | 18 ++- .../additionalDetails.html | 13 -- .../apache/nifi/snmp/factory/core/SNMPContext.java | 8 -- .../nifi/snmp/operations/GetSNMPHandler.java | 42 ++- .../nifi/snmp/operations/SNMPResourceHandler.java | 70 --- .../nifi/snmp/operations/SendTrapSNMPHandler.java | 37 +++--- .../nifi/snmp/operations/SetSNMPHandler.java | 13 +- .../snmp/processors/AbstractSNMPProcessor.java | 81 .../org/apache/nifi/snmp/processors/GetSNMP.java | 115 - .../apache/nifi/snmp/processors/SendTrapSNMP.java | 33 ++--- .../org/apache/nifi/snmp/processors/SetSNMP.java | 19 +-- .../java/org/apache/nifi/snmp/utils/SNMPUtils.java | 4 +- .../nifi/snmp/factory/core/SNMPContextTest.java| 47 --- .../snmp/factory/core/V1V2cSNMPFactoryTest.java| 13 -- .../nifi/snmp/factory/core/V3SNMPFactoryTest.java | 13 -- .../nifi/snmp/operations/GetSNMPHandlerTest.java | 99 +++ .../apache/nifi/snmp/operations/SNMPRequestIT.java | 140 ++--- .../snmp/operations/SendTrapSNMPHandlerTest.java | 21 +--- .../nifi/snmp/operations/SetSNMPHandlerTest.java | 11 +- .../snmp/processors/AbstractSNMPProcessorTest.java | 12 +- .../apache/nifi/snmp/processors/GetSNMPTest.java | 61 - .../nifi/processors/standard/LookupRecord.java | 15 ++- .../nifi/processors/standard/TestLookupRecord.java | 94 ++ .../lookup-array-input-empty-array.json| 40 ++ .../lookup-array-input-missing.json| 14 +++ .../lookup-array-output-empty-array.json | 1 + .../lookup-array-output-missing-matched.json | 1 + .../lookup-array-output-missing-unmatched.json | 1 + 28 files changed, 507 insertions(+), 529 deletions(-)
