Unverified Commit c93bca77 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

datadog-agent: 7.56.2 -> 7.70.2 (#418566)

parents 7cb5b82f 73bb91a5

pkgs/tools/networking/dd-agent/datadog-agent.nix

+11 −11
Original line number Diff line number Diff line
@@ -18,17 +18,17 @@ 


let

  # keep this in sync with github.com/DataDog/agent-payload dependency

  payloadVersion = "5.0.124";

  payloadVersion = "5.0.164";

  python = pythonPackages.python;

  owner = "DataDog";

  repo = "datadog-agent";

  goPackagePath = "github.com/${owner}/${repo}";

  version = "7.56.2";

  version = "7.70.2";



  src = fetchFromGitHub {

    inherit owner repo;

    rev = version;

    hash = "sha256-rU3eg92MuGs/6r7oJho2roeUCZoyfqYt1xOERoRPqmQ=";

    tag = version;

    hash = "sha256-yXtybHWrm+6kWW396FLlRZI0YVuThGuLfSYzoNXAEBU=";

  };

  rtloader = stdenv.mkDerivation {

    pname = "datadog-agent-rtloader";
@@ -49,11 +49,7 @@ buildGoModule rec { 


  doCheck = false;



  vendorHash =

    if stdenv.hostPlatform.isDarwin then

      "sha256-3Piq5DPMTZUEjqNkw5HZY25An2kATX6Jac9unQfZnZc="

    else

      "sha256-FR0Et3DvjJhbYUPy9mpN0QCJ7QDU4VRZFUTL0J1FSXw=";

  vendorHash = "sha256-iWOwhfSI7mLmDy6yewV0h9Y4pjYAV6Tz6TxsINOxYMg=";



  subPackages = [

    "cmd/agent"
@@ -67,10 +63,14 @@ buildGoModule rec { 
    makeWrapper

  ];

  buildInputs = [ rtloader ] ++ lib.optionals withSystemd [ systemd ];

  PKG_CONFIG_PATH = "${python}/lib/pkgconfig";



  proxyVendor = true;



  env.PKG_CONFIG_PATH = "${python}/lib/pkgconfig";



  tags = [

    "ec2"

    "kubelet"

    "python"

    "process"

    "log"
@@ -97,7 +97,7 @@ buildGoModule rec { 
  postPatch = ''

    sed -e "s|PyChecksPath =.*|PyChecksPath = filepath.Join(_here, \"..\", \"${python.sitePackages}\")|" \

        -e "s|distPath =.*|distPath = filepath.Join(_here, \"..\", \"share\", \"datadog-agent\")|" \

        -i cmd/agent/common/path/path_nix.go

        -i pkg/util/defaultpaths/path_nix.go

    sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \

        -i pkg/util/hostname/fqdn_nix.go

  '';

pkgs/tools/networking/dd-agent/integrations-core.nix

+5 −11
Original line number Diff line number Diff line
@@ -42,14 +42,14 @@ 


let

  inherit (lib) attrValues mapAttrs;

  version = "7.70.2";



  src = fetchFromGitHub {

    owner = "DataDog";

    repo = "integrations-core";

    rev = version;

    sha256 = "sha256-p5eoNNHQQl314mfUk2t3qQaerPu02GKA+tKkAY7bojk=";

    tag = version;

    hash = "sha256-3H8nQpy/m53ZjtDfe6s89yowBXnPt+1ARfWxcx+JwQM=";

  };

  version = "7.56.2";



  # Build helper to build a single datadog integration package.

  buildIntegration =
@@ -75,19 +75,13 @@ let 
    pname = "checks-base";

    sourceRoot = "datadog_checks_base";



    # Make setuptools build the 'base' and 'checks' modules.

    postPatch = ''

      substituteInPlace setup.py \

        --replace "from setuptools import setup" "from setuptools import find_packages, setup" \

        --replace "packages=['datadog_checks']" "packages=find_packages()"

    '';



    propagatedBuildInputs = with python3Packages; [

    dependencies = with python3Packages; [

      binary

      cachetools

      cryptography

      immutables

      jellyfish

      lazy-loader

      prometheus-client

      protobuf

      pydantic