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

Chore: Fix linting issues caught by ruleguard (#28799)

Browse Source 
* Chore: Fix linting issues caught by ruleguard

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Improve error check

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-11-17 11:27:45 +01:00
committed by GitHub
parent 967e9b39e8
commit 2bf964c61e
6 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/mysql/macros.go
View File

@@ -96,7 +96,7 @@ func (m *mySqlMacroEngine) evaluateMacro(name string, args []string) (string, er
case "__timeGroupAlias":
tg, err := m.evaluateMacro("__timeGroup", args)
if err == nil {
return tg + " AS \"time\"", err
return tg + " AS \"time\"", nil
}
return "", err
case "__unixEpochFilter":
@@ -131,7 +131,7 @@ func (m *mySqlMacroEngine) evaluateMacro(name string, args []string) (string, er
case "__unixEpochGroupAlias":
tg, err := m.evaluateMacro("__unixEpochGroup", args)
if err == nil {
return tg + " AS \"time\"", err
return tg + " AS \"time\"", nil
}
return "", err
default: