Skip to content

Commit 776004e

Browse files
authored
Merge pull request rsyslog#6665 from rgerhards/yaml-config-support
feat: add YAML as an alternative configuration format
2 parents 7b3efb9 + bac4ad2 commit 776004e

31 files changed

+3897
-8
lines changed

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,11 @@ PKG_CHECK_MODULES([LIBYAML], [yaml-0.1], [
170170
AC_DEFINE([HAVE_LIBYAML], [1], [Define if libyaml is available])
171171
have_libyaml=yes
172172
], [
173-
AC_MSG_WARN([libyaml not found, rate limiting policies from files will be disabled])
173+
AC_MSG_WARN([libyaml not found, rate limiting policies from files and YAML configuration support will be disabled])
174174
have_libyaml=no
175175
])
176176
AM_CONDITIONAL(HAVE_LIBYAML, test x$have_libyaml = xyes)
177+
AC_MSG_NOTICE([YAML configuration support: $have_libyaml])
177178
save_LIBS=$LIBS
178179
LIBS=
179180
AC_SEARCH_LIBS(clock_gettime, rt)

doc/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ EXTRA_DIST = \
289289
source/configuration/sysklogd_format.rst \
290290
source/configuration/templates.rst \
291291
source/configuration/timezone.rst \
292+
source/configuration/yaml_config.rst \
292293
source/containers/collector.rst \
293294
source/containers/development_images.rst \
294295
source/containers/dockerlogs.rst \

doc/source/configuration/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ configuration.
5454
percentile_stats
5555
converting_to_new_format
5656
conf_formats
57+
yaml_config
5758
sysklogd_format
5859

5960
Additional Resources

0 commit comments

Comments
 (0)