diff --git a/config/importer-example.yml b/config/importer-example.yml index 122889bb..2b356120 100644 --- a/config/importer-example.yml +++ b/config/importer-example.yml @@ -31,7 +31,7 @@ contexts: min_length: 8 max_length: 20 connections: - exclude_filters: + filters: - matches: - field: "name" regex: "DEV-*|-Dev-*" diff --git a/internal/config/grafana_config.go b/internal/config/grafana_config.go index 23bf1ed0..4c070169 100644 --- a/internal/config/grafana_config.go +++ b/internal/config/grafana_config.go @@ -24,7 +24,7 @@ type MonitoredOrgFolders struct { // ConnectionSettings contains Filters and Matching Rules for Grafana type ConnectionSettings struct { - FilterRules []MatchingRule `mapstructure:"exclude_filters" yaml:"exclude_filters,omitempty"` + FilterRules []MatchingRule `mapstructure:"filters" yaml:"filters,omitempty"` MatchingRules []RegexMatchesList `mapstructure:"credential_rules" yaml:"credential_rules,omitempty"` } diff --git a/website/content/docs/gdg/configuration.md b/website/content/docs/gdg/configuration.md index 8c787b5a..54cae01e 100644 --- a/website/content/docs/gdg/configuration.md +++ b/website/content/docs/gdg/configuration.md @@ -220,7 +220,7 @@ contexts: testing: output_path: test/data connections: - exclude_filters: + filters: - field: "name" regex: "Google Sheets" - field: "type" diff --git a/website/content/docs/releases/gdg_0.6.md b/website/content/docs/releases/gdg_0.6.md index 539bc929..22583fbc 100644 --- a/website/content/docs/releases/gdg_0.6.md +++ b/website/content/docs/releases/gdg_0.6.md @@ -12,8 +12,12 @@ toc: true Release Date: TBD + +### Breaking Changes + - Config: Connection settings renamed `exclude_filters' to `filters` + ### Changes - - Enterprise config flag removed, future versions will programmatically determining version of grafana. + - Enterprise config flag removed, future versions will programmatically determine version of grafana. - [#283](https://github.com/esnet/gdg/issues/283) Fixing small bug with library connections - [#288](https://github.com/esnet/gdg/pull/288) Enterprise: Connection permission will require min. v10.2.3