commit 9494b764d2078bb109fd5dbaa7299f0dabd80b27 · pyrox.dev/nixpkgs

+28 -2

nixos/modules/services/monitoring/dd-agent.nix

···

       72
       72
        
         postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;

     

       73
       73
        
         nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;

     

       74
       74
        
         mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig;

     

       75
       75
       +
         jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig;

     

       75
       76
        
         

     

       76
       77
        
         etcfiles =

     

       77
       78
        
           [ { source = ddConf;

     
···

       94
       95
        
           (optional (cfg.mongoConfig != null)

     

       95
       96
        
             { source = mongoConfig;

     

       96
       97
        
               target = "dd-agent/conf.d/mongo.yaml";

     

       98
       98
       +
             }) ++

     

       99
       99
       +
           (optional (cfg.jmxConfig != null)

     

       100
       100
       +
             { source = jmxConfig;

     

       101
       101
       +
               target = "dd-agent/conf.d/jmx.yaml";

     

       97
       102
        
             });

     

       98
       103
        
       

     

       99
       104
        
       in {

     
···

       141
       146
        
             default = null;

     

       142
       147
        
             type = types.uniq (types.nullOr types.string);

     

       143
       148
        
           };

     

       149
       149
       +
       

     

       150
       150
       +
           jmxConfig = mkOption {

     

       151
       151
       +
             description = "JMX integration configuration";

     

       152
       152
       +
             default = null;

     

       153
       153
       +
             type = types.uniq (types.nullOr types.string);

     

       154
       154
       +
           };

     

       155
       155
       +
       

     

       144
       156
        
         };

     

       145
       157
        
       

     

       146
       158
        
         config = mkIf cfg.enable {

     
···

       167
       179
        
               Restart = "always";

     

       168
       180
        
               RestartSec = 2;

     

       169
       181
        
             };

     

       170
       170
       -
             restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ];

     

       182
       182
       +
             restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ];

     

       171
       183
        
           };

     

       172
       184
        
       

     

       173
       185
        
           systemd.services.dogstatsd = {

     
···

       183
       195
        
               Restart = "always";

     

       184
       196
        
               RestartSec = 2;

     

       185
       197
        
             };

     

       186
       186
       -
             restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ];

     

       198
       198
       +
             restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ];

     

       199
       199
       +
           };

     

       200
       200
       +
       

     

       201
       201
       +
           systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) {

     

       202
       202
       +
             description = "Datadog JMX Fetcher";

     

       203
       203
       +
             path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];

     

       204
       204
       +
             wantedBy = [ "multi-user.target" ];

     

       205
       205
       +
             serviceConfig = {

     

       206
       206
       +
               ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch";

     

       207
       207
       +
               User = "datadog";

     

       208
       208
       +
               Group = "datadog";

     

       209
       209
       +
               Restart = "always";

     

       210
       210
       +
               RestartSec = 2;

     

       211
       211
       +
             };

     

       212
       212
       +
             restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ];

     

       187
       213
        
           };

     

       188
       214
        
       

     

       189
       215
        
           environment.etc = etcfiles;

pkgs/tools/networking/dd-agent/default.nix

···

       36
       36
        
           ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd

     

       37
       37
        
           ln -s $out/agent/ddagent.py $out/bin/dd-forwarder

     

       38
       38
        
       

     

       39
       39
       +
           cat > $out/bin/dd-jmxfetch <<EOF

     

       40
       40
       +
           #!/usr/bin/env bash

     

       41
       41
       +
           exec ${python}/bin/python $out/agent/jmxfetch.py $@

     

       42
       42
       +
           EOF

     

       43
       43
       +
           chmod a+x $out/bin/dd-jmxfetch

     

       44
       44
       +
       

     

       39
       45
        
           wrapProgram $out/bin/dd-forwarder \

     

       40
       46
        
             --prefix PYTHONPATH : $PYTHONPATH

     

       41
       47
        
           wrapProgram $out/bin/dd-agent \

     

       42
       48
        
             --prefix PYTHONPATH : $PYTHONPATH

     

       43
       49
        
           wrapProgram $out/bin/dogstatsd \

     

       50
       50
       +
             --prefix PYTHONPATH : $PYTHONPATH

     

       51
       51
       +
           wrapProgram $out/bin/dd-jmxfetch \

     

       44
       52
        
             --prefix PYTHONPATH : $PYTHONPATH

     

       45
       53
        
       

     

       46
       54
        
           patchShebangs $out