Commit graph

40 commits

Author SHA1 Message Date
Mateusz Kowalczyk dcf171bc79 Revert "dd-agent: 5.11.2 -> 5.13.2 + service rework"
This reverts commit af096c8bff.
2017-06-03 12:27:56 +01:00
Mateusz Kowalczyk 668556331b Revert "datadog: Properly use configured package."
This reverts commit 50f53da9ef.
2017-06-03 12:27:43 +01:00
Mateusz Kowalczyk 50f53da9ef datadog: Properly use configured package. 2017-06-02 08:16:47 +01:00
Mateusz Kowalczyk af096c8bff dd-agent: 5.11.2 -> 5.13.2 + service rework 2017-06-01 15:08:50 +01:00
Frederik Rietdijk ef4442e827 Python: replace requests2 with requests tree-wide
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
2017-05-07 12:56:09 +02:00
Rob Vermaas a9f054c834
dd-agent: Add default config files of dd-agent and auto_conf dir
to /etc/dd-agent/conf.d by default, and make sure
/etc/dd-agent/conf.d is used.

Before NixOS 17.03, we were using dd-agent 5.5.X which
used configuration from /etc/dd-agent/conf.d

In NixOS 17.03 the default conf.d location is first used relative,
meaning that $out/agent/conf.d was used without NixOS overrides.

This change implements similar functionality as PR #25288, without
breaking backwards compatibility.

(cherry picked from commit 77c85b0ecbc1070d7adff31b339bede92e4193fa)
2017-05-04 09:47:21 +00:00
Rob Vermaas 35dfdc9277
dd-agent: fix by adding uptime as dependency.
(cherry picked from commit f79be2cfa321617314aa253a8a6341a2f0ab7816)
2017-03-29 14:56:01 +00:00
Sander van der Burg 20194e2696 dd-agent: bind to pymongo 2.9.1 to fix the MongoDB monitoring 2017-03-20 10:42:43 +01:00
Susan Potter 35f9f63a39 dd-agent: 5.5.2 -> 5.11.2 2017-03-10 17:35:27 +01:00
Susan Potter 17a8d19032 dd-agent: fix Python missing dependencies and versions 2017-03-10 17:35:27 +01:00
Rob Vermaas cfd62a1045 dd-agent: D'oh, removing duplicate requests dep.
(cherry picked from commit acf91fd6efb39f712f1f1a394633c78382005340)
2016-09-30 13:24:19 +00:00
Rob Vermaas a98dccf1e4 Fix dd-agent
(cherry picked from commit a6493ce4bdc47cbe3bc4ea74323f11f610e18c04)
2016-09-30 13:15:23 +00:00
Rob Vermaas 9494b764d2 dd-agent: support jmx, needs a separate daemon nowadays.
(cherry picked from commit 1425a1f964adc2e2eb668810f3f158089035cd3d)
2016-07-29 12:42:07 +00:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Jaka Hudoklin 4acbfe7d9a dd-agent: add docker support 2015-11-16 13:46:19 +01:00
Jaka Hudoklin b4ece28aac dd-agent: 5.4.3 -> 5.5.2 2015-11-16 13:46:06 +01:00
Sander van der Burg dc2a6e3d3d dd-agent: Add support for MongoDB monitoring 2015-08-03 09:09:52 +00:00
Austin Seipp cbf14b9d8f nixpkgs: dd-agent 5.2.3 -> 5.4.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
Susan Potter 727565279f Fix dd-agent buildInputs to include pythonPackages.psutil
When deploying current master version journalctl showed ImportErrors in the logs with message:
'No module named psutil' and systemctl dd-agent service failed to start. To fix I added
pythonPackages.psutil as a buildInputs entry and this fixed the issue.

See this Gist for journalctl errors for reference:
https://gist.github.com/mbbx6spp/59eefabbe708c335a31f
2015-06-01 13:54:13 -05:00
Austin Seipp c07cce40a4 nixpkgs: dd-agent 5.1.1 -> 5.2.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-02 16:27:51 -05:00
Rob Vermaas 87b9925f23 Update dd-agent to 5.1.1
(cherry picked from commit 7f02b1f35042f6ac345933bd3823439535a95234)
2015-01-05 13:15:36 +01:00
Rob Vermaas 6ae8983a5e Update dd-agent to 4.4.0 2014-12-03 16:08:39 +01:00
Austin Seipp 80f3e943b1 dd-agent: 4.2.1 -> 4.3.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-06 23:14:54 -05:00
Eelco Dolstra 6aeb59bbe0 Rename fetchGitHub -> fetchFromGitHub
We're not fetching all of GitHub, after all.
2014-05-08 15:49:39 +02:00
Eelco Dolstra ebd8573046 Add a utility function "fetchGitHub"
This is a small wrapper around fetchzip. It allows you to say:

  src = fetchGitHub {
    owner = "NixOS";
    repo = "nix";
    rev = "924e19341a5ee488634bc9ce1ea9758ac496afc3"; # or a tag
    sha256 = "1ld1jc26wy0smkg63chvdzsppfw6zy1ykf3mmc50hkx397wcbl09";
  };
2014-05-08 15:30:18 +02:00
Eelco Dolstra c8df888858 Add a function "fetchzip"
This function downloads and unpacks a file in one fixed-output
derivation. This is primarily useful for dynamically generated zip
files, such as GitHub's /archive URLs, where the unpacked content of
the zip file doesn't change, but the zip file itself may (e.g. due to
minor changes in the compression algorithm, or changes in timestamps).

Fetchzip is implemented by extending fetchurl with a "postFetch" hook
that is executed after the file has been downloaded. This hook can
thus perform arbitrary checks or transformations on the downloaded
file.
2014-05-08 15:30:17 +02:00
Eelco Dolstra 2a43a4163a Fix indentation 2014-05-08 15:30:17 +02:00
Austin Seipp 368a677c97 nixos: overhaul datadog module
This overhauls the Datadog module a bit to be much more useful. In
particular, it adds support for nginx and postgresql monitoring
integrations to dd-agent. These have to exist in separate files under
/etc/dd-agent, so the module just exposes then as separate options. In
the future, more integrations could be added this way.

In the process of doing this, I also had to rename the dd-agent user to
datadog. Note the UIDs did not change, so this is strictly backwards
compatible. The reason for this is to make it easier to create a
'datadog' postgres user with access to pg_stats, as 'dd-agent' typically
isn't a valid username. This allows the out of the box configurations to
be used.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 01:24:35 -05:00
Rob Vermaas 1b2b9761b4 dd-agent: update from 4.2.0 to 4.2.1 2014-04-22 15:47:06 +02:00
Rob Vermaas a4ebaa61e4 Update dd-agent to 4.2.0 2014-04-08 09:27:09 +02:00
Shea Levy ca116f76f9 Unmaintain a bunch of packages
Trying to take maintainership more seriously...

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 22:34:41 -05:00
Rob Vermaas bd0d2aa149 Update dd-agent to 4.0.1 2013-12-23 15:49:54 +01:00
Domen Kozar 58975755ea add bpython 2013-07-08 20:58:44 +02:00
Domen Kozar efa4aac21e dd-agent: ab14fde6f9 -> 3.8.0 2013-06-29 18:46:37 +02:00
Shea Levy e11365c0a5 dd-agent: No need to propagate sysstat, dd-agent doesn't belong in user profiles anyway 2013-01-08 16:17:21 -05:00
Shea Levy a23c70c492 dd-agent: Add meta 2013-01-08 12:55:55 -05:00
Shea Levy 76076ea9cf dd-agent: Propagate sysstat 2013-01-08 12:48:24 -05:00
Shea Levy bc2e957308 dd-agent: Add python so patchShebangs can patch python scripts 2013-01-08 12:42:11 -05:00
Shea Levy 4b2632e54a dd-agent: Move /usr stuff to directly 2013-01-08 12:35:41 -05:00
Shea Levy 74c92f5f4a First attempt at packaging dd-agent 2013-01-08 12:32:47 -05:00