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

tech(tsdb): add jsondata to tsdb datasource struct

Browse Source
This commit is contained in:
bergquist 2016-10-03 14:31:33 +02:00
parent 6f1a9f4f2e
commit 653a0502c4
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/alerting/conditions/query.go
View File

@ -123,6 +123,7 @@ func (c *QueryCondition) getRequestForAlertRule(datasource *m.DataSource, timeRa
BasicAuth: datasource.BasicAuth, BasicAuth: datasource.BasicAuth,
BasicAuthUser: datasource.BasicAuthUser, BasicAuthUser: datasource.BasicAuthUser,
BasicAuthPassword: datasource.BasicAuthPassword, BasicAuthPassword: datasource.BasicAuthPassword,
JsonData: datasource.JsonData,
}, },
}, },
}, },

1
pkg/tsdb/models.go
View File

@ -39,6 +39,7 @@ type DataSourceInfo struct {
BasicAuth bool BasicAuth bool
BasicAuthUser string BasicAuthUser string
BasicAuthPassword string BasicAuthPassword string
JsonData *simplejson.Json
} }
type BatchTiming struct { type BatchTiming struct {