Merge pull request #136109 from john-consumable/master
This commit is contained in:
Sandro
GitHub
commit
a79648dd7f
|
|
@ -927,6 +927,19 @@ Superuser created successfully.
|
|||
file</link> format.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>datadog-agent</literal>,
|
||||
<literal>datadog-integrations-core</literal> and
|
||||
<literal>datadog-process-agent</literal> packages were
|
||||
upgraded from 6.11.2 to 7.30.2, git-2018-09-18 to 7.30.1 and
|
||||
6.11.1 to 7.30.2, respectively. As a result
|
||||
<literal>services.datadog-agent</literal> has had breaking
|
||||
changes to the configuration file. For details, see the
|
||||
<link xlink:href="https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst">upstream
|
||||
changelog</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-notable-changes">
|
||||
|
|
|
|||
|
|
@ -271,6 +271,11 @@ To be able to access the web UI this port needs to be opened in the firewall.
|
|||
|
||||
- The `todoman` package was upgraded from 3.9.0 to 4.0.0. This introduces breaking changes in the [configuration file](https://todoman.readthedocs.io/en/stable/configure.html#configuration-file) format.
|
||||
|
||||
- The `datadog-agent`, `datadog-integrations-core` and `datadog-process-agent` packages
|
||||
were upgraded from 6.11.2 to 7.30.2, git-2018-09-18 to 7.30.1 and 6.11.1 to 7.30.2,
|
||||
respectively. As a result `services.datadog-agent` has had breaking changes to the
|
||||
configuration file. For details, see the [upstream changelog](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst).
|
||||
|
||||
## Other Notable Changes {#sec-release-21.11-notable-changes}
|
||||
|
||||
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ in {
|
|||
options.services.datadog-agent = {
|
||||
enable = mkOption {
|
||||
description = ''
|
||||
Whether to enable the datadog-agent v6 monitoring service
|
||||
Whether to enable the datadog-agent v7 monitoring service
|
||||
'';
|
||||
default = false;
|
||||
type = types.bool;
|
||||
|
|
@ -61,7 +61,7 @@ in {
|
|||
default = pkgs.datadog-agent;
|
||||
defaultText = "pkgs.datadog-agent";
|
||||
description = ''
|
||||
Which DataDog v6 agent package to use. Note that the provided
|
||||
Which DataDog v7 agent package to use. Note that the provided
|
||||
package is expected to have an overridable `pythonPackages`-attribute
|
||||
which configures the Python environment with the Datadog
|
||||
checks.
|
||||
|
|
@ -274,7 +274,7 @@ in {
|
|||
path = [ ];
|
||||
script = ''
|
||||
export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
|
||||
${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml
|
||||
${pkgs.datadog-process-agent}/bin/process-agent --config /etc/datadog-agent/datadog.yaml
|
||||
'';
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
To update datadog-agent v6 (v5 is deprecated and should be removed):
|
||||
|
||||
1. Bump `version`, `rev`, `sha256` and `payloadVersion` in `datadog-agent.nix`
|
||||
2. `git clone https://github.com/DataDog/datadog-agent.git && cd datadog-agent`
|
||||
3. `git checkout <tag>`
|
||||
4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz`
|
||||
5. `dep2nix`
|
||||
6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix`
|
||||
|
||||
To update datadog-process-agent:
|
||||
|
||||
1. Bump `version`, `rev` and `sha256` in `datadog-process-agent.nix`
|
||||
2. `git clone https://github.com/DataDog/datadog-process-agent.git && cd datadog-process-agent`
|
||||
3. `git checkout <tag>`
|
||||
4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz`
|
||||
5. `dep2nix`
|
||||
6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix`
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,22 +1,25 @@
|
|||
{ lib, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }:
|
||||
{ lib, buildGoModule, makeWrapper, fetchFromGitHub, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }:
|
||||
|
||||
let
|
||||
# keep this in sync with github.com/DataDog/agent-payload dependency
|
||||
payloadVersion = "4.7.1";
|
||||
payloadVersion = "4.78.0";
|
||||
python = pythonPackages.python;
|
||||
|
||||
in buildGoPackage rec {
|
||||
pname = "datadog-agent";
|
||||
version = "6.11.2";
|
||||
owner = "DataDog";
|
||||
repo = "datadog-agent";
|
||||
goPackagePath = "github.com/${owner}/${repo}";
|
||||
|
||||
in buildGoModule rec {
|
||||
pname = "datadog-agent";
|
||||
version = "7.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = version;
|
||||
sha256 = "1dwdiaf357l9c6b2cps5mdyfma3c1mp96zzxg1826fvz3x8ix68z";
|
||||
rev = version;
|
||||
sha256 = "17ahrxhb87sj7f04wg44xv4k9wrlvf04j92ac5936a6maygp01rd";
|
||||
};
|
||||
|
||||
vendorSha256 = "06ryy501vibc6n14qwg94394c76l060525y6qg261qb748mbi8qi";
|
||||
|
||||
subPackages = [
|
||||
"cmd/agent"
|
||||
"cmd/cluster-agent"
|
||||
|
|
@ -24,15 +27,12 @@ in buildGoPackage rec {
|
|||
"cmd/py-launcher"
|
||||
"cmd/trace-agent"
|
||||
];
|
||||
goDeps = ./datadog-agent-deps.nix;
|
||||
goPackagePath = "github.com/${owner}/${repo}";
|
||||
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [ systemd ];
|
||||
PKG_CONFIG_PATH = "${python}/lib/pkgconfig";
|
||||
|
||||
|
||||
preBuild = let
|
||||
ldFlags = lib.concatStringsSep " " [
|
||||
"-X ${goPackagePath}/pkg/version.Commit=${src.rev}"
|
||||
|
|
@ -43,6 +43,8 @@ in buildGoPackage rec {
|
|||
];
|
||||
in ''
|
||||
buildFlagsArray=( "-tags" "ec2 systemd cpython process log secrets ${lib.concatStringsSep " " extraTags}" "-ldflags" "${ldFlags}")
|
||||
# Keep directories to generate in sync with tasks/go.py
|
||||
go generate ./pkg/status ./cmd/agent/gui
|
||||
'';
|
||||
|
||||
# DataDog use paths relative to the agent binary, so fix these.
|
||||
|
|
@ -61,7 +63,7 @@ in buildGoPackage rec {
|
|||
cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent
|
||||
cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages}
|
||||
|
||||
cp -R $src/pkg/status/dist/templates $out/share/datadog-agent
|
||||
cp -R $src/pkg/status/templates $out/share/datadog-agent
|
||||
|
||||
wrapProgram "$out/bin/agent" \
|
||||
--set PYTHONPATH "$out/${python.sitePackages}" \
|
||||
|
|
|
|||
|
|
@ -1,669 +0,0 @@
|
|||
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "bitbucket.org/ww/goautoneg";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/adjust/goautoneg";
|
||||
rev = "d788f35a0315672bc90f50a6145d1252a230ee0d";
|
||||
sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/agent-payload";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/agent-payload";
|
||||
rev = "f0521943f60221829c6bb5de1c7f788cd4411372";
|
||||
sha256 = "19m3kiwi0g2a0rysjabrb2nkkz7yx632g7s05mylv1x2ixparhrg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/datadog-agent";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/datadog-agent";
|
||||
rev = "d7712d570b91f4f97af9f155ad1c676921d8325d";
|
||||
sha256 = "1gi921z79la4hjhm8xhl4jz167200qljvhhsy4blj4vinkgfpm8w";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/datadog-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/datadog-go";
|
||||
rev = "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d";
|
||||
sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/gopsutil";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/gopsutil";
|
||||
rev = "233cd0cf42c26d835ed6f0e46f2103432a88b526";
|
||||
sha256 = "0rvxs1jjzv3j834dns28zr25bznarjmpgdy0z6gpimnq5nyicys5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/viper";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/viper";
|
||||
rev = "v1.5.0";
|
||||
sha256 = "1sv0xvmfaif7zpfwk0j6qf11hxnfdsb2zfj63b9zx7l0zzhjzh06";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DataDog/zstd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DataDog/zstd";
|
||||
rev = "2b373cbe6ac0c8e6960bbd18026ceb269eef89f5";
|
||||
sha256 = "157kh7w173igxbypknmr8hc8934ykmnb02pkb76k1jwq4sphn8qj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/Microsoft/go-winio";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Microsoft/go-winio";
|
||||
rev = "97e4973ce50b2ff5f09635a57e2b88a037aae829";
|
||||
sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/StackExchange/wmi";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/StackExchange/wmi";
|
||||
rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338";
|
||||
sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/aws/aws-sdk-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/aws/aws-sdk-go";
|
||||
rev = "bff41fb23b7550368282029f6478819d6a99ae0f";
|
||||
sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/beorn7/perks";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/beorn7/perks";
|
||||
rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4";
|
||||
sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/cenkalti/backoff";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cenkalti/backoff";
|
||||
rev = "b7325b0f3f1097c6546ea5e83c4a23267e58ad71";
|
||||
sha256 = "0vx4ggryxd9w111mf1bi2g51559r8sh99gdqah72k4dfj3vrv19d";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/cihub/seelog";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cihub/seelog";
|
||||
rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115";
|
||||
sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/davecgh/go-spew";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/davecgh/go-spew";
|
||||
rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
|
||||
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/docker/distribution";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docker/distribution";
|
||||
rev = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89";
|
||||
sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/docker/docker";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docker/docker";
|
||||
rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363";
|
||||
sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/docker/go-connections";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docker/go-connections";
|
||||
rev = "97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e";
|
||||
sha256 = "11szydahzjz7zia3hr8kplnlxsg9papbvc2mgr1vlwrahxpdx7l7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/docker/go-units";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docker/go-units";
|
||||
rev = "47565b4f722fb6ceae66b95f853feed578a4a51c";
|
||||
sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/emicklei/go-restful";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/emicklei/go-restful";
|
||||
rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40";
|
||||
sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/fsnotify/fsnotify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fsnotify/fsnotify";
|
||||
rev = "ccc981bf80385c528a65fbfdd49bf2d8da22aa23";
|
||||
sha256 = "0hcrfmiyx27izac3v0ii0qq2kfjvhr9ma1i79hrl6a6y2ayagzz7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ghodss/yaml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ghodss/yaml";
|
||||
rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee";
|
||||
sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/go-ini/ini";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-ini/ini";
|
||||
rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333";
|
||||
sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/go-ole/go-ole";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-ole/go-ole";
|
||||
rev = "7a0fa49edf48165190530c675167e2f319a05268";
|
||||
sha256 = "00v6fixm35pj8jyqbj0z3kyv7bhrqa2dr2fgmlc9xqwbf0nayssy";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gogo/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gogo/protobuf";
|
||||
rev = "d76fbc1373015ced59b43ac267f28d546b955683";
|
||||
sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/glog";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/glog";
|
||||
rev = "44145f04b68cf362d9c4df2182967c2275eaefed";
|
||||
sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
|
||||
sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/google/gofuzz";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/google/gofuzz";
|
||||
rev = "44d81051d367757e1c7c6a5a86423ece9afcf63c";
|
||||
sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/googleapis/gnostic";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/googleapis/gnostic";
|
||||
rev = "0c5108395e2debce0d731cf0287ddf7242066aba";
|
||||
sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hashicorp/golang-lru";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/golang-lru";
|
||||
rev = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4";
|
||||
sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hashicorp/hcl";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/hcl";
|
||||
rev = "65a6292f0157eff210d03ed1bf6c59b190b8b906";
|
||||
sha256 = "00qgmygfa4vgf9v3lpz4vp1ca1hcfcxnjqjrvp6z4jjklc8x4mqf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hectane/go-acl";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hectane/go-acl";
|
||||
rev = "7f56832555fc229dad908c67d65ed3ce6156b70c";
|
||||
sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/howeyc/gopass";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/howeyc/gopass";
|
||||
rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
|
||||
sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/imdario/mergo";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/imdario/mergo";
|
||||
rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc";
|
||||
sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/iovisor/gobpf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/iovisor/gobpf";
|
||||
rev = "98ebf56442afb10e1b43145127de3c1777ed7e95";
|
||||
sha256 = "0m2aah77b1k2yf31za975mcix5n0jijqkqmhgakip00klihx383k";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jmespath/go-jmespath";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jmespath/go-jmespath";
|
||||
rev = "0b12d6b5";
|
||||
sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/json-iterator/go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/json-iterator/go";
|
||||
rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682";
|
||||
sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kardianos/osext";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kardianos/osext";
|
||||
rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
|
||||
sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kubernetes-incubator/custom-metrics-apiserver";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver";
|
||||
rev = "bb8bae16c5550f2aeef3151259a1b36078a0e544";
|
||||
sha256 = "1f1n4dh9w2qfs704yw8nhbv50n6f9fxy8ndir96l37lnwd2dvj8p";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/magiconair/properties";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/magiconair/properties";
|
||||
rev = "c2353362d570a7bfa228149c62842019201cfb71";
|
||||
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mailru/easyjson";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mailru/easyjson";
|
||||
rev = "60711f1a8329503b04e1c88535f419d0bb440bff";
|
||||
sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/matttproud/golang_protobuf_extensions";
|
||||
rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
|
||||
sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/mapstructure";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/mapstructure";
|
||||
rev = "fa473d140ef3c6adf42d6b391fe76707f1f243c8";
|
||||
sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/modern-go/concurrent";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/modern-go/concurrent";
|
||||
rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
|
||||
sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/modern-go/reflect2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/modern-go/reflect2";
|
||||
rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
|
||||
sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/patrickmn/go-cache";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/patrickmn/go-cache";
|
||||
rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0";
|
||||
sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pborman/uuid";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pborman/uuid";
|
||||
rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
|
||||
sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pelletier/go-toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pelletier/go-toml";
|
||||
rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
|
||||
sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pkg/errors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/errors";
|
||||
rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
|
||||
sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pmezard/go-difflib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pmezard/go-difflib";
|
||||
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
|
||||
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/client_golang";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_golang";
|
||||
rev = "e7e903064f5e9eb5da98208bae10b475d4db0f8c";
|
||||
sha256 = "0mn6x6za7br81vc9s8d58ivylpx5j4xdq72n7kz3aybniif49r3i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/client_model";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_model";
|
||||
rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
|
||||
sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/common";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/common";
|
||||
rev = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207";
|
||||
sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/prometheus/procfs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/procfs";
|
||||
rev = "65c1f6f8f0fc1e2185eb9863a3bc751496404259";
|
||||
sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/shirou/gopsutil";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/shirou/gopsutil";
|
||||
rev = "071446942108a03a13cf0717275ad3bdbcb691b4";
|
||||
sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/shirou/w32";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/shirou/w32";
|
||||
rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b";
|
||||
sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/afero";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/afero";
|
||||
rev = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd";
|
||||
sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/cast";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cast";
|
||||
rev = "8965335b8c7107321228e3e3702cab9832751bac";
|
||||
sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/jwalterweatherman";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/jwalterweatherman";
|
||||
rev = "4a4406e478ca629068e7768fc33f3f044173c0a6";
|
||||
sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/pflag";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/pflag";
|
||||
rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
|
||||
sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/stretchr/testify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/testify";
|
||||
rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
|
||||
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "c10c31b5e94b6f7a0283272dc2bb27163dcea24b";
|
||||
sha256 = "1a4k61xrwmr99fib2m1rcavbaxihnsmy1bgqhff5hkcv4n7bpsl2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/mobile";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/mobile";
|
||||
rev = "0ff817254b04da935cce10d2d1270ccf047fbbd7";
|
||||
sha256 = "0hzsis106xh3hcydjribcar75va3ghp4hwbj9982h2msi27v54x4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "1c05540f6879653db88113bc4a2b70aec4bd491f";
|
||||
sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "a9d3bda3a223baa6bba6ef412cb273f0fd163c05";
|
||||
sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "b19bf474d317b857955b12035d2c5acb57ce8b01";
|
||||
sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/time";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/time";
|
||||
rev = "a4bde12657593d5e90d0533a3e4fd95e635124cb";
|
||||
sha256 = "07r227rrqgwkchm63dzmdyv5yplbla1vnwkn6qrr940l4psy15aw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/inf.v0";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-inf/inf";
|
||||
rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
|
||||
sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-yaml/yaml";
|
||||
rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4";
|
||||
sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/zorkian/go-datadog-api.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zorkian/go-datadog-api";
|
||||
rev = "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a";
|
||||
sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/api";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/api";
|
||||
rev = "9e5ffd1f1320950b238cfce291b926411f0af722";
|
||||
sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/apimachinery";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/apimachinery";
|
||||
rev = "e386b2658ed20923da8cc9250e552f082899a1ee";
|
||||
sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/apiserver";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/apiserver";
|
||||
rev = "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3";
|
||||
sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/client-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/client-go";
|
||||
rev = "23781f4d6632d88e869066eaebb743857aa1ef9b";
|
||||
sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "k8s.io/metrics";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kubernetes/metrics";
|
||||
rev = "0d9ea2ac660031c8f2726a735dda29441f396f99";
|
||||
sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -1,24 +1,11 @@
|
|||
{ lib, fetchFromGitHub, buildGoPackage }:
|
||||
|
||||
buildGoPackage rec {
|
||||
{ lib, datadog-agent }:
|
||||
datadog-agent.overrideAttrs (attrs: {
|
||||
pname = "datadog-process-agent";
|
||||
version = "6.11.1";
|
||||
owner = "DataDog";
|
||||
repo = "datadog-process-agent";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = version;
|
||||
sha256 = "0fc2flm0pa44mjxvn4fan0mkvg9yyg27w68xdgrnpdifj99kxxjf";
|
||||
};
|
||||
|
||||
goDeps = ./datadog-process-agent-deps.nix;
|
||||
goPackagePath = "github.com/${owner}/${repo}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Live process collector for the DataDog Agent v6";
|
||||
homepage = "https://www.datadoghq.com";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ domenkozar rvl ];
|
||||
};
|
||||
}
|
||||
meta = with lib;
|
||||
attrs.meta // {
|
||||
description = "Live process collector for the DataDog Agent v7";
|
||||
maintainers = with maintainers; [ domenkozar rvl ];
|
||||
};
|
||||
subPackages = [ "cmd/process-agent" ];
|
||||
postInstall = null;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ let
|
|||
src = pkgs.fetchFromGitHub {
|
||||
owner = "DataDog";
|
||||
repo = "integrations-core";
|
||||
rev = "7e9bebbb5b79ac30c16814ecefdc8f5c63cb4ea4";
|
||||
sha256 = "0yi7dlbd0rkzzl8cag713r86f40vl87aqrj97ral58csnnj7vfzb";
|
||||
rev = version;
|
||||
sha256 = "0424zsnf747s10kfzv5y0m0ac9sgczip78yvghhrc2i089i5z2h4";
|
||||
};
|
||||
version = "git-2018-09-18";
|
||||
version = "7.30.1";
|
||||
|
||||
# Build helper to build a single datadog integration package.
|
||||
buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // {
|
||||
|
|
@ -65,7 +65,7 @@ let
|
|||
pname = "checks-base";
|
||||
sourceRoot = "datadog_checks_base";
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
requests protobuf prometheus-client uuid simplejson uptime
|
||||
requests protobuf prometheus-client simplejson uptime
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -76,6 +76,7 @@ let
|
|||
network = (ps: [ ps.psutil ]);
|
||||
nginx = (ps: []);
|
||||
postgres = (ps: with ps; [ pg8000 psycopg2 ]);
|
||||
process = (ps: []);
|
||||
};
|
||||
|
||||
# All integrations (default + extra):
|
||||
|
|
|
|||
|
|
@ -24091,7 +24091,7 @@ with pkgs;
|
|||
};
|
||||
datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { };
|
||||
datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix {
|
||||
python = python27;
|
||||
python = python3;
|
||||
extraIntegrations = extras;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue