You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2020/05/29 08:39:16 UTC
[nifi] branch master updated: NIFI-7483 - Remove description about
'Rolling strategy' in TailFile's docs
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new e04e679 NIFI-7483 - Remove description about 'Rolling strategy' in TailFile's docs
e04e679 is described below
commit e04e6793caddbfb7b5c93c35f3ed51f1e0a761aa
Author: zhangcheng <zh...@foxmail.com>
AuthorDate: Mon May 25 16:31:42 2020 +0800
NIFI-7483 - Remove description about 'Rolling strategy' in TailFile's docs
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #4293.
---
.../org/apache/nifi/processors/standard/TailFile.java | 4 ++--
.../additionalDetails.html | 15 ---------------
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java
index 22cc78e..5445b8d 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java
@@ -201,7 +201,7 @@ public class TailFile extends AbstractProcessor {
static final PropertyDescriptor LOOKUP_FREQUENCY = new PropertyDescriptor.Builder()
.name("tailfile-lookup-frequency")
.displayName("Lookup frequency")
- .description("Only used in Multiple files mode and Changing name rolling strategy. It specifies the minimum "
+ .description("Only used in Multiple files mode. It specifies the minimum "
+ "duration the processor will wait before listing again the files to tail.")
.required(false)
.defaultValue("10 minutes")
@@ -211,7 +211,7 @@ public class TailFile extends AbstractProcessor {
static final PropertyDescriptor MAXIMUM_AGE = new PropertyDescriptor.Builder()
.name("tailfile-maximum-age")
.displayName("Maximum age")
- .description("Only used in Multiple files mode and Changing name rolling strategy. It specifies the necessary "
+ .description("Only used in Multiple files mode. It specifies the necessary "
+ "minimum duration to consider that no new messages will be appended in a file regarding its last "
+ "modification date. This should not be set too low to avoid duplication of data in case new messages "
+ "are appended at a lower frequency.")
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TailFile/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TailFile/additionalDetails.html
index 75fb867..1585e71 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TailFile/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TailFile/additionalDetails.html
@@ -90,21 +90,6 @@
</code>
</p>
<p>
- In the '<b>Multiple files</b>' mode, it is possible to specify if the file to tail has always the same name or not. It is done through
- the property 'Rolling strategy'. The strategy can be 'Fixed name' in case the files to tail have always the same name (see example above)
- or can be 'Changing name' in case the files to tail do not always have the same name. Example:
- </p>
- <p>
- <code>
- /my/path/directory/my-app-2016-09-06.log<br />
- /my/path/directory/my-app-2016-09-07.log<br />
- /my/path/directory/my-app-2016-09-08.log
- </code>
- </p>
- <p>
- and new log messages are always appended in log file of the current day.
- </p>
- <p>
If the processor is configured with '<b>Multiple files</b>' mode, two additional properties are relevant:
</p>
<ul>