diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md index d30d809f4dd..9496f63728b 100755 --- a/docs/sources/administration/provisioning.md +++ b/docs/sources/administration/provisioning.md @@ -38,11 +38,11 @@ Example: ```yaml datasources: -- name: Graphite - url: http://localhost:$PORT - user: $USER - secureJsonData: - password: $PASSWORD + - name: Graphite + url: http://localhost:$PORT + user: $USER + secureJsonData: + password: $PASSWORD ``` If you have a literal `$` in your value and want to avoid interpolation, `$$` can be used. @@ -53,13 +53,13 @@ If you have a literal `$` in your value and want to avoid interpolation, `$$` ca Currently we do not provide any scripts/manifests for configuring Grafana. Rather than spending time learning and creating scripts/manifests for each tool, we think our time is better spent making Grafana easier to provision. Therefore, we heavily rely on the expertise of the community. -Tool | Project ------|------------ -Puppet | [https://forge.puppet.com/puppet/grafana](https://forge.puppet.com/puppet/grafana) -Ansible | [https://github.com/cloudalchemy/ansible-grafana](https://github.com/cloudalchemy/ansible-grafana) -Chef | [https://github.com/JonathanTron/chef-grafana](https://github.com/JonathanTron/chef-grafana) -Saltstack | [https://github.com/salt-formulas/salt-formula-grafana](https://github.com/salt-formulas/salt-formula-grafana) -Jsonnet | [https://github.com/grafana/grafonnet-lib/](https://github.com/grafana/grafonnet-lib/) +| Tool | Project | +| --------- | -------------------------------------------------------------------------------------------------------------- | +| Puppet | [https://forge.puppet.com/puppet/grafana](https://forge.puppet.com/puppet/grafana) | +| Ansible | [https://github.com/cloudalchemy/ansible-grafana](https://github.com/cloudalchemy/ansible-grafana) | +| Chef | [https://github.com/JonathanTron/chef-grafana](https://github.com/JonathanTron/chef-grafana) | +| Saltstack | [https://github.com/salt-formulas/salt-formula-grafana](https://github.com/salt-formulas/salt-formula-grafana) | +| Jsonnet | [https://github.com/grafana/grafonnet-lib/](https://github.com/grafana/grafonnet-lib/) | ## Datasources @@ -86,91 +86,92 @@ deleteDatasources: # what's available in the database datasources: # name of the datasource. Required -- name: Graphite - # datasource type. Required - type: graphite - # access mode. proxy or direct (Server or Browser in the UI). Required - access: proxy - # org id. will default to orgId 1 if not specified - orgId: 1 - # custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically - uid: my_unique_uid - # url - url: http://localhost:8080 - # Deprecated, use secureJsonData.password - password: - # database user, if used - user: - # database name, if used - database: - # enable/disable basic auth - basicAuth: - # basic auth username - basicAuthUser: - # Deprecated, use secureJsonData.basicAuthPassword - basicAuthPassword: - # enable/disable with credentials headers - withCredentials: - # mark as default datasource. Max one per org - isDefault: - # fields that will be converted to json and stored in jsonData - jsonData: - graphiteVersion: "1.1" - tlsAuth: true - tlsAuthWithCACert: true - # json object of data that will be encrypted. - secureJsonData: - tlsCACert: "..." - tlsClientCert: "..." - tlsClientKey: "..." - # database password, if used + - name: Graphite + # datasource type. Required + type: graphite + # access mode. proxy or direct (Server or Browser in the UI). Required + access: proxy + # org id. will default to orgId 1 if not specified + orgId: 1 + # custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically + uid: my_unique_uid + # url + url: http://localhost:8080 + # Deprecated, use secureJsonData.password password: - # basic auth password + # database user, if used + user: + # database name, if used + database: + # enable/disable basic auth + basicAuth: + # basic auth username + basicAuthUser: + # Deprecated, use secureJsonData.basicAuthPassword basicAuthPassword: - version: 1 - # allow users to edit datasources from the UI. - editable: false + # enable/disable with credentials headers + withCredentials: + # mark as default datasource. Max one per org + isDefault: + # fields that will be converted to json and stored in jsonData + jsonData: + graphiteVersion: '1.1' + tlsAuth: true + tlsAuthWithCACert: true + # json object of data that will be encrypted. + secureJsonData: + tlsCACert: '...' + tlsClientCert: '...' + tlsClientKey: '...' + # database password, if used + password: + # basic auth password + basicAuthPassword: + version: 1 + # allow users to edit datasources from the UI. + editable: false ``` #### Custom Settings per Datasource + Please refer to each datasource documentation for specific provisioning examples. -| Datasource | Misc | -| ---- | ---- | +| Datasource | Misc | +| ------------- | ---------------------------------------------------------------------------------- | | Elasticsearch | Elasticsearch uses the `database` property to configure the index for a datasource | #### Json Data Since not all datasources have the same configuration settings we only have the most common ones as fields. The rest should be stored as a json blob in the `jsonData` field. Here are the most common settings that the core datasources use. -| Name | Type | Datasource | Description | -| ---- | ---- | ---- | ---- | -| tlsAuth | boolean | *All* | Enable TLS authentication using client cert configured in secure json data | -| tlsAuthWithCACert | boolean | *All* | Enable TLS authentication using CA cert | -| tlsSkipVerify | boolean | *All* | Controls whether a client verifies the server's certificate chain and host name. | -| graphiteVersion | string | Graphite | Graphite version | -| timeInterval | string | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source | -| esVersion | number | Elasticsearch | Elasticsearch version as a number (2/5/56/60/70) | -| timeField | string | Elasticsearch | Which field that should be used as timestamp | -| interval | string | Elasticsearch | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly' | -| logMessageField | string | Elasticsearch | Which field should be used as the log message | -| logLevelField | string | Elasticsearch | Which field should be used to indicate the priority of the log message | -| authType | string | Cloudwatch | Auth provider. keys/credentials/arn | -| assumeRoleArn | string | Cloudwatch | ARN of Assume Role | -| defaultRegion | string | Cloudwatch | AWS region | -| customMetricsNamespaces | string | Cloudwatch | Namespaces of Custom Metrics | -| tsdbVersion | string | OpenTSDB | Version | -| tsdbResolution | string | OpenTSDB | Resolution | -| sslmode | string | PostgreSQL | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full' | -| sslRootCertFile | string | PostgreSQL | SSL server root certificate file, must be readable by the Grafana user | -| sslCertFile | string | PostgreSQL | SSL client certificate file, must be readable by the Grafana user | -| sslKeyFile | string | PostgreSQL | SSL client key file, must be readable by *only* the Grafana user | -| encrypt | string | MSSQL | Connection SSL encryption handling. 'disable', 'false' or 'true' | -| postgresVersion | number | PostgreSQL | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10 | -| timescaledb | boolean | PostgreSQL | Enable usage of TimescaleDB extension | -| maxOpenConns | number | MySQL, PostgreSQL and MSSQL | Maximum number of open connections to the database (Grafana v5.4+) | -| maxIdleConns | number | MySQL, PostgreSQL and MSSQL | Maximum number of connections in the idle connection pool (Grafana v5.4+) | -| connMaxLifetime | number | MySQL, PostgreSQL and MSSQL | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+) | +| Name | Type | Datasource | Description | +| ----------------------- | ------- | ---------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | +| tlsAuth | boolean | _All_ | Enable TLS authentication using client cert configured in secure json data | +| tlsAuthWithCACert | boolean | _All_ | Enable TLS authentication using CA cert | +| tlsSkipVerify | boolean | _All_ | Controls whether a client verifies the server's certificate chain and host name. | +| graphiteVersion | string | Graphite | Graphite version | +| timeInterval | string | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source | +| esVersion | number | Elasticsearch | Elasticsearch version as a number (2/5/56/60/70) | +| timeField | string | Elasticsearch | Which field that should be used as timestamp | +| interval | string | Elasticsearch | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly' | +| logMessageField | string | Elasticsearch | Which field should be used as the log message | +| logLevelField | string | Elasticsearch | Which field should be used to indicate the priority of the log message | +| authType | string | Cloudwatch | Auth provider. keys/credentials/arn | +| assumeRoleArn | string | Cloudwatch | ARN of Assume Role | +| defaultRegion | string | Cloudwatch | AWS region | +| customMetricsNamespaces | string | Cloudwatch | Namespaces of Custom Metrics | +| tsdbVersion | string | OpenTSDB | Version | +| tsdbResolution | string | OpenTSDB | Resolution | +| sslmode | string | PostgreSQL | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full' | +| sslRootCertFile | string | PostgreSQL | SSL server root certificate file, must be readable by the Grafana user | +| sslCertFile | string | PostgreSQL | SSL client certificate file, must be readable by the Grafana user | +| sslKeyFile | string | PostgreSQL | SSL client key file, must be readable by _only_ the Grafana user | +| encrypt | string | MSSQL | Connection SSL encryption handling. 'disable', 'false' or 'true' | +| postgresVersion | number | PostgreSQL | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10 | +| timescaledb | boolean | PostgreSQL | Enable usage of TimescaleDB extension | +| maxOpenConns | number | MySQL, PostgreSQL and MSSQL | Maximum number of open connections to the database (Grafana v5.4+) | +| maxIdleConns | number | MySQL, PostgreSQL and MSSQL | Maximum number of connections in the idle connection pool (Grafana v5.4+) | +| connMaxLifetime | number | MySQL, PostgreSQL and MSSQL | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+) | #### Secure Json Data @@ -178,17 +179,18 @@ Since not all datasources have the same configuration settings we only have the Secure json data is a map of settings that will be encrypted with [secret key]({{< relref "../installation/configuration/#secret-key" >}}) from the Grafana config. The purpose of this is only to hide content from the users of the application. This should be used for storing TLS Cert and password that Grafana will append to the request on the server side. All of these settings are optional. -| Name | Type | Datasource | Description | -| ----| ---- | ---- | --- | -| tlsCACert | string | *All* |CA cert for out going requests | -| tlsClientCert | string | *All* |TLS Client cert for outgoing requests | -| tlsClientKey | string | *All* |TLS Client key for outgoing requests | -| password | string | *All* | password | -| basicAuthPassword | string | *All* | password for basic authentication | -| accessKey | string | Cloudwatch | Access key for connecting to Cloudwatch | -| secretKey | string | Cloudwatch | Secret key for connecting to Cloudwatch | +| Name | Type | Datasource | Description | +| ----------------- | ------ | ---------- | --------------------------------------- | +| tlsCACert | string | _All_ | CA cert for out going requests | +| tlsClientCert | string | _All_ | TLS Client cert for outgoing requests | +| tlsClientKey | string | _All_ | TLS Client key for outgoing requests | +| password | string | _All_ | password | +| basicAuthPassword | string | _All_ | password for basic authentication | +| accessKey | string | Cloudwatch | Access key for connecting to Cloudwatch | +| secretKey | string | Cloudwatch | Secret key for connecting to Cloudwatch | #### Custom HTTP headers for datasources + Datasources managed by Grafanas provisioning can be configured to add HTTP headers to all requests going to that datasource. The header name is configured in the `jsonData` field and the header value should be configured in `secureJsonData`. @@ -197,13 +199,13 @@ configured in `secureJsonData`. apiVersion: 1 datasources: -- name: Graphite - jsonData: - httpHeaderName1: "HeaderName" - httpHeaderName2: "Authorization" - secureJsonData: - httpHeaderValue1: "HeaderValue" - httpHeaderValue2: "Bearer XXXXXXXXX" + - name: Graphite + jsonData: + httpHeaderName1: 'HeaderName' + httpHeaderName2: 'Authorization' + secureJsonData: + httpHeaderValue1: 'HeaderValue' + httpHeaderValue2: 'Bearer XXXXXXXXX' ``` ## Dashboards @@ -216,32 +218,33 @@ The dashboard provider config file looks somewhat like this: apiVersion: 1 providers: - # an unique provider name -- name: 'a unique provider name' - # org id. will default to orgId 1 if not specified - orgId: 1 - # name of the dashboard folder. Required - folder: '' - # folder UID. will be automatically generated if not specified - folderUid: '' - # provider type. Required - type: file - # disable dashboard deletion - disableDeletion: false - # enable dashboard editing - editable: true - # how often Grafana will scan for changed dashboards - updateIntervalSeconds: 10 - # allow updating provisioned dashboards from the UI - allowUiUpdates: false - options: - # path to dashboard files on disk. Required - path: /var/lib/grafana/dashboards + # an unique provider name. Required + - name: 'a unique provider name' + # Org id. Default to 1 + orgId: 1 + # name of the dashboard folder. + folder: '' + # folder UID. will be automatically generated if not specified + folderUid: '' + # provider type. Default to 'file' + type: file + # disable dashboard deletion + disableDeletion: false + # enable dashboard editing + editable: true + # how often Grafana will scan for changed dashboards + updateIntervalSeconds: 10 + # allow updating provisioned dashboards from the UI + allowUiUpdates: false + options: + # path to dashboard files on disk. Required when using the 'file' type + path: /var/lib/grafana/dashboards ``` When Grafana starts, it will update/insert all dashboards available in the configured path. Then later on poll that path every **updateIntervalSeconds** and look for updated json files and update/insert those into the database. #### Making changes to a provisioned dashboard + It's possible to make changes to a provisioned dashboard in the Grafana UI. However, it is not possible to automatically save the changes back to the provisioning source. If `allowUiUpdates` is set to `true` and you make changes to a provisioned dashboard, you can `Save` the dashboard then changes will be persisted to the Grafana database. @@ -250,7 +253,7 @@ If `allowUiUpdates` is set to `true` and you make changes to a provisioned dashb > > If a provisioned dashboard is saved from the UI and the source is removed, the dashboard stored in the database will be deleted unless the configuration option `disableDeletion` is set to true. -If `allowUiUpdates` is configured to `false`, you are not able to make changes to a provisioned dashboard. When you click `Save`, Grafana brings up a *Cannot save provisioned dashboard* dialog. The screenshot below illustrates this behavior. +If `allowUiUpdates` is configured to `false`, you are not able to make changes to a provisioned dashboard. When you click `Save`, Grafana brings up a _Cannot save provisioned dashboard_ dialog. The screenshot below illustrates this behavior. Grafana offers options to export the JSON definition of a dashboard. Either `Copy JSON to Clipboard` or `Save JSON to file` can help you synchronize your dashboard changes back to the provisioning source. @@ -274,6 +277,7 @@ By default Grafana will delete dashboards in the database if the file is removed Alert Notification Channels can be provisioned by adding one or more yaml config files in the [`provisioning/notifiers`](/installation/configuration/#provisioning) directory. Each config file can contain the following top-level fields: + - `notifiers`, a list of alert notifications that will be added or updated during start up. If the notification channel already exists, Grafana will update it to match the configuration file. - `delete_notifiers`, a list of alert notifications to be deleted before inserting/updating those in the `notifiers` list. @@ -316,8 +320,8 @@ notifiers: # See `Supported Settings` section for settings supporter for each # alert notification type. settings: - recipient: "XXX" - token: "xoxb" + recipient: 'XXX' + token: 'xoxb' uploadImage: true url: https://slack.com @@ -338,131 +342,131 @@ The following sections detail the supported settings for each alert notification #### Alert notification `pushover` -| Name | -| ---- | +| Name | +| -------- | | apiToken | -| userKey | -| device | -| retry | -| expire | +| userKey | +| device | +| retry | +| expire | #### Alert notification `slack` -| Name | -| ---- | -| url | -| recipient | -| username | -| icon_emoji | -| icon_url | -| uploadImage | -| mentionUsers | -| mentionGroups | +| Name | +| -------------- | +| url | +| recipient | +| username | +| icon_emoji | +| icon_url | +| uploadImage | +| mentionUsers | +| mentionGroups | | mentionChannel | -| token | +| token | #### Alert notification `victorops` -| Name | -| ---- | -| url | +| Name | +| ----------- | +| url | | autoResolve | #### Alert notification `kafka` -| Name | -| ---- | +| Name | +| -------------- | | kafkaRestProxy | -| kafkaTopic | +| kafkaTopic | #### Alert notification `LINE` -| Name | -| ---- | +| Name | +| ----- | | token | #### Alert notification `pagerduty` -| Name | -| ---- | +| Name | +| -------------- | | integrationKey | -| autoResolve | +| autoResolve | #### Alert notification `sensu` -| Name | -| ---- | -| url | -| source | -| handler | +| Name | +| -------- | +| url | +| source | +| handler | | username | | password | #### Alert notification `prometheus-alertmanager` -| Name | -| ---- | -| url | -| basicAuthUser | +| Name | +| ----------------- | +| url | +| basicAuthUser | | basicAuthPassword | #### Alert notification `teams` | Name | | ---- | -| url | +| url | #### Alert notification `dingding` | Name | | ---- | -| url | +| url | #### Alert notification `email` -| Name | -| ---- | +| Name | +| ----------- | | singleEmail | -| addresses | +| addresses | #### Alert notification `hipchat` -| Name | -| ---- | -| url | +| Name | +| ------ | +| url | | apikey | | roomid | #### Alert notification `opsgenie` -| Name | -| ---- | -| apiKey | -| apiUrl | -| autoClose | +| Name | +| ---------------- | +| apiKey | +| apiUrl | +| autoClose | | overridePriority | #### Alert notification `telegram` -| Name | -| ---- | -| bottoken | -| chatid | +| Name | +| ----------- | +| bottoken | +| chatid | | uploadImage | #### Alert notification `threema` -| Name | -| ---- | -| gateway_id | +| Name | +| ------------ | +| gateway_id | | recipient_id | -| api_secret | +| api_secret | #### Alert notification `webhook` -| Name | -| ---- | -| url | +| Name | +| -------- | +| url | | username | | password | @@ -470,4 +474,4 @@ The following sections detail the supported settings for each alert notification | Name | | ---- | -| url | +| url | diff --git a/go.sum b/go.sum index 955d45f1c49..686e0169afa 100644 --- a/go.sum +++ b/go.sum @@ -297,6 +297,7 @@ github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:X github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8= github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= diff --git a/pkg/services/provisioning/dashboards/config_reader.go b/pkg/services/provisioning/dashboards/config_reader.go index a709b9565f0..e50b1244095 100644 --- a/pkg/services/provisioning/dashboards/config_reader.go +++ b/pkg/services/provisioning/dashboards/config_reader.go @@ -88,6 +88,10 @@ func (cr *configReader) readConfig() ([]*config, error) { dashboard.OrgID = 1 } + if dashboard.Type == "" { + dashboard.Type = "file" + } + if dashboard.UpdateIntervalSeconds == 0 { dashboard.UpdateIntervalSeconds = 10 } diff --git a/pkg/services/provisioning/dashboards/config_reader_test.go b/pkg/services/provisioning/dashboards/config_reader_test.go index b4776925ec7..160663fe5b7 100644 --- a/pkg/services/provisioning/dashboards/config_reader_test.go +++ b/pkg/services/provisioning/dashboards/config_reader_test.go @@ -4,87 +4,99 @@ import ( "os" "testing" + "github.com/stretchr/testify/require" + "github.com/grafana/grafana/pkg/infra/log" - . "github.com/smartystreets/goconvey/convey" ) var ( simpleDashboardConfig = "./testdata/test-configs/dashboards-from-disk" oldVersion = "./testdata/test-configs/version-0" brokenConfigs = "./testdata/test-configs/broken-configs" + appliedDefaults = "./testdata/test-configs/applied-defaults" ) func TestDashboardsAsConfig(t *testing.T) { - Convey("Dashboards as configuration", t, func() { + t.Run("Dashboards as configuration", func(t *testing.T) { + logger := log.New("test-logger") - Convey("Can read config file version 1 format", func() { + t.Run("default values should be applied", func(t *testing.T) { + cfgProvider := configReader{path: appliedDefaults, log: logger} + cfg, err := cfgProvider.readConfig() + require.NoError(t, err) + + require.Equal(t, "file", cfg[0].Type) + require.Equal(t, int64(1), cfg[0].OrgID) + require.Equal(t, int64(10), cfg[0].UpdateIntervalSeconds) + }) + + t.Run("Can read config file version 1 format", func(t *testing.T) { _ = os.Setenv("TEST_VAR", "general") cfgProvider := configReader{path: simpleDashboardConfig, log: logger} cfg, err := cfgProvider.readConfig() _ = os.Unsetenv("TEST_VAR") - So(err, ShouldBeNil) + require.NoError(t, err) validateDashboardAsConfig(t, cfg) }) - Convey("Can read config file in version 0 format", func() { + t.Run("Can read config file in version 0 format", func(t *testing.T) { cfgProvider := configReader{path: oldVersion, log: logger} cfg, err := cfgProvider.readConfig() - So(err, ShouldBeNil) + require.NoError(t, err) validateDashboardAsConfig(t, cfg) }) - Convey("Should skip invalid path", func() { - + t.Run("Should skip invalid path", func(t *testing.T) { cfgProvider := configReader{path: "/invalid-directory", log: logger} cfg, err := cfgProvider.readConfig() if err != nil { t.Fatalf("readConfig return an error %v", err) } - So(len(cfg), ShouldEqual, 0) + require.Equal(t, 0, len(cfg)) }) - Convey("Should skip broken config files", func() { - + t.Run("Should skip broken config files", func(t *testing.T) { cfgProvider := configReader{path: brokenConfigs, log: logger} cfg, err := cfgProvider.readConfig() if err != nil { t.Fatalf("readConfig return an error %v", err) } - So(len(cfg), ShouldEqual, 0) + require.Equal(t, 0, len(cfg)) }) }) } + func validateDashboardAsConfig(t *testing.T, cfg []*config) { t.Helper() - So(len(cfg), ShouldEqual, 2) + require.Equal(t, 2, len(cfg)) ds := cfg[0] - So(ds.Name, ShouldEqual, "general dashboards") - So(ds.Type, ShouldEqual, "file") - So(ds.OrgID, ShouldEqual, 2) - So(ds.Folder, ShouldEqual, "developers") - So(ds.FolderUID, ShouldEqual, "xyz") - So(ds.Editable, ShouldBeTrue) - So(len(ds.Options), ShouldEqual, 1) - So(ds.Options["path"], ShouldEqual, "/var/lib/grafana/dashboards") - So(ds.DisableDeletion, ShouldBeTrue) - So(ds.UpdateIntervalSeconds, ShouldEqual, 15) + require.Equal(t, ds.Name, "general dashboards") + require.Equal(t, ds.Type, "file") + require.Equal(t, ds.OrgID, int64(2)) + require.Equal(t, ds.Folder, "developers") + require.Equal(t, ds.FolderUID, "xyz") + require.True(t, ds.Editable) + require.Equal(t, len(ds.Options), 1) + require.Equal(t, ds.Options["path"], "/var/lib/grafana/dashboards") + require.True(t, ds.DisableDeletion) + require.Equal(t, ds.UpdateIntervalSeconds, int64(15)) ds2 := cfg[1] - So(ds2.Name, ShouldEqual, "default") - So(ds2.Type, ShouldEqual, "file") - So(ds2.OrgID, ShouldEqual, 1) - So(ds2.Folder, ShouldEqual, "") - So(ds2.FolderUID, ShouldEqual, "") - So(ds2.Editable, ShouldBeFalse) - So(len(ds2.Options), ShouldEqual, 1) - So(ds2.Options["path"], ShouldEqual, "/var/lib/grafana/dashboards") - So(ds2.DisableDeletion, ShouldBeFalse) - So(ds2.UpdateIntervalSeconds, ShouldEqual, 10) + require.Equal(t, ds2.Name, "default") + require.Equal(t, ds2.Type, "file") + require.Equal(t, ds2.OrgID, int64(1)) + require.Equal(t, ds2.Folder, "") + require.Equal(t, ds2.FolderUID, "") + require.False(t, ds2.Editable) + require.Equal(t, len(ds2.Options), 1) + require.Equal(t, ds2.Options["path"], "/var/lib/grafana/dashboards") + require.False(t, ds2.DisableDeletion) + require.Equal(t, ds2.UpdateIntervalSeconds, int64(10)) } diff --git a/pkg/services/provisioning/dashboards/testdata/test-configs/applied-defaults/dev-dashboards.yaml b/pkg/services/provisioning/dashboards/testdata/test-configs/applied-defaults/dev-dashboards.yaml new file mode 100644 index 00000000000..7993d5a3e2e --- /dev/null +++ b/pkg/services/provisioning/dashboards/testdata/test-configs/applied-defaults/dev-dashboards.yaml @@ -0,0 +1,6 @@ +apiVersion: 1 + +providers: +- name: 'applied-defaults' + options: + path: /var/lib/grafana/dashboards