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

Revert "Opportunities to unindent code (unindent)"

Browse Source
This commit is contained in:
Marcus Efraimsson 2018-05-02 14:06:46 +02:00 committed by GitHub
parent 6dcb9e696d
commit de0d409a23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 131 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/common.go
View File

@ -99,8 +99,10 @@ func Error(status int, message string, err error) *NormalResponse {
data["message"] = message data["message"] = message
} }
if err != nil && setting.Env != setting.PROD { if err != nil {
data["error"] = err.Error() if setting.Env != setting.PROD {
data["error"] = err.Error()
}
} }
resp := JSON(status, data) resp := JSON(status, data)

54
pkg/components/dynmap/dynmap.go
View File

@ -639,24 +639,26 @@ func (v *Value) Object() (*Object, error) {
valid = true valid = true
} }
if !valid {
return nil, ErrNotObject
}
obj := new(Object)
obj.valid = valid
m := make(map[string]*Value)
if valid { if valid {
for key, element := range v.data.(map[string]interface{}) { obj := new(Object)
m[key] = &Value{element, true} obj.valid = valid
m := make(map[string]*Value)
if valid {
for key, element := range v.data.(map[string]interface{}) {
m[key] = &Value{element, true}
}
} }
obj.data = v.data
obj.m = m
return obj, nil
} }
obj.data = v.data return nil, ErrNotObject
obj.m = m
return obj, nil
} }
// Attempts to typecast the current value into an object arrau. // Attempts to typecast the current value into an object arrau.
@ -676,19 +678,23 @@ func (v *Value) ObjectArray() ([]*Object, error) {
// Unsure if this is a good way to use slices, it's probably not // Unsure if this is a good way to use slices, it's probably not
var slice []*Object var slice []*Object
if !valid { if valid {
return nil, ErrNotObjectArray
}
for _, element := range v.data.([]interface{}) {
childValue := Value{element, true}
childObject, err := childValue.Object()
if err != nil { for _, element := range v.data.([]interface{}) {
return nil, ErrNotObjectArray childValue := Value{element, true}
childObject, err := childValue.Object()
if err != nil {
return nil, ErrNotObjectArray
}
slice = append(slice, childObject)
} }
slice = append(slice, childObject)
return slice, nil
} }
return slice, nil
return nil, ErrNotObjectArray
} }
// Attempts to typecast the current value into a string. // Attempts to typecast the current value into a string.

6
pkg/components/simplejson/simplejson.go
View File

@ -168,8 +168,10 @@ func (j *Json) GetPath(branch ...string) *Json {
// js.Get("top_level").Get("array").GetIndex(1).Get("key").Int() // js.Get("top_level").Get("array").GetIndex(1).Get("key").Int()
func (j *Json) GetIndex(index int) *Json { func (j *Json) GetIndex(index int) *Json {
a, err := j.Array() a, err := j.Array()
if err == nil && len(a) > index { if err == nil {
return &Json{a[index]} if len(a) > index {
return &Json{a[index]}
}
} }
return &Json{nil} return &Json{nil}
} }

31
pkg/middleware/dashboard_redirect.go
View File

@ -24,12 +24,12 @@ func RedirectFromLegacyDashboardURL() macaron.Handler {
return func(c *m.ReqContext) { return func(c *m.ReqContext) {
slug := c.Params("slug") slug := c.Params("slug")
if slug == "" { if slug != "" {
return if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil {
} url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil { c.Redirect(url, 301)
url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery) return
c.Redirect(url, 301) }
} }
} }
} }
@ -39,16 +39,17 @@ func RedirectFromLegacyDashboardSoloURL() macaron.Handler {
slug := c.Params("slug") slug := c.Params("slug")
renderRequest := c.QueryBool("render") renderRequest := c.QueryBool("render")
if slug == "" { if slug != "" {
return if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil {
} if renderRequest && strings.Contains(url, setting.AppSubUrl) {
if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil { url = strings.Replace(url, setting.AppSubUrl, "", 1)
if renderRequest && strings.Contains(url, setting.AppSubUrl) { }
url = strings.Replace(url, setting.AppSubUrl, "", 1)
url = strings.Replace(url, "/d/", "/d-solo/", 1)
url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
c.Redirect(url, 301)
return
} }
url = strings.Replace(url, "/d/", "/d-solo/", 1)
url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
c.Redirect(url, 301)
} }
} }
} }

23
pkg/tsdb/mssql/mssql.go
View File

@ -298,19 +298,18 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
key := elem.Value.(string) key := elem.Value.(string)
result.Series = append(result.Series, pointsBySeries[key]) result.Series = append(result.Series, pointsBySeries[key])
if !fillMissing { if fillMissing {
break series := pointsBySeries[key]
} // fill in values from last fetched value till interval end
series := pointsBySeries[key] intervalStart := series.Points[len(series.Points)-1][1].Float64
// fill in values from last fetched value till interval end intervalEnd := float64(tsdbQuery.TimeRange.MustGetTo().UnixNano() / 1e6)
intervalStart := series.Points[len(series.Points)-1][1].Float64
intervalEnd := float64(tsdbQuery.TimeRange.MustGetTo().UnixNano() / 1e6)
// align interval start // align interval start
intervalStart = math.Floor(intervalStart/fillInterval) * fillInterval intervalStart = math.Floor(intervalStart/fillInterval) * fillInterval
for i := intervalStart + fillInterval; i < intervalEnd; i += fillInterval { for i := intervalStart + fillInterval; i < intervalEnd; i += fillInterval {
series.Points = append(series.Points, tsdb.TimePoint{fillValue, null.FloatFrom(i)}) series.Points = append(series.Points, tsdb.TimePoint{fillValue, null.FloatFrom(i)})
rowCount++ rowCount++
}
} }
} }

23
pkg/tsdb/mysql/mysql.go
View File

@ -309,19 +309,18 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
key := elem.Value.(string) key := elem.Value.(string)
result.Series = append(result.Series, pointsBySeries[key]) result.Series = append(result.Series, pointsBySeries[key])
if !fillMissing { if fillMissing {
break series := pointsBySeries[key]
} // fill in values from last fetched value till interval end
series := pointsBySeries[key] intervalStart := series.Points[len(series.Points)-1][1].Float64
// fill in values from last fetched value till interval end intervalEnd := float64(tsdbQuery.TimeRange.MustGetTo().UnixNano() / 1e6)
intervalStart := series.Points[len(series.Points)-1][1].Float64
intervalEnd := float64(tsdbQuery.TimeRange.MustGetTo().UnixNano() / 1e6)
// align interval start // align interval start
intervalStart = math.Floor(intervalStart/fillInterval) * fillInterval intervalStart = math.Floor(intervalStart/fillInterval) * fillInterval
for i := intervalStart + fillInterval; i < intervalEnd; i += fillInterval { for i := intervalStart + fillInterval; i < intervalEnd; i += fillInterval {
series.Points = append(series.Points, tsdb.TimePoint{fillValue, null.FloatFrom(i)}) series.Points = append(series.Points, tsdb.TimePoint{fillValue, null.FloatFrom(i)})
rowCount++ rowCount++
}
} }
} }

23
pkg/tsdb/postgres/postgres.go
View File

@ -289,19 +289,18 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co
key := elem.Value.(string) key := elem.Value.(string)
result.Series = append(result.Series, pointsBySeries[key]) result.Series = append(result.Series, pointsBySeries[key])
if !fillMissing { if fillMissing {
break series := pointsBySeries[key]
} // fill in values from last fetched value till interval end
series := pointsBySeries[key] intervalStart := series.Points[len(series.Points)-1][1].Float64
// fill in values from last fetched value till interval end intervalEnd := float64(tsdbQuery.TimeRange.MustGetTo().UnixNano() / 1e6)
intervalStart := series.Points[len(series.Points)-1][1].Float64
intervalEnd := float64(tsdbQuery.TimeRange.MustGetTo().UnixNano() / 1e6)
// align interval start // align interval start
intervalStart = math.Floor(intervalStart/fillInterval) * fillInterval intervalStart = math.Floor(intervalStart/fillInterval) * fillInterval
for i := intervalStart + fillInterval; i < intervalEnd; i += fillInterval { for i := intervalStart + fillInterval; i < intervalEnd; i += fillInterval {
series.Points = append(series.Points, tsdb.TimePoint{fillValue, null.FloatFrom(i)}) series.Points = append(series.Points, tsdb.TimePoint{fillValue, null.FloatFrom(i)})
rowCount++ rowCount++
}
} }
} }

89
pkg/tsdb/sql_engine.go
View File

@ -141,51 +141,50 @@ func (e *DefaultSqlEngine) Query(
// ConvertSqlTimeColumnToEpochMs converts column named time to unix timestamp in milliseconds // ConvertSqlTimeColumnToEpochMs converts column named time to unix timestamp in milliseconds
// to make native datetime types and epoch dates work in annotation and table queries. // to make native datetime types and epoch dates work in annotation and table queries.
func ConvertSqlTimeColumnToEpochMs(values RowValues, timeIndex int) { func ConvertSqlTimeColumnToEpochMs(values RowValues, timeIndex int) {
if timeIndex < 0 { if timeIndex >= 0 {
return switch value := values[timeIndex].(type) {
} case time.Time:
switch value := values[timeIndex].(type) { values[timeIndex] = EpochPrecisionToMs(float64(value.UnixNano()))
case time.Time: case *time.Time:
values[timeIndex] = EpochPrecisionToMs(float64(value.UnixNano())) if value != nil {
case *time.Time: values[timeIndex] = EpochPrecisionToMs(float64((*value).UnixNano()))
if value != nil { }
values[timeIndex] = EpochPrecisionToMs(float64((*value).UnixNano())) case int64:
} values[timeIndex] = int64(EpochPrecisionToMs(float64(value)))
case int64: case *int64:
values[timeIndex] = int64(EpochPrecisionToMs(float64(value))) if value != nil {
case *int64: values[timeIndex] = int64(EpochPrecisionToMs(float64(*value)))
if value != nil { }
values[timeIndex] = int64(EpochPrecisionToMs(float64(*value))) case uint64:
} values[timeIndex] = int64(EpochPrecisionToMs(float64(value)))
case uint64: case *uint64:
values[timeIndex] = int64(EpochPrecisionToMs(float64(value))) if value != nil {
case *uint64: values[timeIndex] = int64(EpochPrecisionToMs(float64(*value)))
if value != nil { }
values[timeIndex] = int64(EpochPrecisionToMs(float64(*value))) case int32:
} values[timeIndex] = int64(EpochPrecisionToMs(float64(value)))
case int32: case *int32:
values[timeIndex] = int64(EpochPrecisionToMs(float64(value))) if value != nil {
case *int32: values[timeIndex] = int64(EpochPrecisionToMs(float64(*value)))
if value != nil { }
values[timeIndex] = int64(EpochPrecisionToMs(float64(*value))) case uint32:
} values[timeIndex] = int64(EpochPrecisionToMs(float64(value)))
case uint32: case *uint32:
values[timeIndex] = int64(EpochPrecisionToMs(float64(value))) if value != nil {
case *uint32: values[timeIndex] = int64(EpochPrecisionToMs(float64(*value)))
if value != nil { }
values[timeIndex] = int64(EpochPrecisionToMs(float64(*value))) case float64:
} values[timeIndex] = EpochPrecisionToMs(value)
case float64: case *float64:
values[timeIndex] = EpochPrecisionToMs(value) if value != nil {
case *float64: values[timeIndex] = EpochPrecisionToMs(*value)
if value != nil { }
values[timeIndex] = EpochPrecisionToMs(*value) case float32:
} values[timeIndex] = EpochPrecisionToMs(float64(value))
case float32: case *float32:
values[timeIndex] = EpochPrecisionToMs(float64(value)) if value != nil {
case *float32: values[timeIndex] = EpochPrecisionToMs(float64(*value))
if value != nil { }
values[timeIndex] = EpochPrecisionToMs(float64(*value))
} }
} }
} }