Unverified Commit 5c9977a5 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #224891 from KFearsoff/fix-grafana-assertions-in-yaml 

nixos/grafana: fix assertions leaking into YAML
parents 39b5efc0 51fdf00e

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 {