Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9f58b7c4bb3b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 643a329a4c0c
Choose a head ref
  • 10 commits
  • 5 files changed
  • 2 contributors

Commits on Sep 21, 2019

  1. maintainer: Add yvt

    yvt committed Sep 21, 2019
    Copy the full SHA
    a5deef6 View commit details
  2. do-agent: init at 3.5.6

    yvt committed Sep 21, 2019
    Copy the full SHA
    5ef5852 View commit details
  3. nixos/do-agent: init

    yvt committed Sep 21, 2019
    Copy the full SHA
    832ede6 View commit details

Commits on Sep 23, 2019

  1. Copy the full SHA
    74e1d47 View commit details
  2. Copy the full SHA
    1745ab3 View commit details

Commits on Sep 24, 2019

  1. do-agent: Fix modSha256

    yvt committed Sep 24, 2019
    Copy the full SHA
    4fd8034 View commit details

Commits on Oct 2, 2019

  1. maintainer: Set githubId of yvt

    yvt committed Oct 2, 2019
    Copy the full SHA
    b1acc7d View commit details
  2. nixos/do-agent: Use DynamicUser

    yvt committed Oct 2, 2019
    Copy the full SHA
    e3c1ecf View commit details
  3. Copy the full SHA
    00a5420 View commit details
  4. do-agent: init at 3.5.6 (#69186)

    do-agent: init at 3.5.6
    infinisil authored Oct 2, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    643a329 View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -7140,6 +7140,12 @@
githubId = 1866448;
name = "Eric Bailey";
};
yvt = {
email = "i@yvt.jp";
github = "yvt";
githubId = 5253988;
name = "yvt";
};
z77z = {
email = "maggesi@math.unifi.it";
github = "maggesi";
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
@@ -503,6 +503,7 @@
./services/monitoring/das_watchdog.nix
./services/monitoring/datadog-agent.nix
./services/monitoring/dd-agent/dd-agent.nix
./services/monitoring/do-agent.nix
./services/monitoring/fusion-inventory.nix
./services/monitoring/grafana.nix
./services/monitoring/grafana-reporter.nix
34 changes: 34 additions & 0 deletions nixos/modules/services/monitoring/do-agent.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{ config, lib, pkgs, ... }:

with lib;

let
cfg = config.services.do-agent;
in
{
options.services.do-agent = {
enable = mkEnableOption "do-agent, the DigitalOcean droplet metrics agent";
};

config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.do-agent ];

systemd.services.do-agent = {
description = "DigitalOcean Droplet Metrics Agent";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
serviceConfig = {
ExecStart = "${pkgs.do-agent}/bin/do-agent --syslog";
Restart = "always";
OOMScoreAdjust = -900;
SyslogIdentifier = "DigitalOceanAgent";
PrivateTmp = "yes";
ProtectSystem = "full";
ProtectHome = "yes";
NoNewPrivileges = "yes";
DynamicUser = "yes";
};
};
};
}
33 changes: 33 additions & 0 deletions pkgs/servers/monitoring/do-agent/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{ lib, buildGoModule, fetchFromGitHub }:

buildGoModule rec {
pname = "do-agent";
version = "3.5.6";

src = fetchFromGitHub {
owner = "digitalocean";
repo = "do-agent";
rev = "${version}";
sha256 = "1gl034cslqa30fqy2p9rymgx398s1rcgbmfvzk5zjlrw47327k8i";
};

buildFlagsArray = ''
-ldflags=
-X main.version=${version}
'';

modSha256 = "164bwqg996097db399j7lar6gj9xpshjdmyapvzg7zh655xlkf3d";

meta = with lib; {
description = "DigitalOcean droplet system metrics agent";
longDescription = ''
do-agent is a program provided by DigitalOcean that collects system
metrics from a DigitalOcean Droplet (on which the program runs) and sends
them to DigitalOcean to provide resource usage graphs and alerting.
'';
homepage = https://github.com/digitalocean/do-agent;
license = licenses.asl20;
maintainers = with maintainers; [ yvt ];
platforms = platforms.linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -14650,6 +14650,8 @@ in

dkimproxy = callPackage ../servers/mail/dkimproxy { };

do-agent = callPackage ../servers/monitoring/do-agent { };

dovecot = callPackage ../servers/mail/dovecot { };
dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };