commit a4960d450e0fc0305909cdc61a40ea13f11c61f4 · 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")

+7

pkgs/servers/monitoring/grafana/plugins/default.nix

···

       1
       1
       +
       { newScope, pkgs }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         callPackage = newScope (pkgs // plugins);

     

       5
       5
       +
         plugins = import ./plugins.nix { inherit callPackage; };

     

       6
       6
       +
       in

     

       7
       7
       +
         plugins

+13

pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix

···

       1
       1
       +
       { grafanaPlugin, lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       grafanaPlugin rec {

     

       4
       4
       +
         pname = "grafana-clock-panel";

     

       5
       5
       +
         version = "1.1.1";

     

       6
       6
       +
         zipHash = "sha256-SvZyg7r+XG6i7jqYwxpPn6ZzJc7qmtfPtyphYppURDk=";

     

       7
       7
       +
         meta = with lib; {

     

       8
       8
       +
           description = "Clock panel for Grafana";

     

       9
       9
       +
           license = licenses.asl20;

     

       10
       10
       +
           maintainers = with maintainers; [ lukegb ];

     

       11
       11
       +
           platforms = platforms.unix;

     

       12
       12
       +
         };

     

       13
       13
       +
       }

+13

pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix

···

       1
       1
       +
       { grafanaPlugin, lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       grafanaPlugin rec {

     

       4
       4
       +
         pname = "grafana-piechart-panel";

     

       5
       5
       +
         version = "1.6.1";

     

       6
       6
       +
         zipHash = "sha256-64K/efoBKuBFp8Jw79hTdMyTurTZsL0qfgPDcUWz2jg=";

     

       7
       7
       +
         meta = with lib; {

     

       8
       8
       +
           description = "Pie chart panel for Grafana";

     

       9
       9
       +
           license = licenses.asl20;

     

       10
       10
       +
           maintainers = with maintainers; [ lukegb ];

     

       11
       11
       +
           platforms = platforms.unix;

     

       12
       12
       +
         };

     

       13
       13
       +
       }

+28

pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix

···

       1
       1
       +
       { stdenvNoCC, fetchurl, unzip }:

     

       2
       2
       +
       

     

       3
       3
       +
       { pname, version, zipHash, meta ? {}, passthru ? {}, ... }@args:

     

       4
       4
       +
       stdenvNoCC.mkDerivation ({

     

       5
       5
       +
         inherit pname version;

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           name = "${pname}-${version}.zip";

     

       9
       9
       +
           url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download";

     

       10
       10
       +
           hash = zipHash;

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         nativeBuildInputs = [ unzip ];

     

       14
       14
       +
       

     

       15
       15
       +
         installPhase = ''

     

       16
       16
       +
           cp -R "." "$out"

     

       17
       17
       +
           chmod -R a-w "$out"

     

       18
       18
       +
           chmod u+w "$out"

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         passthru = {

     

       22
       22
       +
           updateScript = [ ./update-grafana-plugin.sh pname ];

     

       23
       23
       +
         } // passthru;

     

       24
       24
       +
       

     

       25
       25
       +
         meta = {

     

       26
       26
       +
           homepage = "https://grafana.com/grafana/plugins/${pname}";

     

       27
       27
       +
         } // meta;

     

       28
       28
       +
       } // (builtins.removeAttrs args [ "pname" "version" "sha256" "meta" ]))

+13

pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix

···

       1
       1
       +
       { grafanaPlugin, lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       grafanaPlugin rec {

     

       4
       4
       +
         pname = "grafana-polystat-panel";

     

       5
       5
       +
         version = "1.2.2";

     

       6
       6
       +
         zipHash = "sha256-HWQdhstnrDuXPithZ8kOG2ZtSeAT215MJ1ftMCt6/tc=";

     

       7
       7
       +
         meta = with lib; {

     

       8
       8
       +
           description = "Hexagonal multi-stat panel for Grafana";

     

       9
       9
       +
           license = licenses.asl20;

     

       10
       10
       +
           maintainers = with maintainers; [ lukegb ];

     

       11
       11
       +
           platforms = platforms.unix;

     

       12
       12
       +
         };

     

       13
       13
       +
       }

+13

pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix

···

       1
       1
       +
       { grafanaPlugin, lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       grafanaPlugin rec {

     

       4
       4
       +
         pname = "grafana-worldmap-panel";

     

       5
       5
       +
         version = "0.3.2";

     

       6
       6
       +
         zipHash = "sha256-MGAJzS9X91x6wt305jH1chLoW3zd7pIYDwRnPg9qrgE=";

     

       7
       7
       +
         meta = with lib; {

     

       8
       8
       +
           description = "World Map panel for Grafana";

     

       9
       9
       +
           license = licenses.asl20;

     

       10
       10
       +
           maintainers = with maintainers; [ lukegb ];

     

       11
       11
       +
           platforms = platforms.unix;

     

       12
       12
       +
         };

     

       13
       13
       +
       }

+11

pkgs/servers/monitoring/grafana/plugins/plugins.nix

···

       1
       1
       +
       { callPackage }:

     

       2
       2
       +
       {

     

       3
       3
       +
         inherit callPackage;

     

       4
       4
       +
       

     

       5
       5
       +
         grafanaPlugin = callPackage ./grafana-plugin.nix { };

     

       6
       6
       +
       

     

       7
       7
       +
         grafana-clock-panel = callPackage ./grafana-clock-panel { };

     

       8
       8
       +
         grafana-piechart-panel = callPackage ./grafana-piechart-panel { };

     

       9
       9
       +
         grafana-polystat-panel = callPackage ./grafana-polystat-panel { };

     

       10
       10
       +
         grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { };

     

       11
       11
       +
       }

+8

pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -i bash -p curl jq common-updater-scripts

     

       3
       3
       +
       

     

       4
       4
       +
       set -eu -o pipefail

     

       5
       5
       +
       

     

       6
       6
       +
       readonly plugin_name="$1"

     

       7
       7
       +
       readonly latest_version="$(curl "https://grafana.com/api/plugins/${plugin_name}" | jq -r .version)"

     

       8
       8
       +
       update-source-version "grafanaPlugins.${plugin_name}" "$latest_version"

+1

pkgs/top-level/all-packages.nix

···

       17203
       17203
        
         gofish = callPackage ../servers/gopher/gofish { };

     

       17204
       17204
        
       

     

       17205
       17205
        
         grafana = callPackage ../servers/monitoring/grafana { };

     

       17206
       17206
       +
         grafanaPlugins = dontRecurseIntoAttrs (callPackage ../servers/monitoring/grafana/plugins { });

     

       17206
       17207
        
       

     

       17207
       17208
        
         grafana-loki = callPackage ../servers/monitoring/loki { };

     

       17208
       17209