Commit 51fdf00e authored by KFears's avatar KFears
Browse files

nixos/grafana: fix assertions leaking into YAML 

This commit deletes the assertions that were added in 4ec456b7. Those
assertions weren't even working to begin with, and they also cause
assertions leak into the generated YAML.
parent 58d32e9e

nixos/modules/services/monitoring/grafana.nix

+0 −12
Original line number Diff line number Diff line
@@ -92,17 +92,6 @@ let 
  grafanaTypes.datasourceConfig = types.submodule {

    freeformType = provisioningSettingsFormat.type;



    imports = [

      (mkRemovedOptionModule [ "password" ] ''

        `services.grafana.provision.datasources.settings.datasources.<name>.password` has been removed

        in Grafana 9. Use `secureJsonData` instead.

      '')

      (mkRemovedOptionModule [ "basicAuthPassword" ] ''

        `services.grafana.provision.datasources.settings.datasources.<name>.basicAuthPassword` has been removed

        in Grafana 9. Use `secureJsonData` instead.

      '')

    ];



    options = {

      name = mkOption {

        type = types.str;
@@ -603,7 +592,6 @@ in { 
                  description = lib.mdDoc "List of datasources to insert/update.";

                  default = [];

                  type = types.listOf grafanaTypes.datasourceConfig;

                  apply = map (flip builtins.removeAttrs [ "password" "basicAuthPassword" ]);

                };



                deleteDatasources = mkOption {