mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Correlations: change casing of *UID properties (#52836)
* Correlations: change casing of *UID properties * add link to correlations HTTP API
This commit is contained in:
@@ -19,10 +19,10 @@ type Correlation struct {
|
||||
UID string `json:"uid" xorm:"pk 'uid'"`
|
||||
// UID of the data source the correlation originates from
|
||||
// example:d0oxYRg4z
|
||||
SourceUID string `json:"sourceUid" xorm:"pk 'source_uid'"`
|
||||
SourceUID string `json:"sourceUID" xorm:"pk 'source_uid'"`
|
||||
// UID of the data source the correlation points to
|
||||
// example:PE1C5CBDA0504A6A3
|
||||
TargetUID string `json:"targetUid" xorm:"target_uid"`
|
||||
TargetUID string `json:"targetUID" xorm:"target_uid"`
|
||||
// Label identifying the correlation
|
||||
// example: My Label
|
||||
Label string `json:"label" xorm:"label"`
|
||||
@@ -48,7 +48,7 @@ type CreateCorrelationCommand struct {
|
||||
SkipReadOnlyCheck bool `json:"-"`
|
||||
// Target data source UID to which the correlation is created
|
||||
// example:PE1C5CBDA0504A6A3
|
||||
TargetUID string `json:"targetUid" binding:"Required"`
|
||||
TargetUID string `json:"targetUID" binding:"Required"`
|
||||
// Optional label identifying the correlation
|
||||
// example: My label
|
||||
Label string `json:"label"`
|
||||
|
||||
@@ -309,7 +309,7 @@ func validateDatasource(t *testing.T, dsCfg *configs) {
|
||||
require.Equal(t, ds.Version, 10)
|
||||
|
||||
require.Equal(t, []map[string]interface{}{{
|
||||
"targetUid": "a target",
|
||||
"targetUID": "a target",
|
||||
"label": "a label",
|
||||
"description": "a description",
|
||||
}}, ds.Correlations)
|
||||
|
||||
@@ -135,14 +135,14 @@ func (dc *DatasourceProvisioner) applyChanges(ctx context.Context, configPath st
|
||||
}
|
||||
|
||||
func makeCreateCorrelationCommand(correlation map[string]interface{}, SourceUid string, OrgId int64) (correlations.CreateCorrelationCommand, error) {
|
||||
targetUid, ok := correlation["targetUid"].(string)
|
||||
targetUID, ok := correlation["targetUID"].(string)
|
||||
if !ok {
|
||||
return correlations.CreateCorrelationCommand{}, fmt.Errorf("correlation missing targetUid")
|
||||
return correlations.CreateCorrelationCommand{}, fmt.Errorf("correlation missing targetUID")
|
||||
}
|
||||
|
||||
return correlations.CreateCorrelationCommand{
|
||||
SourceUID: SourceUid,
|
||||
TargetUID: targetUid,
|
||||
TargetUID: targetUID,
|
||||
Label: correlation["label"].(string),
|
||||
Description: correlation["description"].(string),
|
||||
OrgId: OrgId,
|
||||
|
||||
@@ -13,7 +13,7 @@ datasources:
|
||||
withCredentials: true
|
||||
isDefault: true
|
||||
correlations:
|
||||
- targetUid: a target
|
||||
- targetUID: a target
|
||||
label: a label
|
||||
description: a description
|
||||
jsonData:
|
||||
|
||||
@@ -7,9 +7,9 @@ datasources:
|
||||
access: proxy
|
||||
url: http://localhost:8080
|
||||
correlations:
|
||||
- targetUid: graphite
|
||||
- targetUID: graphite
|
||||
label: a label
|
||||
description: a description
|
||||
- targetUid: graphite
|
||||
- targetUID: graphite
|
||||
label: a second label
|
||||
description: a second description
|
||||
@@ -11,7 +11,7 @@ datasources:
|
||||
with_credentials: true
|
||||
is_default: true
|
||||
correlations:
|
||||
- targetUid: a target
|
||||
- targetUID: a target
|
||||
label: a label
|
||||
description: a description
|
||||
json_data:
|
||||
|
||||
Reference in New Issue
Block a user