commit d0a9e1ec8324bf4943b6aa680d8c0ac47b0b164e · pyrox.dev/nixpkgs

+8 -1

nixos/modules/services/monitoring/grafana.nix

···

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.grafana;

     

       7
       7
        
         opt = options.services.grafana;

     

       8
       8
       +
         declarativePlugins = pkgs.linkFarm "grafana-plugins" (builtins.map (pkg: { name = pkg.pname; path = pkg; }) cfg.declarativePlugins);

     

       8
       9
        
       

     

       9
       10
        
         envOptions = {

     

       10
       11
        
           PATHS_DATA = cfg.dataDir;

     

       11
       11
       -
           PATHS_PLUGINS = "${cfg.dataDir}/plugins";

     

       12
       12
       +
           PATHS_PLUGINS = if builtins.isNull cfg.declarativePlugins then "${cfg.dataDir}/plugins" else declarativePlugins;

     

       12
       13
        
           PATHS_LOGS = "${cfg.dataDir}/log";

     

       13
       14
        
       

     

       14
       15
        
           SERVER_PROTOCOL = cfg.protocol;

     
···

       259
       260
        
             default = pkgs.grafana;

     

       260
       261
        
             defaultText = "pkgs.grafana";

     

       261
       262
        
             type = types.package;

     

       263
       263
       +
           };

     

       264
       264
       +
           declarativePlugins = mkOption {

     

       265
       265
       +
             type = with types; nullOr (listOf path);

     

       266
       266
       +
             default = null;

     

       267
       267
       +
             description = "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed.";

     

       268
       268
       +
             example = literalExample "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]";

     

       262
       269
        
           };

     

       263
       270
        
       

     

       264
       271
        
           dataDir = mkOption {

+13 -1

nixos/tests/grafana.nix

···

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         extraNodeConfs = {

     

       20
       20
       +
           declarativePlugins = {

     

       21
       21
       +
             services.grafana.declarativePlugins = [ pkgs.grafanaPlugins.grafana-clock-panel ];

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       20
       24
        
           postgresql = {

     

       21
       25
        
             services.grafana.database = {

     

       22
       26
        
               host = "127.0.0.1:5432";

     
···

       52
       56
        
           nameValuePair dbName (mkMerge [

     

       53
       57
        
           baseGrafanaConf

     

       54
       58
        
           (extraNodeConfs.${dbName} or {})

     

       55
       55
       -
         ])) [ "sqlite" "postgresql" "mysql" ]);

     

       59
       59
       +
         ])) [ "sqlite" "declarativePlugins" "postgresql" "mysql" ]);

     

       56
       60
        
       

     

       57
       61
        
       in {

     

       58
       62
        
         name = "grafana";

     
···

       65
       69
        
       

     

       66
       70
        
         testScript = ''

     

       67
       71
        
           start_all()

     

       72
       72
       +
       

     

       73
       73
       +
           with subtest("Declarative plugins installed"):

     

       74
       74
       +
               declarativePlugins.wait_for_unit("grafana.service")

     

       75
       75
       +
               declarativePlugins.wait_for_open_port(3000)

     

       76
       76
       +
               declarativePlugins.succeed(

     

       77
       77
       +
                   "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/plugins | grep -q grafana-clock-panel"

     

       78
       78
       +
               )

     

       79
       79
       +
               declarativePlugins.shutdown()

     

       68
       80
        
       

     

       69
       81
        
           with subtest("Successful API query as admin user with sqlite db"):

     

       70
       82
        
               sqlite.wait_for_unit("grafana.service")