Unverified Commit bc2b72df authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #264234 from guiguid/guiguid-patch-netdata-systemd-journal 

netdata: 1.43.0 -> 1.43.2 and add systemd-journal plugin
parents 408ed815 f872c3a6

nixos/modules/services/monitoring/netdata.nix

+11 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/tools/system/netdata/default.nix

+11 −3
Original line number Diff line number Diff line
@@ -13,12 +13,13 @@ 
, withConnPubSub ? false, google-cloud-cpp, grpc

, withConnPrometheus ? false, snappy

, withSsl ? true, openssl

, withSystemdJournal ? (!stdenv.isDarwin), systemd

, withDebug ? false

}:



stdenv.mkDerivation rec {

  # Don't forget to update go.d.plugin.nix as well

  version = "1.43.0";

  version = "1.43.2";

  pname = "netdata";



  src = fetchFromGitHub {
@@ -26,8 +27,8 @@ stdenv.mkDerivation rec { 
    repo = "netdata";

    rev = "v${version}";

    hash = if withCloudUi

      then "sha256-hrwuJLO9/K5QT3j8d5RYHcpBHChpKvwajaCoUfikw88="

      else "sha256-+bX6pVpW6N1ms04k63sJg0E9XMOai5K9IjEQPeVCzs8=";

      then "sha256-ZhSuU2VTJPFJ3ja5eHx5uTuR19LleoID8Efr9FTyg74="

      else "sha256-t2awo118mYbuoNiKiAxM5xpRmQSha+/NR5G+shsotek=";

    fetchSubmodules = true;



    # Remove v2 dashboard distributed under NCUL1. Make sure an empty
@@ -52,6 +53,7 @@ stdenv.mkDerivation rec { 
    ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ]

    ++ lib.optionals withConnPrometheus [ snappy ]

    ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ]

    ++ lib.optionals withSystemdJournal [ systemd ]

    ++ lib.optionals withSsl [ openssl ];



  patches = [
@@ -93,6 +95,10 @@ stdenv.mkDerivation rec { 
       $out/libexec/netdata/plugins.d/perf.plugin.org

    mv $out/libexec/netdata/plugins.d/slabinfo.plugin \

       $out/libexec/netdata/plugins.d/slabinfo.plugin.org

    ${lib.optionalString withSystemdJournal ''

      mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \

         $out/libexec/netdata/plugins.d/systemd-journal.plugin.org

    ''}

    ${lib.optionalString withIpmi ''

      mv $out/libexec/netdata/plugins.d/freeipmi.plugin \

         $out/libexec/netdata/plugins.d/freeipmi.plugin.org
@@ -109,6 +115,8 @@ stdenv.mkDerivation rec { 
    "--sysconfdir=/etc"

    "--disable-ebpf"

    "--with-jemalloc=${jemalloc}"

  ] ++ lib.optionals (withSystemdJournal) [

    "--enable-plugin-systemd-journal"

  ] ++ lib.optionals (!withDBengine) [

    "--disable-dbengine"

  ] ++ lib.optionals (!withCloud) [

pkgs/tools/system/netdata/go.d.plugin.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


buildGo121Module rec {

  pname = "netdata-go-plugins";

  version = "0.56.3";

  version = "0.56.4";



  src = fetchFromGitHub {

    owner = "netdata";

    repo = "go.d.plugin";

    rev = "v${version}";

    hash = "sha256-T7UB7qrcMTqIFRzBxbXmSqtcEFgZd0/z4EYuH/ydVi4=";

    hash = "sha256-7dR1TL2Ycb+7yHoFklrKdXXxIG4Tx+fAG5ScAAtbVRw=";

  };



  vendorHash = "sha256-N0p03urHC3d17VQ4TIs7mAemW9ZSpQw20EwwD6lSLLc=";

  vendorHash = "sha256-Faa+7tT3sPxlT6eQEmFotOJnt9b49ffDPEHt5V7tQa0=";



  doCheck = false;