diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2023-11-08 13:30:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-08 13:30:43 +0100 |
| commit | bc2b72df73a639f57438c6c98121ddd737f87786 (patch) | |
| tree | f94f35911a4c7839c60ee19711397246f257ed75 /nixos | |
| parent | 408ed815c60c448886d489837e760264efcc4388 (diff) | |
| parent | f872c3a648b7b27d814fee01199e890412878e81 (diff) | |
| download | nixpkgs-bc2b72df73a639f57438c6c98121ddd737f87786.tar nixpkgs-bc2b72df73a639f57438c6c98121ddd737f87786.tar.gz nixpkgs-bc2b72df73a639f57438c6c98121ddd737f87786.tar.bz2 nixpkgs-bc2b72df73a639f57438c6c98121ddd737f87786.tar.lz nixpkgs-bc2b72df73a639f57438c6c98121ddd737f87786.tar.xz nixpkgs-bc2b72df73a639f57438c6c98121ddd737f87786.tar.zst nixpkgs-bc2b72df73a639f57438c6c98121ddd737f87786.zip | |
Merge pull request #264234 from guiguid/guiguid-patch-netdata-systemd-journal
netdata: 1.43.0 -> 1.43.2 and add systemd-journal plugin
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/monitoring/netdata.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 3833418b5ad..de0e044453e 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -12,6 +12,7 @@ let ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin + ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin ''; plugins = [ @@ -254,7 +255,7 @@ in { # Capabilities CapabilityBoundingSet = [ "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins - "CAP_DAC_READ_SEARCH" # is required for apps plugin + "CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin "CAP_FOWNER" # is required for freeipmi plugin "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins "CAP_SYS_ADMIN" # is required for perf plugin @@ -263,6 +264,7 @@ in { "CAP_NET_RAW" # is required for fping app "CAP_SYS_CHROOT" # is required for cgroups plugin "CAP_SETUID" # is required for cgroups and cgroups-network plugins + "CAP_SYSLOG" # is required for systemd-journal plugin ]; # Sandboxing ProtectSystem = "full"; @@ -318,6 +320,14 @@ in { permissions = "u+rx,g+x,o-rwx"; }; + "systemd-journal.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org"; + capabilities = "cap_dac_read_search,cap_syslog+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; + "slabinfo.plugin" = { source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org"; capabilities = "cap_dac_override+ep"; |