[nifi] branch master updated (a700890 -> 1259bd5)

[ym...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ymdavis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git.


    from a700890  NIFI-7298: PutAzureDataLakeStorage tests.
     add 1259bd5  NIFI-7379: Support multiple instances of Prometheus registries/metrics (#4229)

No new revisions were added by this update.

Summary of changes:
 .../prometheus/util/AbstractMetricsRegistry.java   |  53 ++
 .../prometheus/util/BulletinMetricsRegistry.java   |  19 +-
 .../util/ConnectionAnalyticsMetricsRegistry.java   |  54 ++
 .../nifi/prometheus/util/JvmMetricsRegistry.java   |  83 +++
 .../nifi/prometheus/util/NiFiMetricsRegistry.java  | 203 +++++++
 .../prometheus/util/PrometheusMetricsUtil.java     | 590 ++++++---------------
 .../org/apache/nifi/web/NiFiServiceFacade.java     |   3 +-
 .../apache/nifi/web/StandardNiFiServiceFacade.java |  30 +-
 .../java/org/apache/nifi/web/api/FlowResource.java |   6 +-
 .../prometheus/PrometheusReportingTask.java        |   8 +-
 10 files changed, 597 insertions(+), 452 deletions(-)
 create mode 100644 nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/src/main/java/org/apache/nifi/prometheus/util/AbstractMetricsRegistry.java
 copy nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/DataOutputStream.java => nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/src/main/java/org/apache/nifi/prometheus/util/BulletinMetricsRegistry.java (62%)
 create mode 100644 nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/src/main/java/org/apache/nifi/prometheus/util/ConnectionAnalyticsMetricsRegistry.java
 create mode 100644 nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/src/main/java/org/apache/nifi/prometheus/util/JvmMetricsRegistry.java
 create mode 100644 nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/src/main/java/org/apache/nifi/prometheus/util/NiFiMetricsRegistry.java