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 28589e4964 NIFI-15180 Log initialization errors in ConsumeKinesis
(#10526)
add 2e8927879d [NIFI-15162] Add Metrics Strategy parameter to Flow Metrics
REST Resource (#10501)
No new revisions were added by this update.
Summary of changes:
.../nifi/prometheusutil/PrometheusMetricsUtil.java | 15 +++---
.../org/apache/nifi/web/NiFiServiceFacade.java | 4 +-
.../apache/nifi/web/StandardNiFiServiceFacade.java | 12 ++---
.../java/org/apache/nifi/web/api/FlowResource.java | 13 +++--
.../api/request/FlowMetricsReportingStrategy.java | 11 ++---
.../org/apache/nifi/web/api/TestFlowResource.java | 55 ++++++++++------------
6 files changed, 57 insertions(+), 53 deletions(-)
copy
c2/c2-protocol/c2-protocol-api/src/main/java/org/apache/nifi/c2/protocol/api/ResourceType.java
=>
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/request/FlowMetricsReportingStrategy.java
(86%)
