commit 2d2c311304a674d1eb8fbe6c53f719d9ae51e76e · pyrox.dev/nixpkgs

+9 -4

nixos/modules/services/databases/influxdb.nix

···

       66
        
             enabled = false;

     

       67
        
           }];

     

       68
        
       

     

       69
       -
           collectd = {

     

       70
        
             enabled = false;

     

       71
        
             typesdb = "${pkgs.collectd}/share/collectd/types.db";

     

       72
        
             database = "collectd_db";

     

       73
        
             port = 25826;

     

       74
       -
           };

     

       75
        
       

     

       76
       -
           opentsdb = {

     

       77
        
             enabled = false;

     

       78
       -
           };

     

       79
        
       

     

       80
        
           continuous_queries = {

     

       81
        
             enabled = true;

     
···

       170
        
             preStart = ''

     

       171
        
               mkdir -m 0770 -p ${cfg.dataDir}

     

       172
        
               if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       173
        
             '';

     

       174
        
           };

     

       175

···

       66
        
             enabled = false;

     

       67
        
           }];

     

       68
        
       

     

       69
       +
           collectd = [{

     

       70
        
             enabled = false;

     

       71
        
             typesdb = "${pkgs.collectd}/share/collectd/types.db";

     

       72
        
             database = "collectd_db";

     

       73
        
             port = 25826;

     

       74
       +
           }];

     

       75
        
       

     

       76
       +
           opentsdb = [{

     

       77
        
             enabled = false;

     

       78
       +
           }];

     

       79
        
       

     

       80
        
           continuous_queries = {

     

       81
        
             enabled = true;

     
···

       170
        
             preStart = ''

     

       171
        
               mkdir -m 0770 -p ${cfg.dataDir}

     

       172
        
               if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi

     

       173
       +
             '';

     

       174
       +
             postStart = mkBefore ''

     

       175
       +
               until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://127.0.0.1${toString configOptions.http.bind-address}'/ping; do

     

       176
       +
                 sleep 1;

     

       177
       +
               done

     

       178
        
             '';

     

       179
        
           };

     

       180

+1

nixos/modules/services/monitoring/cadvisor.nix

···

       90
        
                   ${optionalString cfg.storageDriverSecure "-storage_driver_secure"}

     

       91
        
                 ''}

     

       92
        
               '';

     

       0
        
       
     

       93
        
             };

     

       94
        
           };

     

       95

···

       90
        
                   ${optionalString cfg.storageDriverSecure "-storage_driver_secure"}

     

       91
        
                 ''}

     

       92
        
               '';

     

       93
       +
               TimeoutStartSec=300;

     

       94
        
             };

     

       95
        
           };

     

       96

-3

nixos/tests/cadvisor.nix

···

       24
        
       

     

       25
        
             $influxdb->waitForUnit("influxdb.service");

     

       26
        
       

     

       27
       -
             # Wait until influxdb admin interface is available

     

       28
       -
             $influxdb->waitUntilSucceeds("curl -f 127.0.0.1:8083");

     

       29
       -
       

     

       30
        
             # create influxdb database

     

       31
        
             $influxdb->succeed(q~

     

       32
        
               curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"

···

       24
        
       

     

       25
        
             $influxdb->waitForUnit("influxdb.service");

     

       26
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
             # create influxdb database

     

       28
        
             $influxdb->succeed(q~

     

       29
        
               curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"

-3

nixos/tests/influxdb.nix

···

       17
        
         

     

       18
        
           $one->waitForUnit("influxdb.service");

     

       19
        
       

     

       20
       -
           # Check if admin interface is avalible

     

       21
       -
           $one->waitUntilSucceeds("curl -f 127.0.0.1:8083");

     

       22
       -
       

     

       23
        
           # create database

     

       24
        
           $one->succeed(q~

     

       25
        
             curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE test"

···

       17
        
         

     

       18
        
           $one->waitForUnit("influxdb.service");

     

       19
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
           # create database

     

       21
        
           $one->succeed(q~

     

       22
        
             curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE test"