Skip to content

Commit de09197

Browse files
Merge branch 'master' into doc-s3-updates
2 parents 6867f6d + 8c28dc1 commit de09197

File tree

19 files changed

+41
-260
lines changed

19 files changed

+41
-260
lines changed

_data/navigation.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,6 @@ admin-guide-nav:
379379
url: /admin-guide/070_Destinations/081_http/002_Python_http_header_plugin
380380
- title: "The Azure auth header plugin"
381381
url: /admin-guide/070_Destinations/081_http/003_Azure_auth_header_plugin
382-
- title: "http-java"
383-
url: /admin-guide/070_Destinations/085_http-java/README
384-
subnav:
385-
- title: "HTTP Java destination options"
386-
url: /admin-guide/070_Destinations/085_http-java/000_http_java_options
387382
- title: "kafka"
388383
url: /admin-guide/070_Destinations/100_Kafka-c/README
389384
subnav:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
**NOTE:**
2+
This option is only available for the `wildcard-file()` source but unavailable for the `file()` source.
3+
{: .notice--info}

doc/_admin-guide/030_Installing_syslog-ng/000_Compiling_syslog-ng_from_source.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ and other platforms, see {{ site.product.name }} installation packages.
3333
- The {{ site.product.short_name }} application now uses PCRE-type regular
3434
expressions by default. It requires the libpcre library package.
3535

36-
- If you want to use the Java-based modules of {{ site.product.short_name }} (for
37-
example, the Elasticsearch, HDFS, or Kafka destinations), you
36+
- If you want to use a Java-based module of {{ site.product.short_name }} (for
37+
example, the HDFS), you
3838
must compile {{ site.product.short_name }} with Java support.
3939

4040
- Download and install the Java Runtime Environment (JRE), 1.7
@@ -59,8 +59,7 @@ and other platforms, see {{ site.product.name }} installation packages.
5959
3. If you want to post log messages as HTTP requests using the http()
6060
destination, install the development files of the *libcurl* library.
6161
This library is not needed if you use the \--disable-http compile
62-
option. Alternatively, you can use a Java-based implementation of
63-
the HTTP destination.
62+
option.
6463

6564
4. If you want to use the spoof-source function of {{ site.product.short_name }}, install
6665
the development files of the libnet library.

doc/_admin-guide/030_Installing_syslog-ng/001_Compiling_options.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ compiling options.
5454

5555
- *\--enable-ipv6* Enable IPv6 support.
5656

57-
- *\--enable-java* Enable support for Java-based modules. For other
57+
- *\--enable-java* Enable support for the Java-based module. For other
5858
requirements, see the description of the Java-based module (for
5959
example,
6060
[[HDFS prerequisites|adm-dest-hdfs-pre]]) that you want to use.
@@ -134,7 +134,7 @@ compiling options.
134134

135135
- *\--with-libcurl* Specifies the path to the libcurl library. For
136136
details on using this destination, see
137-
[[http: Posting messages over HTTP without Java]].
137+
[[http: Posting messages over HTTP]].
138138

139139
- *\--with-libhiredis* Specifies the path to the libhiredis library
140140
(0.11 or newer). For details on using this destination, see

doc/_admin-guide/060_Sources/020_File/000_File_source_options.md

Lines changed: 0 additions & 50 deletions
This file was deleted.

doc/_admin-guide/060_Sources/020_File/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
title: 'file: Collecting messages from text files (DEPRECATED)'
3-
short_title: file (DEPRECATED)
2+
title: 'file: Collecting messages from text files'
3+
short_title: file
44
id: adm-src-file
55
description: >-
6-
The file() source has been deprecated. For a more stable performance, use the [[wildcard-file() source|adm-src-wild]] instead. Collects log messages from plain-text files, for example, from the logfiles of
7-
an Apache webserver. If you want to use wildcards in the filename, use the [[wildcard-file() source|adm-src-wild]].
6+
Collects log messages from plain-text files, for example, from the logfiles of
7+
an Apache webserver. If you want to use wildcards in the filename, use the [[wildcard-file() source|adm-src-wild]]. Currently, {{ site.product.short_name }} supports the file() source to maintain certain compatibilities, but it is advised to use the wildcard-file() source for longevity reasons and more configuration options.
88
---
99

1010
The {{ site.product.short_name }} application notices if a file is renamed or replaced with
@@ -49,3 +49,5 @@ treats messages received from files as sent by the kern facility. Use
4949
the **default-facility()** and **default-priority()** options in the
5050
source definition to assign a different facility if needed.
5151
{: .notice--info}
52+
53+
For the configuration options available in the `file()` source, see wildcard-file() source options.

doc/_admin-guide/060_Sources/030_Wildcard-file/000_Wildcard-file_options.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ The wildcard-file() driver has the following options:
1010

1111
## base-dir()
1212

13+
{% include doc/admin-guide/notes/wildcard-option-warning.md %}
14+
1315
|Type:| path without filename|
1416
|Default:||
1517

@@ -39,6 +41,8 @@ source s_files {
3941

4042
## filename-pattern()
4143

44+
{% include doc/admin-guide/notes/wildcard-option-warning.md %}
45+
4246
|Type:|filename without path|
4347
|Default:||
4448

doc/_admin-guide/070_Destinations/070_HDFS/000_hdfs_prerequisites.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ description: >-
55
To send messages from {{ site.product.short_name }} to HDFS, complete the following steps.
66
---
77

8-
1. If you want to use the Java-based modules of {{ site.product.short_name }} (for
9-
example, the Elasticsearch, HDFS, or Kafka destinations), you must
8+
1. If you want to use the Java-based module of {{ site.product.short_name }} (for
9+
example, HDFS destination), you must
1010
compile {{ site.product.short_name }} with Java support.
1111

1212
- Download and install the Java Runtime Environment (JRE), 1.7 (or

0 commit comments

Comments
 (0)