diff options
author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-06-03 12:27:56 +0100 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-06-03 12:27:56 +0100 |
commit | dcf171bc79c99ef1326136b5eb49fd81525d6ec5 (patch) | |
tree | 36badc2a3f87d578c9d73681e75d97bf42e0fa4f /pkgs/tools | |
parent | 668556331b78b67ca3278a6d7a33af9c6a392c7a (diff) | |
download | nixlib-dcf171bc79c99ef1326136b5eb49fd81525d6ec5.tar nixlib-dcf171bc79c99ef1326136b5eb49fd81525d6ec5.tar.gz nixlib-dcf171bc79c99ef1326136b5eb49fd81525d6ec5.tar.bz2 nixlib-dcf171bc79c99ef1326136b5eb49fd81525d6ec5.tar.lz nixlib-dcf171bc79c99ef1326136b5eb49fd81525d6ec5.tar.xz nixlib-dcf171bc79c99ef1326136b5eb49fd81525d6ec5.tar.zst nixlib-dcf171bc79c99ef1326136b5eb49fd81525d6ec5.zip |
Revert "dd-agent: 5.11.2 -> 5.13.2 + service rework"
This reverts commit af096c8bff1e534be9c69f50eed13e6b48427d0e.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/dd-agent/default.nix | 57 |
1 files changed, 12 insertions, 45 deletions
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 2556287570fd..d1171a3c8355 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,11 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages -, sysstat, unzip, makeWrapper -# We need extraBuildInputs as we want to be able to override this -# package with python packages _and_ have the produced binaries -# wrapper with their PYTHONPATH. This means overrideAttrs is not -# strong enough (it overrides too late), we need to call it -# beforehand. -, extraBuildInputs ? [ pythonPackages.psutil ] }: +, sysstat, unzip, makeWrapper }: let inherit (pythonPackages) python; docker_1_10 = pythonPackages.buildPythonPackage rec { @@ -32,42 +26,33 @@ let # due to flake8 doCheck = false; }; - version = "5.13.2"; - - integrations = fetchFromGitHub { - owner = "datadog"; - repo = "integrations-core"; - rev = version; - sha256 = "1nbjmkq0wdfndmx0qap69h2rkwkkb0632j87h9d3j99bykyav3y3"; - }; in stdenv.mkDerivation rec { + version = "5.11.2"; name = "dd-agent-${version}"; src = fetchFromGitHub { owner = "datadog"; repo = "dd-agent"; rev = version; - sha256 = "0x2bxi70l2yf0wi232qksvcscjdpjg8l7dmgg1286vqryyfazfjb"; + sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx"; }; buildInputs = [ python unzip makeWrapper - pythonPackages.boto - docker_1_10 - pythonPackages.kazoo - pythonPackages.ntplib - pythonPackages.consul - pythonPackages.python-etcd - pythonPackages.pyyaml pythonPackages.requests + pythonPackages.psycopg2 + pythonPackages.psutil + pythonPackages.ntplib pythonPackages.simplejson - pythonPackages.supervisor - pythonPackages.tornado - pythonPackages.uptime - ] ++ extraBuildInputs; + pythonPackages.pyyaml + pythonPackages.pymongo_2_9_1 + pythonPackages.python-etcd + pythonPackages.consul + docker_1_10 + ]; propagatedBuildInputs = with pythonPackages; [ python tornado ]; buildCommand = '' @@ -82,24 +67,6 @@ in stdenv.mkDerivation rec { # Move out default conf.d so that /etc/dd-agent/conf.d is used mv $out/agent/conf.d $out/agent/conf.d-system - # Sometime between 5.11.2 and 5.13.2 datadog moved out all its - # checks into separate repository. Copy them back in so dd-agent - # service can easily pick and choose by copying out configs into - # its etc files. - mkdir -p $out/agent/checks.d - for i in ${toString integrations}/* # */ - do - if [ -f "$i/check.py" ]; then - if [ -f "$i/conf.yaml.default" -o -f "$i/conf.yaml.example" ]; then - local name=$(basename $i) - cp $i/check.py $out/agent/checks.d/$name.py - # Copy .default file first unless it doesn't exist then copy .default - cp $i/conf.yaml.default $out/agent/conf.d-system/$name.yaml &> /dev/null || \ - cp $i/conf.yaml.example $out/agent/conf.d-system/$name.yaml - fi - fi - done - cat > $out/bin/dd-jmxfetch <<EOF #!/usr/bin/env bash exec ${python}/bin/python $out/agent/jmxfetch.py $@ |