diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2023-09-17 13:44:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-17 13:44:33 +0200 |
commit | b4dbea193aec9cf05e63b2a1cb3aa5b23477cb8d (patch) | |
tree | 1a68974ee87f5de3b81d4b02fe38c1c9507ca1b1 /nixos/modules/services/monitoring | |
parent | 2215d3808aee359132d6c1ed95ae1fbe30082f8e (diff) | |
parent | 698c640e7751f538ae009c8f559b0408bbfec5b2 (diff) | |
download | nixlib-b4dbea193aec9cf05e63b2a1cb3aa5b23477cb8d.tar nixlib-b4dbea193aec9cf05e63b2a1cb3aa5b23477cb8d.tar.gz nixlib-b4dbea193aec9cf05e63b2a1cb3aa5b23477cb8d.tar.bz2 nixlib-b4dbea193aec9cf05e63b2a1cb3aa5b23477cb8d.tar.lz nixlib-b4dbea193aec9cf05e63b2a1cb3aa5b23477cb8d.tar.xz nixlib-b4dbea193aec9cf05e63b2a1cb3aa5b23477cb8d.tar.zst nixlib-b4dbea193aec9cf05e63b2a1cb3aa5b23477cb8d.zip |
Merge pull request #255179 from Ma27/rm-grafana-migration-error
nixos/grafana: remove hacky deprecation helper from dashbaords & datasources
Diffstat (limited to 'nixos/modules/services/monitoring')
-rw-r--r-- | nixos/modules/services/monitoring/grafana.nix | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 571b9a3aeebd..e90a0e9d16db 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -88,26 +88,6 @@ let # Get a submodule without any embedded metadata: _filter = x: filterAttrs (k: v: k != "_module") x; - # FIXME(@Ma27) remove before 23.05. This is just a helper-type - # because `mkRenamedOptionModule` doesn't work if `foo.bar` is renamed - # to `foo.bar.baz`. - submodule' = module: types.coercedTo - (mkOptionType { - name = "grafana-provision-submodule"; - description = "Wrapper-type for backwards compat of Grafana's declarative provisioning"; - check = x: - if builtins.isList x then - throw '' - Provisioning dashboards and datasources declaratively by - setting `dashboards` or `datasources` to a list is not supported - anymore. Use `services.grafana.provision.datasources.settings.datasources` - (or `services.grafana.provision.dashboards.settings.providers`) instead. - '' - else isAttrs x || isFunction x; - }) - id - (types.submodule module); - # http://docs.grafana.org/administration/provisioning/#datasources grafanaTypes.datasourceConfig = types.submodule { freeformType = provisioningSettingsFormat.type; @@ -1160,7 +1140,7 @@ in Declaratively provision Grafana's datasources. ''; default = { }; - type = submodule' { + type = types.submodule { options.settings = mkOption { description = lib.mdDoc '' Grafana datasource configuration in Nix. Can't be used with @@ -1235,7 +1215,7 @@ in Declaratively provision Grafana's dashboards. ''; default = { }; - type = submodule' { + type = types.submodule { options.settings = mkOption { description = lib.mdDoc '' Grafana dashboard configuration in Nix. Can't be used with |