Merge pull request #187857 from Sohalt/remove-dd-agent

dd-agent: remove

4 files changed, 1 insertions, 139 deletions

diff --git a/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch b/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch
deleted file mode 100644
index 9897a76c957..00000000000
--- a/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/checks/system/unix.py b/checks/system/unix.py
-index c37af3c3..58c72626 100644
---- a/checks/system/unix.py
-+++ b/checks/system/unix.py
-@@ -39,7 +39,7 @@ class IO(Check):
-         self.value_re = re.compile(r'\d+\.\d+')
- 
-     def _parse_linux2(self, output):
--        recentStats = output.split('Device:')[2].split('\n')
-+        recentStats = output.split('Device')[2].split('\n')
-         header = recentStats[0]
-         headerNames = re.findall(self.header_re, header)
-         device = None
-@@ -123,14 +123,14 @@ class IO(Check):
- 
-                 #                 Linux 2.6.32-343-ec2 (ip-10-35-95-10)   12/11/2012      _x86_64_        (2 CPU)
-                 #
--                # Device:         rrqm/s   wrqm/s     r/s     w/s    rkB/s    wkB/s avgrq-sz avgqu-sz   await  svctm  %util
-+                # Device         rrqm/s   wrqm/s     r/s     w/s    rkB/s    wkB/s avgrq-sz avgqu-sz   await  svctm  %util
-                 # sda1              0.00    17.61    0.26   32.63     4.23   201.04    12.48     0.16    4.81   0.53   1.73
-                 # sdb               0.00     2.68    0.19    3.84     5.79    26.07    15.82     0.02    4.93   0.22   0.09
-                 # sdg               0.00     0.13    2.29    3.84   100.53    30.61    42.78     0.05    8.41   0.88   0.54
-                 # sdf               0.00     0.13    2.30    3.84   100.54    30.61    42.78     0.06    9.12   0.90   0.55
-                 # md0               0.00     0.00    0.05    3.37     1.41    30.01    18.35     0.00    0.00   0.00   0.00
-                 #
--                # Device:         rrqm/s   wrqm/s     r/s     w/s    rkB/s    wkB/s avgrq-sz avgqu-sz   await  svctm  %util
-+                # Device         rrqm/s   wrqm/s     r/s     w/s    rkB/s    wkB/s avgrq-sz avgqu-sz   await  svctm  %util
-                 # sda1              0.00     0.00    0.00   10.89     0.00    43.56     8.00     0.03    2.73   2.73   2.97
-                 # sdb               0.00     0.00    0.00    2.97     0.00    11.88     8.00     0.00    0.00   0.00   0.00
-                 # sdg               0.00     0.00    0.00    0.00     0.00     0.00     0.00     0.00    0.00   0.00   0.00
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix
deleted file mode 100644
index 6feaec38f70..00000000000
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, python2
-, unzip, makeWrapper }:
-let
-  python' = python2.override {
-    packageOverrides = self: super: {
-      docker = self.buildPythonPackage rec {
-        name = "docker-${version}";
-        version = "1.10.6";
-
-        src = fetchFromGitHub {
-          owner = "docker";
-          repo = "docker-py";
-          rev = version;
-          sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m";
-        };
-
-        propagatedBuildInputs = with self; [
-          six
-          requests
-          websocket-client
-          docker_pycreds
-          uptime
-        ] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];
-
-        # due to flake8
-        doCheck = false;
-      };
-
-      pymongo = super.pymongo.overridePythonAttrs (oldAttrs: rec {
-        version = "2.9.5";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "912516ac6a355d7624374a38337b8587afe3eb535c0a5456b3bd12df637a6e70";
-        };
-      });
-    };
-  };
-
-in stdenv.mkDerivation rec {
-  version = "5.11.2";
-  pname = "dd-agent";
-
-  src = fetchFromGitHub {
-    owner  = "datadog";
-    repo   = "dd-agent";
-    rev    = version;
-    sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx";
-  };
-
-  patches = [ ./40103-iostat-fix.patch ];
-
-  nativeBuildInputs = [ unzip makeWrapper ];
-  buildInputs = with python'.pkgs; [
-    requests
-    psycopg2
-    psutil
-    ntplib
-    simplejson
-    pyyaml
-    pymongo
-    python-etcd
-    consul
-    docker
-  ];
-  propagatedBuildInputs = with python'.pkgs; [ python tornado ];
-
-  buildCommand = ''
-    mkdir -p $out/bin
-    cp -R $src $out/agent
-    chmod u+w -R $out
-    (cd $out/agent; patchPhase)
-    PYTHONPATH=$out/agent:$PYTHONPATH
-    ln -s $out/agent/agent.py $out/bin/dd-agent
-    ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd
-    ln -s $out/agent/ddagent.py $out/bin/dd-forwarder
-
-    # Move out default conf.d so that /etc/dd-agent/conf.d is used
-    mv $out/agent/conf.d $out/agent/conf.d-system
-
-    cat > $out/bin/dd-jmxfetch <<EOF
-    #!/usr/bin/env bash
-    exec ${python'.interpreter} $out/agent/jmxfetch.py $@
-    EOF
-    chmod a+x $out/bin/dd-jmxfetch
-
-    wrapProgram $out/bin/dd-forwarder \
-      --prefix PYTHONPATH : $PYTHONPATH
-    wrapProgram $out/bin/dd-agent \
-      --prefix PYTHONPATH : $PYTHONPATH
-    wrapProgram $out/bin/dogstatsd \
-      --prefix PYTHONPATH : $PYTHONPATH
-    wrapProgram $out/bin/dd-jmxfetch \
-      --prefix PYTHONPATH : $PYTHONPATH
-
-    patchShebangs $out
-  '';
-
-  meta = {
-    description = ''
-      Event collector for the DataDog analysis service
-      -- v5 Python implementation
-    '';
-    homepage    = "https://www.datadoghq.com";
-    license     = lib.licenses.bsd3;
-    platforms   = lib.platforms.all;
-    maintainers = with lib.maintainers; [ thoughtpolice domenkozar ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 28c13ce1ee4..6abfacc7d72 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -309,6 +309,7 @@ mapAliases ({
   dbus_libs = throw "'dbus_libs' has been renamed to/replaced by 'dbus'"; # Converted to throw 2022-02-22
   dbus_tools = throw "'dbus_tools' has been renamed to/replaced by 'dbus.out'"; # Converted to throw 2022-02-22
   dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20
+  dd-agent = throw "dd-agent has been removed in favor of the newer datadog-agent"; # Added 2022-04-26
   ddar = throw "ddar has been removed: abandoned by upstream"; # Added 2022-03-18
   deadbeef-mpris2-plugin = throw "'deadbeef-mpris2-plugin' has been renamed to/replaced by 'deadbeefPlugins.mpris2'"; # Converted to throw 2022-02-22
   deadpixi-sam = deadpixi-sam-unstable;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3d0d25b8b1..c094df38748 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27122,7 +27122,6 @@ with pkgs;
 
   das_watchdog = callPackage ../tools/system/das_watchdog { };
 
-  dd-agent = callPackage ../tools/networking/dd-agent/5.nix { };
   datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix {
     pythonPackages = datadog-integrations-core {};
   };