This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 0a937973ea4015a1807def1f9f0866f1cfa7146e Author: Gabor Gyimesi <[email protected]> AuthorDate: Fri Mar 3 14:17:37 2023 +0100 MINIFICPP-2055 Remove C2 metrics from default configuration Closes #1514 Signed-off-by: Marton Szasz <[email protected]> --- conf/minifi.properties | 18 +++++++++--------- encrypt-config/tests/resources/minifi.properties | 18 +++++++++--------- .../with-additional-sensitive-props.minifi.properties | 18 +++++++++--------- libminifi/test/resources/encrypted.minifi.properties | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/conf/minifi.properties b/conf/minifi.properties index 856de8fb1..884a03f34 100644 --- a/conf/minifi.properties +++ b/conf/minifi.properties @@ -92,15 +92,15 @@ nifi.c2.full.heartbeat=false #nifi.c2.agent.class= #nifi.c2.agent.identifier= ## define metrics reported -nifi.c2.root.class.definitions=metrics -nifi.c2.root.class.definitions.metrics.name=metrics -nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics -nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics -nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation -nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics -nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics -nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric -nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics +# nifi.c2.root.class.definitions=metrics +# nifi.c2.root.class.definitions.metrics.name=metrics +# nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics +# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics +# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation +# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics +# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics +# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric +# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics ## Specify multiple heartbeat handlers. ## HeartbeatLogger logs the heartbeats on TRACE for debugging. diff --git a/encrypt-config/tests/resources/minifi.properties b/encrypt-config/tests/resources/minifi.properties index eb572a2bd..b2f3a2eca 100644 --- a/encrypt-config/tests/resources/minifi.properties +++ b/encrypt-config/tests/resources/minifi.properties @@ -72,15 +72,15 @@ nifi.c2.agent.class=EncryptConfigTester nifi.c2.agent.identifier=EncryptConfigTester-001 ## define metrics reported -nifi.c2.root.class.definitions=metrics -nifi.c2.root.class.definitions.metrics.name=metrics -nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics -nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics -nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation -nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics -nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics -nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric -nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics +# nifi.c2.root.class.definitions=metrics +# nifi.c2.root.class.definitions.metrics.name=metrics +# nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics +# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics +# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation +# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics +# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics +# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric +# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics ## enable the controller socket provider on port 9998 ## off by default. C2 must be enabled to support these diff --git a/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties b/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties index d584d8089..dc4509121 100644 --- a/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties +++ b/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties @@ -74,15 +74,15 @@ nifi.c2.agent.class=EncryptConfigTester nifi.c2.agent.identifier=EncryptConfigTester-001 ## define metrics reported -nifi.c2.root.class.definitions=metrics -nifi.c2.root.class.definitions.metrics.name=metrics -nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics -nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics -nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation -nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics -nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics -nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric -nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics +# nifi.c2.root.class.definitions=metrics +# nifi.c2.root.class.definitions.metrics.name=metrics +# nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics +# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics +# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation +# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics +# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics +# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric +# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics ## enable the controller socket provider on port 9998 ## off by default. C2 must be enabled to support these diff --git a/libminifi/test/resources/encrypted.minifi.properties b/libminifi/test/resources/encrypted.minifi.properties index 49e25e0fa..bbf1fb62d 100644 --- a/libminifi/test/resources/encrypted.minifi.properties +++ b/libminifi/test/resources/encrypted.minifi.properties @@ -75,15 +75,15 @@ c2.agent.identifier=lZL2phnmPWP4s7k8LzzONTNh/2Nhgyty||OLyo7FtKOZ5M1DbiVCEMrlch8D c2.agent.identifier.protected=xsalsa20poly1305 ## define metrics reported -nifi.c2.root.class.definitions=metrics -nifi.c2.root.class.definitions.metrics.name=metrics -nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics -nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics -nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation -nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics -nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics -nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric -nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics +# nifi.c2.root.class.definitions=metrics +# nifi.c2.root.class.definitions.metrics.name=metrics +# nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics +# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics +# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation +# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics +# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics +# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric +# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics ## enable the controller socket provider on port 9998 ## off by default. C2 must be enabled to support these
