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
4bf8777c
Commit
4bf8777c
authored
Dec 29, 2013
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed timefield from filters
parent
55467e26
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
28 deletions
+12
-28
src/app/controllers/graphiteTarget.js
+1
-0
src/app/panels/filtering/editor.html
+0
-8
src/app/panels/filtering/meta.html
+0
-16
src/app/panels/filtering/module.js
+1
-2
src/app/panels/graphite/module.js
+0
-1
src/app/panels/timepicker/module.js
+0
-1
src/app/services/dashboard.js
+10
-0
No files found.
src/app/controllers/graphiteTarget.js
View file @
4bf8777c
...
...
@@ -15,6 +15,7 @@ function (angular, _, config, graphiteFuncs, Parser) {
$scope
.
init
=
function
()
{
$scope
.
funcCategories
=
graphiteFuncs
.
getCategories
();
parseTarget
();
i
=
10
;
};
function
parseTarget
()
{
...
...
src/app/panels/filtering/editor.html
deleted
100644 → 0
View file @
55467e26
<div>
<div
class=
"row-fluid"
>
<div
class=
"span12"
>
No options here
</div>
</div>
</div>
\ No newline at end of file
src/app/panels/filtering/meta.html
deleted
100644 → 0
View file @
55467e26
<div>
<style>
.input-query-alias
{
margin-bottom
:
5px
!important
;
}
</style>
<a
class=
"close"
ng-click=
"render();dismiss();"
href=
""
>
×
</a>
<h6>
Query Alias
</h6>
<form>
<input
class=
"input-medium input-query-alias"
type=
"text"
ng-model=
"queries.list[id].alias"
placeholder=
'Alias...'
/>
<div>
<i
ng-repeat=
"color in queries.colors"
class=
"pointer"
ng-class=
"{'icon-circle-blank':queries.list[id].color == color,'icon-circle':queries.list[id].color != color}"
style=
"color:{{color}}"
ng-click=
"queries.list[id].color = color;render();"
>
</i>
</div>
</form>
</div>
\ No newline at end of file
src/app/panels/filtering/module.js
View file @
4bf8777c
...
...
@@ -18,8 +18,7 @@ function (angular, app, _) {
$scope
.
panelMeta
=
{
status
:
"Stable"
,
description
:
"A controllable list of all filters currently applied to the dashboard. You "
+
"almost certainly want one of these on your dashboard somewhere."
description
:
"graphite target filters"
};
// Set and populate defaults
...
...
src/app/panels/graphite/module.js
View file @
4bf8777c
...
...
@@ -737,7 +737,6 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
type
:
'time'
,
from
:
moment
.
utc
(
ranges
.
xaxis
.
from
).
toDate
(),
to
:
moment
.
utc
(
ranges
.
xaxis
.
to
).
toDate
(),
field
:
scope
.
panel
.
time_field
});
});
}
...
...
src/app/panels/timepicker/module.js
View file @
4bf8777c
...
...
@@ -153,7 +153,6 @@ function (angular, app, _, moment, kbn) {
// Create filter object
var
_filter
=
{
type
:
'time'
,
field
:
$scope
.
panel
.
timefield
,
from
:
"now-"
+
timespan
,
to
:
"now"
};
...
...
src/app/services/dashboard.js
View file @
4bf8777c
...
...
@@ -139,6 +139,16 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
_
.
defaults
(
dashboard
,
_dash
);
_
.
defaults
(
dashboard
.
index
,
_dash
.
index
);
_
.
defaults
(
dashboard
.
loader
,
_dash
.
loader
);
var
filtering
=
_
.
findWhere
(
dashboard
.
pulldowns
,
{
type
:
'filtering'
});
if
(
!
filtering
)
{
dashboard
.
pulldowns
.
push
({
type
:
'filtering'
,
enable
:
false
,
collapse
:
true
});
}
return
dashboard
;
};
...
...
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