Config-related metrics #4420
Merged
Config-related metrics #4420
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bazsi
reviewed
Apr 12, 2023
bazsi
reviewed
Apr 12, 2023
|
This is a cool feature. The only question I have was about using git commit ids in place of |
The GlobalConfig ID consists of an optional user-supplied ID and the SHA256 hash of the full preprocessed configuration. The user-supplied part can be specified using the `@config-id` pragma, for example: @config-id: cfg-20230404-13-ge1602deee Signed-off-by: László Várady <laszlo.varady@anno.io>
Signed-off-by: László Várady <laszlo.varady@anno.io>
|
I've added a It might sound like a terrible overkill, but I think this unit will be useful in the future (we may want to do some additional clever actions when detecting a configuration change on disk). |
…econds" Signed-off-by: László Várady <laszlo.varady@anno.io>
MrAnno
added a commit
to MrAnno/syslog-ng
that referenced
this pull request
Apr 12, 2023
Signed-off-by: László Várady <laszlo.varady@anno.io>
|
@kira-syslogng do stresstest |
|
I've updated the PR description according to my changes. |
This class can be used to be notified about config file changes on the disk. Currently, only the main config file is monitored, and the modification event is emitted based on st_mtime. Signed-off-by: László Várady <laszlo.varady@anno.io>
…onds" Signed-off-by: László Várady <laszlo.varady@anno.io>
Signed-off-by: László Várady <laszlo.varady@anno.io>
|
@kira-syslogng do stresstest |
|
Kira-stress-test: Build SUCCESS |
alltilla
approved these changes
Apr 18, 2023
Comment on lines
+643
to
+649
| static void | ||
| _cfg_file_modified(const CfgMonitorEvent *event, gpointer c) | ||
| { | ||
| MainLoop *self = (MainLoop *) c; | ||
|
|
||
| stats_counter_set(self->metrics.last_cfgfile_mtime, (gsize) event->st.st_mtime); | ||
| } |
There was a problem hiding this comment.
[nitpick]
I would add a check for event->event == MODIFIED, just to be sure we do not break this accidentally in the future.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New configuration-related metrics
The main config file is monitored by
CfgMonitorwith inotify.If inotify fails or is not available, the config is polled every 15 minutes.
syslog-ng configuration identifier
A new syslog-ng configuration keyword has been added, which allows specifying a config identifier. For example:
This keyword can be used for config identification in managed environments, where syslog-ng instances and their
configuration are deployed/generated automatically.
syslog-ng-ctl config --idcan be used to query the active configuration ID and the SHA256 hash of the full"preprocessed" syslog-ng configuration. For example: