Skip to content

Commit 4310e7d

Browse files
Merge branch 'master' into doc-parser-no-PB
2 parents a725715 + b2fcf5c commit 4310e7d

File tree

187 files changed

+1410
-630
lines changed

Some content is hidden

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

187 files changed

+1410
-630
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Bug report
3+
about: Use this template for reporting a bug related to building the documentation.
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
## Platform
11+
<!-- Name and version of OS -->
12+
13+
# Issue
14+
15+
## Failure
16+
17+
## Steps to reproduce
18+
<!-- A description of how to trigger this bug. -->
19+
20+
## Configuration
21+
22+
## Input and output logs (if possible)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Documentation issue
3+
about: Use this template for reporting an issue in the documentation.
4+
title: ''
5+
labels: 'documentation'
6+
assignees: ''
7+
8+
---
9+
10+
## Incorrect section
11+
<!-- Which section of the documentation is wrong? Please include a link to it, if that is possible. -->
12+
13+
## Description of the problem
14+
<!-- Which statements of the documentation are inaccurate? -->
15+
16+
## Proposed solution
17+
<!-- What do you think the correction should be? -->
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Use this template for raising a feature request.
4+
title: ''
5+
labels: 'enhancement'
6+
assignees: ''
7+
8+
---
9+
10+
## Description of the problem
11+
<!-- Is your feature request related to a problem? Please describe. Ex. I'm always frustrated when [...] -->
12+
13+
## Proposed solution
14+
<!-- Describe the solution you'd like. -->
15+
16+
## Alternatives
17+
<!-- Describe any alternative solutions or features you've considered. -->
18+
19+
## Additional context
20+
<!-- Add any other context or screenshots about the feature request here. -->

.github/workflows/jekyll-gh-pages.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ concurrency:
2929
jobs:
3030
# Build job
3131
build:
32-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-22.04
3333
steps:
3434
- name: Checkout
3535
uses: actions/checkout@v4
@@ -96,6 +96,20 @@ jobs:
9696
./_tools/pack debug
9797
ls -AlR _site/assets/js
9898
99+
# Generate and add Doxygen source documentation
100+
sudo apt-get install doxygen graphviz -y
101+
102+
OSE_SRC_REPO=https://github.com/syslog-ng/syslog-ng.git
103+
OSE_SRC_REPO_BRANCH=develop # as this is a developer documentation use the latest develop branch instead of the master
104+
git clone --branch ${OSE_SRC_REPO_BRANCH} --single-branch ${OSE_SRC_REPO} ./_work
105+
106+
pushd ./_work
107+
# How to override Doxygen options from command line
108+
# https://www.doxygen.nl/manual/faq.html#faq_cmdline
109+
( cat ./Doxyfile; echo "OUTPUT_DIRECTORY=../_site/dev-guide/chapter_9/" ) | doxygen -
110+
popd
111+
rm -Rf ./_work
112+
99113
- name: Upload artifact
100114
# Automatically uploads an artifact from the './_site' directory by default
101115
uses: actions/upload-pages-artifact@v3
@@ -105,7 +119,7 @@ jobs:
105119
environment:
106120
name: github-pages
107121
url: ${{ steps.deployment.outputs.page_url }}
108-
runs-on: ubuntu-latest
122+
runs-on: ubuntu-22.04
109123
needs: build
110124
steps:
111125
- name: Deploy to GitHub Pages

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,6 @@ group :jekyll_plugins do
111111
# https://github.com/HofiOne/minimal-mistakes
112112
#
113113
gem "jekyll-include-cache"
114+
gem "jekyll-github-metadata"
114115
# gem "github-pages"
115116
end

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,4 +258,4 @@ product:
258258
name: 'syslog-ng Open Source Edition'
259259
short_name: 'syslog-ng OSE'
260260

261-
repository: syslog-ng/syslog-ng
261+
repository: syslog-ng/syslog-ng.github.io

_data/external_links.yml

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ sn-ose-adminguide:
107107
url: https://syslog-ng.github.io/admin-guide/README
108108
title: [ "The syslog-ng OSE Administration Guide" ]
109109

110+
sn-ose-source-doc:
111+
id: sn-ose-source-doc
112+
url: /dev-guide/chapter_9/html/index.html
113+
title: [ "syslog-ng OSE source code documentation" ]
114+
open_in_blank: true
115+
110116
sn-ose-upgrade:
111117
id: sn-ose-upgrade
112118
url: https://syslog-ng.com/blog/upgrading-from-syslog-ng-open-source-to-premium-edition/
@@ -122,6 +128,10 @@ sn-selinux:
122128
url: https://syslog-ng.com/blog/using-syslog-ng-with-selinux-in-enforcing-mode/
123129
title: [ "Using syslog-ng OSE with SELinux in enforcing mode" ]
124130

131+
sn-freebsd-audit:
132+
id: sn-freebsd-audit
133+
url: https://www.syslog-ng.com/community/b/blog/posts/freebsd-audit-source-for-syslog-ng
134+
title: [ "FreeBSD audit source for syslog-ng" ]
125135

126136
### One Identity site links ###
127137

@@ -378,6 +388,16 @@ gh-hy:
378388
url: https://github.com/hylang/hy
379389
title: [ "hy" ]
380390

391+
gh-libdbi-master:
392+
id: gh-libdbi-master
393+
url: https://github.com/balabit-deps/libdbi/tree/master
394+
title: [ "libdbi master" ]
395+
396+
gh-libdbi-drivers:
397+
id: gh-libdbi-drivers
398+
url: https://github.com/balabit-deps/libdbi-drivers
399+
title: [ "libdbi drivers" ]
400+
381401
gh-mon-src:
382402
id: gh-mon-src
383403
url: https://github.com/syslog-ng/syslog-ng-incubator/tree/master/modules/monitor-source/
@@ -608,6 +628,11 @@ gh-es:
608628
url: https://github.com/syslog-ng/syslog-ng/tree/master/scl/elasticsearch
609629
title: [ "Elasticsearch configuration snippet on GitHub" ]
610630

631+
gh-es-ds:
632+
id: gh-es-ds
633+
url: https://github.com/syslog-ng/syslog-ng/blob/master/scl/elasticsearch/elastic-datastream.conf
634+
title: [ "Elasticsearch datastream configuration snippet on GitHub" ]
635+
611636
gh-fortigate:
612637
id: gh-fortigate
613638
url: https://github.com/syslog-ng/syslog-ng/blob/master/scl/fortigate/fortigate.conf
@@ -712,6 +737,11 @@ gh-sumo:
712737
id: gh-sumo
713738
url: https://github.com/syslog-ng/syslog-ng/blob/master/scl/sumologic/sumologic.conf
714739
title: [ "Sumo Logic configuration snippet on GitHub" ]
740+
741+
gh-webhook:
742+
id: gh-webhook
743+
url: https://github.com/syslog-ng/syslog-ng/blob/develop/modules/python-modules/syslogng/modules/webhook/scl/webhook.conf
744+
title: [ "Webhook config file on GitHub" ]
715745

716746
gh-websense:
717747
id: gh-websense
@@ -790,12 +820,22 @@ discord-wh-intro:
790820
id: discord-wh-intro
791821
url: https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks
792822
title: [ "Discord: Intro to Webhooks" ]
793-
823+
824+
doxygen-home:
825+
id: doxygen-home
826+
url: https://www.doxygen.nl/
827+
title: [ "Doxygen HomePage" ]
828+
794829
ebpf:
795830
id: ebpf
796831
url: https://ebpf.io/
797832
title: [ "Extended Berkeley Packet Filter" ]
798833

834+
elastic-ds:
835+
id: elastic-ds
836+
url: https://www.elastic.co/guide/en/elasticsearch/reference/current/data-streams.html
837+
title: [ "Elasticsearch data streams" ]
838+
799839
gcp-ser:
800840
id: gcp-ser
801841
url: https://cloud.google.com/iam/docs/service-account-overview
@@ -1076,6 +1116,11 @@ postgresql:
10761116
url: https://www.postgresql.org/docs/current/runtime-config-logging.html#RUNTIME-CONFIG-LOGGING-CSVLOG
10771117
title: [ "PostgreSQL" ]
10781118

1119+
prometheus-scraper:
1120+
id: prometheus-scraper
1121+
url: https://prometheus.io/docs/prometheus/latest/getting_started/#configure-prometheus-to-monitor-the-sample-targets
1122+
title: [ "/[Pp]rometheus [Ss]craper/" ]
1123+
10791124
qbittorrent:
10801125
id: qbittorrent
10811126
url: https://www.qbittorrent.org/
@@ -1142,7 +1187,7 @@ sn-graphite:
11421187
title: [ "Collecting syslog-ng statistics to Graphite" ]
11431188

11441189
sn-grouping-by:
1145-
id: sn--grouping-by
1190+
id: sn-grouping-by
11461191
url: https://www.syslog-ng.com/community/b/blog/posts/the-grouping-by-parser-in-syslog-ng-3-8
11471192
title: [ "The grouping-by() parser in syslog-ng blog post" ]
11481193

_data/link_aliases.yml

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,155 @@ adm-about-glossary#bsd-syslog-protocol:
9999
adm-about-glossary#ietf-syslog-protocol:
100100
aliases: [ "IETF-syslog protocol", "IETF-syslog" ]
101101

102+
adm-src-stats-exporter:
103+
aliases: [ "stats-exporter-dont-log()" ]
104+
102105
adm-src-wild:
103106
aliases: [ "/wildcard-file(?:\\(\\))? source[s]?/" ]
104107

105108
adm-src-file:
106109
aliases: [ "/file(?:\\(\\))? source[s]?/" ]
110+
111+
adm-src-program:
112+
aliases: [ "program() source" ]
113+
114+
adm-dest-program:
115+
aliases: [ "program() destination" ]
116+
117+
adm-src-mqtt:
118+
aliases: [ "mqtt() source" ]
119+
120+
adm-dest-mqtt:
121+
aliases: [ "mqtt() destination" ]
122+
123+
adm-src-netw:
124+
aliases: [ "network() source" ]
125+
126+
adm-dest-netw:
127+
aliases: [ "network() destination" ]
128+
129+
adm-src-optel:
130+
aliases: [ "opentelemetry() source" ]
131+
132+
adm-dest-optel:
133+
aliases: [ "opentelemetry() destination" ]
134+
135+
adm-src-osquery:
136+
aliases: [ "osquery() source" ]
137+
138+
adm-dest-osquery:
139+
aliases: [ "osquery() destination" ]
140+
141+
adm-src-syslog:
142+
aliases: [ "syslog() source" ]
143+
144+
adm-dest-syslog:
145+
aliases: [ "syslog() destination" ]
146+
147+
adm-src-sng-otlp:
148+
aliases: [ "syslog-ng-otlp() source" ]
149+
150+
adm-dest-sng-otlp:
151+
aliases: [ "syslog-ng-otlp() destination" ]
152+
153+
adm-src-unix:
154+
aliases: [ "unix-dgram() source", "unix-stream() source", "unix-dgram() and unix-stream() source" ]
155+
156+
adm-dest-unix:
157+
aliases: [ "unix-dgram() destination", "unix-stream() destination", "unix-dgram() and unix-stream() destination" ]
158+
159+
adm-man-ctl:
160+
aliases: [ "syslog-ng-ctl" ]
161+
162+
adm-src-hypr:
163+
aliases: [ "hypr-app-audit-trail()" ]
164+
165+
adm-src-macOS:
166+
aliases: [ "darwin-oslog()", "darwin-oslog-stream()" ]
167+
168+
adm-dest-google-bq:
169+
aliases: [ "bigquery()" ]
170+
171+
adm-parser-kv:
172+
aliases: [ "kv-parser()" ]
173+
174+
adm-parser-csv:
175+
aliases: [ "csv-parser()" ]
176+
177+
adm-parser-syslog:
178+
aliases: [ "syslog-parser()" ]
179+
180+
adm-parser-json:
181+
aliases: [ "json-parser()" ]
182+
183+
adm-parser-xml:
184+
aliases: [ "xml()" ]
185+
186+
adm-parser-date:
187+
aliases: [ "date-parser()" ]
188+
189+
adm-parser-tags:
190+
aliases: [ "tags-parser()" ]
191+
192+
adm-parser-apache:
193+
aliases: [ "apache-accesslog-parser()" ]
194+
195+
adm-parser-linux:
196+
aliases: [ "linux-audit-parser()" ]
197+
198+
adm-parser-cisco:
199+
aliases: [ "cisco-parser()" ]
200+
201+
adm-parser-ewmm:
202+
aliases: [ "ewmm-parser()" ]
203+
204+
adm-parser-iptables:
205+
aliases: [ "iptables-parser()" ]
206+
207+
adm-parser-netskope:
208+
aliases: [ "netskope-parser()" ]
209+
210+
adm-parser-panos:
211+
aliases: [ "panos-parser()" ]
212+
213+
adm-parser-sudo:
214+
aliases: [ "sudo-parser()" ]
215+
216+
adm-parser-postrgresql:
217+
aliases: [ "postgresql-csvlog-parser()" ]
218+
219+
adm-parser-mariadb:
220+
aliases: [ "mariadb-audit-parser()" ]
221+
222+
adm-metrics-probe:
223+
aliases: [ "metrics-probe()" ]
224+
225+
adm-parser-websense:
226+
aliases: [ "websense-parser()" ]
227+
228+
adm-parser-evtx:
229+
aliases: [ "windows-eventlog-xml-parser()" ]
230+
231+
adm-parser-fortigate:
232+
aliases: [ "fortigate-parser()" ]
233+
234+
adm-parser-checkpoint:
235+
aliases: [ "checkpoint-parser()" ]
236+
237+
adm-parser-regexp:
238+
aliases: [ "regexp-parser()" ]
239+
240+
adm-parser-db:
241+
aliases: [ "db-parser()" ]
242+
243+
adm-parser-optel:
244+
aliases: [ "opentelemetry-parser()" ]
245+
246+
adm-correlate:
247+
aliases: [ "grouping-by()" ]
248+
249+
adm-stats:
250+
aliases: [ "syslog-ng-ctl stats", "syslog-ng-ctl query" ]
251+
252+
doxygen-home:
253+
aliases: [ "/[Dd]oxygen/" ]

0 commit comments

Comments
 (0)