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

Merge pull request #258801 from Izorkin/fix-netdata

parents 9523d16a 4b3012c5

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -398,6 +398,8 @@ The module update takes care of the new config syntax and the data itself (user 


- Suricata was upgraded from 6.0 to 7.0 and no longer considers HTTP/2 support as experimental, see [upstream release notes](https://forum.suricata.io/t/suricata-7-0-0-released/3715) for more details.



- Cloud support in the `netdata` package is now disabled by default. To enable it use the `netdataCloud` package.



- `networking.nftables` now has the option `networking.nftables.table.<table>` to create tables

  and have them be updated atomically, instead of flushing the ruleset.

pkgs/tools/system/netdata/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 
, CoreFoundation, IOKit, libossp_uuid

, nixosTests

, netdata-go-plugins

, bash, curl, jemalloc, libuv, zlib, libyaml

, bash, curl, jemalloc, json_c, libuv, zlib, libyaml

, libcap, libuuid, lm_sensors, protobuf

, withCups ? false, cups

, withDBengine ? true, lz4

, withIpmi ? (!stdenv.isDarwin), freeipmi

, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct

, withCloud ? (!stdenv.isDarwin), json_c

, withCloud ? false

, withCloudUi ? false

, withConnPubSub ? false, google-cloud-cpp, grpc

, withConnPrometheus ? false, snappy
@@ -42,14 +42,13 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ];

  # bash is only used to rewrite shebangs

  buildInputs = [ bash curl jemalloc libuv zlib libyaml ]

  buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml ]

    ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ]

    ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ]

    ++ lib.optionals withCups [ cups ]

    ++ lib.optionals withDBengine [ lz4 ]

    ++ lib.optionals withIpmi [ freeipmi ]

    ++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ]

    ++ lib.optionals withCloud [ json_c ]

    ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ]

    ++ lib.optionals withConnPrometheus [ snappy ]

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

pkgs/top-level/all-packages.nix

+4 −0
Original line number Diff line number Diff line
@@ -10263,6 +10263,10 @@ with pkgs; 
    inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;

    protobuf = protobuf3_21;

  };

  netdataCloud = netdata.override {

    withCloud = !stdenv.isDarwin;

    withCloudUi = true;

  };

  # Exposed here so the bots can auto-upgrade it

  netdata-go-plugins = callPackage ../tools/system/netdata/go.d.plugin.nix { };