IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug Fix: Respect data source version when provisioning (#77428)

Browse Source
This commit is contained in:
Andres Martinez Gotor 2023-11-02 11:27:17 +01:00 committed by GitHub
parent b13395afbc
commit 82a7e1229a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/administration/provisioning/index.md
View File

@ -157,6 +157,8 @@ datasources:
password: password:
# <string> Sets the basic authorization password. # <string> Sets the basic authorization password.
basicAuthPassword: basicAuthPassword:
# <int> Sets the version. Used to compare versions when
# updating. Ignored when creating a new data source.
version: 1 version: 1
# <bool> Allows users to edit data sources from the # <bool> Allows users to edit data sources from the
# Grafana UI. # Grafana UI.

4
pkg/services/provisioning/datasources/datasources.go
View File

@ -80,10 +80,14 @@ func (dc *DatasourceProvisioner) provisionDataSources(ctx context.Context, cfg *
updateCmd := createUpdateCommand(ds, dataSource.ID) updateCmd := createUpdateCommand(ds, dataSource.ID)
dc.log.Debug("updating datasource from configuration", "name", updateCmd.Name, "uid", updateCmd.UID) dc.log.Debug("updating datasource from configuration", "name", updateCmd.Name, "uid", updateCmd.UID)
if _, err := dc.store.UpdateDataSource(ctx, updateCmd); err != nil { if _, err := dc.store.UpdateDataSource(ctx, updateCmd); err != nil {
if errors.Is(err, datasources.ErrDataSourceUpdatingOldVersion) {
dc.log.Debug("ignoring old version of datasource", "name", updateCmd.Name, "uid", updateCmd.UID)
} else {
return err return err
} }
} }
} }
}
return nil return nil
} }

1
pkg/services/provisioning/datasources/types.go
View File

@ -243,6 +243,7 @@ func createUpdateCommand(ds *upsertDataSourceFromConfig, id int64) *datasources.
return &datasources.UpdateDataSourceCommand{ return &datasources.UpdateDataSourceCommand{
ID: id, ID: id,
Version: ds.Version,
UID: ds.UID, UID: ds.UID,
OrgID: ds.OrgID, OrgID: ds.OrgID,
Name: ds.Name, Name: ds.Name,

8
pkg/services/provisioning/datasources/types_test.go
View File

@ -13,3 +13,11 @@ func TestUIDFromNames(t *testing.T) {
require.Equal(t, safeUIDFromName("AAA"), "PCB1AD2119D8FAFB6") require.Equal(t, safeUIDFromName("AAA"), "PCB1AD2119D8FAFB6")
}) })
} }
func TestCreateUpdateCommand(t *testing.T) {
t.Run("includes the version in the command", func(t *testing.T) {
ds := &upsertDataSourceFromConfig{OrgID: 1, Version: 1, Name: "test"}
cmd := createUpdateCommand(ds, 1)
require.Equal(t, 1, cmd.Version)
})
}