datadog: fix python integration

sohalt 6f065481 5524cbd1

+36 -9
+19 -6
pkgs/tools/networking/dd-agent/datadog-agent.nix
··· 1 { lib 2 , stdenv 3 , buildGoModule 4 , makeWrapper 5 , fetchFromGitHub ··· 18 owner = "DataDog"; 19 repo = "datadog-agent"; 20 goPackagePath = "github.com/${owner}/${repo}"; 21 - 22 - in buildGoModule rec { 23 - pname = "datadog-agent"; 24 version = "7.36.0"; 25 26 src = fetchFromGitHub { ··· 28 rev = version; 29 sha256 = "sha256-pkbgYE58T9QzV7nCzvfBoTt6Ue8cCMUBSuCBeDtdkzo="; 30 }; 31 32 vendorSha256 = "sha256-SxdSoZtRAdl3evCpb+3BHWf/uPYJJKgw0CL9scwNfGA="; 33 ··· 41 42 43 nativeBuildInputs = [ pkg-config makeWrapper ]; 44 - buildInputs = lib.optionals withSystemd [ systemd ]; 45 PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; 46 47 tags = [ 48 "ec2" 49 - "cpython" 50 "process" 51 "log" 52 "secrets" ··· 58 "-X ${goPackagePath}/pkg/version.Commit=${src.rev}" 59 "-X ${goPackagePath}/pkg/version.AgentVersion=${version}" 60 "-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}" 61 - "-X ${goPackagePath}/pkg/collector/py.pythonHome=${python}" 62 "-r ${python}/lib" 63 ]; 64
··· 1 { lib 2 , stdenv 3 + , cmake 4 , buildGoModule 5 , makeWrapper 6 , fetchFromGitHub ··· 19 owner = "DataDog"; 20 repo = "datadog-agent"; 21 goPackagePath = "github.com/${owner}/${repo}"; 22 version = "7.36.0"; 23 24 src = fetchFromGitHub { ··· 26 rev = version; 27 sha256 = "sha256-pkbgYE58T9QzV7nCzvfBoTt6Ue8cCMUBSuCBeDtdkzo="; 28 }; 29 + rtloader = stdenv.mkDerivation { 30 + pname = "datadog-agent-rtloader"; 31 + src = "${src}/rtloader"; 32 + inherit version; 33 + nativeBuildInputs = [ cmake ]; 34 + buildInputs = [ python ]; 35 + cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; 36 + }; 37 + 38 + in buildGoModule rec { 39 + pname = "datadog-agent"; 40 + inherit src version; 41 + 42 + doCheck = false; 43 44 vendorSha256 = "sha256-SxdSoZtRAdl3evCpb+3BHWf/uPYJJKgw0CL9scwNfGA="; 45 ··· 53 54 55 nativeBuildInputs = [ pkg-config makeWrapper ]; 56 + buildInputs = [rtloader] ++ lib.optionals withSystemd [ systemd ]; 57 PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; 58 59 tags = [ 60 "ec2" 61 + "python" 62 "process" 63 "log" 64 "secrets" ··· 70 "-X ${goPackagePath}/pkg/version.Commit=${src.rev}" 71 "-X ${goPackagePath}/pkg/version.AgentVersion=${version}" 72 "-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}" 73 + "-X ${goPackagePath}/pkg/collector/python.pythonHome3=${python}" 74 + "-X ${goPackagePath}/pkg/config.DefaultPython=3" 75 "-r ${python}/lib" 76 ]; 77
+17 -3
pkgs/tools/networking/dd-agent/integrations-core.nix
··· 65 pname = "checks-base"; 66 sourceRoot = "datadog_checks_base"; 67 propagatedBuildInputs = with python.pkgs; [ 68 - requests protobuf prometheus-client simplejson uptime 69 ]; 70 }; 71 ··· 75 mongo = (ps: [ ps.pymongo ]); 76 network = (ps: [ ps.psutil ]); 77 nginx = (ps: []); 78 - postgres = (ps: with ps; [ pg8000 psycopg2 ]); 79 - process = (ps: []); 80 }; 81 82 # All integrations (default + extra):
··· 65 pname = "checks-base"; 66 sourceRoot = "datadog_checks_base"; 67 propagatedBuildInputs = with python.pkgs; [ 68 + cachetools 69 + cryptography 70 + immutables 71 + jellyfish 72 + prometheus-client 73 + protobuf 74 + pydantic 75 + python-dateutil 76 + pyyaml 77 + requests 78 + requests-toolbelt 79 + requests-unixsocket 80 + simplejson 81 + uptime 82 + wrapt 83 ]; 84 }; 85 ··· 89 mongo = (ps: [ ps.pymongo ]); 90 network = (ps: [ ps.psutil ]); 91 nginx = (ps: []); 92 + postgres = (ps: with ps; [ pg8000 psycopg2 semver ]); 93 + process = (ps: [ ps.psutil]); 94 }; 95 96 # All integrations (default + extra):