Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
ea53e722
Commit
ea53e722
authored
Apr 21, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysql: added query help
parent
97e2d75f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
5 deletions
+41
-5
public/app/plugins/datasource/mysql/module.ts
+1
-0
public/app/plugins/datasource/mysql/partials/query.editor.html
+30
-5
public/sass/components/_gf-form.scss
+10
-0
No files found.
public/app/plugins/datasource/mysql/module.ts
View file @
ea53e722
...
...
@@ -23,6 +23,7 @@ class MysqlQueryCtrl extends QueryCtrl {
target
:
MysqlQuery
;
lastQueryMeta
:
QueryMeta
;
lastQueryError
:
string
;
showHelp
:
boolean
;
constructor
(
$scope
,
$injector
)
{
super
(
$scope
,
$injector
);
...
...
public/app/plugins/datasource/mysql/partials/query.editor.html
View file @
ea53e722
...
...
@@ -12,9 +12,12 @@
<select
class=
"gf-form-input gf-size-auto"
ng-model=
"ctrl.target.format"
ng-options=
"f.value as f.text for f in ctrl.formats"
ng-change=
"ctrl.refresh()"
></select>
</div>
</div>
<div
class=
"gf-form max-width-30"
>
<label
class=
"gf-form-label query-keyword"
>
Name by
</label>
<input
type=
"text"
class=
"gf-form-input"
ng-model=
"ctrl.target.alias"
spellcheck=
'false'
placeholder=
"pattern"
ng-blur=
"ctrl.refresh()"
>
<div
class=
"gf-form"
>
<label
class=
"gf-form-label query-keyword"
ng-click=
"ctrl.showHelp = !ctrl.showHelp"
>
Show Help
<i
class=
"fa fa-caret-down"
ng-show=
"ctrl.showHelp"
></i>
<i
class=
"fa fa-caret-right"
ng-hide=
"ctrl.showHelp"
></i>
</label>
</div>
<div
class=
"gf-form"
ng-show=
"ctrl.lastQueryMeta"
>
<label
class=
"gf-form-label query-keyword"
ng-click=
"ctrl.showLastQuerySQL = !ctrl.showLastQuerySQL"
>
...
...
@@ -28,7 +31,29 @@
</div>
</div>
<pre
class=
"small"
ng-show=
"ctrl.showLastQuerySQL"
>
{{ctrl.lastQueryMeta.sql}}
</pre>
<pre
class=
"small alert alert-error"
ng-show=
"ctrl.lastQueryError"
>
{{ctrl.lastQueryError}}
</pre>
<div
class=
"gf-form"
ng-show=
"ctrl.showLastQuerySQL"
>
<pre
class=
"gf-form-pre"
>
{{ctrl.lastQueryMeta.sql}}
</pre>
</div>
<div
class=
"gf-form"
ng-show=
"ctrl.showHelp"
>
<pre
class=
"gf-form-pre alert alert-info"
>
Time series:
- return column named time_sec (UTC in seconds), use UNIX_TIMESTAMP(column)
- return column named value for the time point value
- return column named metric to represent the series name
Table:
- return any set of columns
Macros:
- $__time(column) -
>
UNIX_TIMESTAMP(column) as time_sec
- $__timeFilter(column) -
>
UNIX_TIMESTAMP(time_date_time)
>
from AND UNIX_TIMESTAMP(time_date_time)
<
1492750877
</pre>
</div>
</div>
<div
class=
"gf-form"
ng-show=
"ctrl.lastQueryError"
>
<pre
class=
"gf-form-pre alert alert-error"
>
{{ctrl.lastQueryError}}
</pre>
</div>
</query-editor-row>
public/sass/components/_gf-form.scss
View file @
ea53e722
...
...
@@ -66,6 +66,16 @@ $gf-form-margin: 0.25rem;
}
}
.gf-form-pre
{
display
:
block
;
flex-grow
:
1
;
font-size
:
$font-size-sm
;
margin
:
0
;
margin-right
:
$gf-form-margin
;
border
:
$input-btn-border-width
solid
transparent
;
@include
border-radius
(
$label-border-radius-sm
);
}
.gf-form-error
{
padding
:
$input-padding-y
$input-padding-x
;
margin-right
:
$gf-form-margin
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment