Skip to content

Commit 377ed3d

Browse files
authored
Merge branch 'master' into persist-name-update
2 parents 49e450c + ba03494 commit 377ed3d

File tree

206 files changed

+591
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+591
-305
lines changed

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ gem "faraday-retry"
8989
# that could lead to build error:
9090
# /opt/homebrew/Cellar/ruby/3.3.0/lib/ruby/3.3.0/logger.rb:384:in `level': undefined method `[]' for nil (NoMethodError)
9191
# @level_override[Fiber.current] || @level
92+
gem "logger"
9293
gem "mercenary", "~> 0.4"
94+
gem "ostruct"
9395

9496
# self made plugins dependencies
9597
gem "nokogiri"
@@ -100,6 +102,7 @@ gem "nokogiri"
100102
group :jekyll_plugins do
101103

102104
gem "jekyll-remote-theme"
105+
gem "jekyll-github-metadata"
103106
# gem "jekyll-paginate"
104107
# gem "jekyll-sitemap"
105108
# gem "jekyll-gist"

_config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ plugins:
2424
- jekyll-sitemap # Jekyll plugin to silently generate a sitemaps.org compliant sitemap for your Jekyll site.
2525
- jekyll-gist # Liquid tag for displaying GitHub Gists in Jekyll sites.
2626
- jekyll-include-cache # Liquid tag that caches Liquid includes.
27+
- jekyll-github-metadata
2728

2829
# Whitelist plugins under safe mode.
2930
whitelist:
@@ -256,3 +257,5 @@ footer:
256257
product:
257258
name: 'syslog-ng Open Source Edition'
258259
short_name: 'syslog-ng OSE'
260+
261+
repository: syslog-ng/syslog-ng

_data/navigation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,13 +836,13 @@ admin-guide-nav:
836836
url: /admin-guide/120_Parser/014_panos_parser/001_Panos_parser_options
837837
- title: "Sudo parser"
838838
url: /admin-guide/120_Parser/015_sudo_parser
839+
- title: "MariaDB parser"
840+
url: /admin-guide/120_Parser/016_mariadb_parser
839841
- title: "PostgreSQL parser"
840842
url: /admin-guide/120_Parser/016_PostgreSQL_csvlog_parser/README
841843
subnav:
842844
- title: "PostgreSQL csvlog parser options"
843845
url: /admin-guide/120_Parser/016_PostgreSQL_csvlog_parser/001_PostgreSQL_parser_options
844-
- title: "MariaDB parser"
845-
url: /admin-guide/120_Parser/016_mariadb_parser
846846
- title: "metrics-probe()"
847847
url: /admin-guide/120_Parser/017_metrics_probe_parser/README
848848
subnav:

_includes/doc/common_snippets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ that contains the include tag, further inherited e.g. layouts will not see the i
1212

1313
{% assign img_folder = '/assets/images' | relative_url %}
1414

15+
{% assign ose_latest = site.github.latest_release.name | remove: '.tar.gz' | remove: 'syslog-ng-' %}
16+
1517
{% include doc/dev-guide/common_snippets %}
1618

1719
{% include doc/admin-guide/common_snippets %}
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: What {{ site.product.short_name }} is not
33
id: adm-intro-whatnot
4+
description: >-
5+
The {{ site.product.short_name }} application is not log analysis software. It can filter
6+
log messages and select only the ones matching certain criteria. It can
7+
even convert the messages and restructure them to a predefined format,
8+
or parse the messages and segment them into different fields. But
9+
{{ site.product.short_name }} cannot interpret and analyze the meaning behind the messages,
10+
or recognize patterns in the occurrence of different messages.
411
---
5-
6-
The {{ site.product.short_name }} application is not log analysis software. It can filter
7-
log messages and select only the ones matching certain criteria. It can
8-
even convert the messages and restructure them to a predefined format,
9-
or parse the messages and segment them into different fields. But
10-
{{ site.product.short_name }} cannot interpret and analyze the meaning behind the messages,
11-
or recognize patterns in the occurrence of different messages.

doc/_admin-guide/010_Introduction_to_syslog-ng/003_Who_uses_syslog-ng.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
title: Who uses {{ site.product.short_name }}?
33
id: adm-intro-who
4+
description: >-
5+
The {{ site.product.short_name }} application is used worldwide by companies and
6+
institutions who collect and manage the logs of several hosts, and want
7+
to store them in a centralized, organized way.
48
---
59

6-
The {{ site.product.short_name }} application is used worldwide by companies and
7-
institutions who collect and manage the logs of several hosts, and want
8-
to store them in a centralized, organized way. Using {{ site.product.short_name }} is
9-
particularly advantageous for:
10+
Using {{ site.product.short_name }} is particularly advantageous for:
1011

1112
- Internet Service Providers
1213

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
title: Supported platforms
33
id: adm-intro-supp
4+
description: >-
5+
The {{ site.product.short_name }} application is highly
6+
portable and is known to run on a wide range of hardware architectures
7+
(x86, x86_64, SUN Sparc, PowerPC 32 and 64, Alpha, ARM64) and operating
8+
systems, including Linux, BSD, Solaris, IBM AIX, HP-UX, macOS,
9+
Cygwin, and others.
410
---
511

6-
The {{ site.product.short_name }} application is highly
7-
portable and is known to run on a wide range of hardware architectures
8-
(x86, x86_64, SUN Sparc, PowerPC 32 and 64, Alpha, ARM64) and operating
9-
systems, including Linux, BSD, Solaris, IBM AIX, HP-UX, macOS,
10-
Cygwin, and others.
11-
1212
- The [[source code|gh-syslog-ng]] of {{ site.product.name }} is released under the GPLv2 license
1313

1414
- For the available binary installation packages, see {{ site.product.name }} installation packages.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: Introduction to syslog-ng
33
id: adm-intro
4+
description: >-
5+
This chapter introduces the {{ site.product.name }} application in
6+
a non-technical manner, discussing how and why is it useful, and the
7+
benefits it offers to an existing IT infrastructure.
48
---
5-
6-
This chapter introduces the {{ site.product.name }} application in
7-
a non-technical manner, discussing how and why is it useful, and the
8-
benefits it offers to an existing IT infrastructure.

doc/_admin-guide/020_The_concepts_of_syslog-ng/003_Global_objects.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
title: Global objects
33
id: adm-conc-glob
4+
description: >-
5+
This section explains some basic terminology used in {{ site.product.short_name }}.
46
---
57

68
## Source driver

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
title: Compiling options of {{ site.product.short_name }}
33
id: adm-inst-compopt
4+
description: >-
5+
This chapter describes the compiling options of {{ site.product.short_name }}.
46
---
57

68
When compiling {{ site.product.short_name }} from source, you can use the following

0 commit comments

Comments
 (0)