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
36c4d01e
Commit
36c4d01e
authored
Nov 02, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(tablepanel) began work on new table panel
parent
e51d4034
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
193 additions
and
37 deletions
+193
-37
public/app/core/settings.js
+1
-0
public/app/core/time_series.ts
+52
-33
public/app/panels/graph/module.html
+0
-4
public/app/panels/table/module.html
+4
-0
public/app/panels/table/module.ts
+136
-0
No files found.
public/app/core/settings.js
View file @
36c4d01e
...
...
@@ -10,6 +10,7 @@ function (_) {
window_title_prefix
:
'Grafana - '
,
panels
:
{
'graph'
:
{
path
:
'app/panels/graph'
,
name
:
'Graph'
},
'table'
:
{
path
:
'app/panels/table'
,
name
:
'Table'
},
'singlestat'
:
{
path
:
'app/panels/singlestat'
,
name
:
'Single stat'
},
'text'
:
{
path
:
'app/panels/text'
,
name
:
'Text'
},
'dashlist'
:
{
path
:
'app/panels/dashlist'
,
name
:
'Dashboard list'
},
...
...
public/app/core/time_series.
j
s
→
public/app/core/time_series.
t
s
View file @
36c4d01e
define
([
'lodash'
,
'app/core/utils/kbn'
],
function
(
_
,
kbn
)
{
'use strict'
;
function
TimeSeries
(
opts
)
{
///<reference path="../headers/common.d.ts" />
import
_
=
require
(
'lodash'
);
import
kbn
=
require
(
'app/core/utils/kbn'
);
function
matchSeriesOverride
(
aliasOrRegex
,
seriesAlias
)
{
if
(
!
aliasOrRegex
)
{
return
false
;
}
if
(
aliasOrRegex
[
0
]
===
'/'
)
{
var
regex
=
kbn
.
stringToJsRegex
(
aliasOrRegex
);
return
seriesAlias
.
match
(
regex
)
!=
null
;
}
return
aliasOrRegex
===
seriesAlias
;
}
function
translateFillOption
(
fill
)
{
return
fill
===
0
?
0.001
:
fill
/
10
;
}
class
TimeSeries
{
datapoints
:
any
;
id
:
string
;
label
:
string
;
alias
:
string
;
color
:
string
;
valueFormater
:
any
;
stats
:
any
;
legend
:
boolean
;
allIsNull
:
boolean
;
decimals
:
number
;
scaledDecimals
:
number
;
lines
:
any
;
bars
:
any
;
points
:
any
;
yaxis
:
any
;
zindex
:
any
;
stack
:
any
;
fillBelowTo
:
any
;
transform
:
any
;
constructor
(
opts
)
{
this
.
datapoints
=
opts
.
datapoints
;
this
.
label
=
opts
.
alias
;
this
.
id
=
opts
.
alias
;
...
...
@@ -16,22 +51,7 @@ function (_, kbn) {
this
.
legend
=
true
;
}
function
matchSeriesOverride
(
aliasOrRegex
,
seriesAlias
)
{
if
(
!
aliasOrRegex
)
{
return
false
;
}
if
(
aliasOrRegex
[
0
]
===
'/'
)
{
var
regex
=
kbn
.
stringToJsRegex
(
aliasOrRegex
);
return
seriesAlias
.
match
(
regex
)
!=
null
;
}
return
aliasOrRegex
===
seriesAlias
;
}
function
translateFillOption
(
fill
)
{
return
fill
===
0
?
0.001
:
fill
/
10
;
}
TimeSeries
.
prototype
.
applySeriesOverrides
=
function
(
overrides
)
{
applySeriesOverrides
(
overrides
)
{
this
.
lines
=
{};
this
.
points
=
{};
this
.
bars
=
{};
...
...
@@ -64,7 +84,7 @@ function (_, kbn) {
}
};
TimeSeries
.
prototype
.
getFlotPairs
=
function
(
fillStyle
)
{
getFlotPairs
(
fillStyle
)
{
var
result
=
[];
this
.
stats
.
total
=
0
;
...
...
@@ -124,18 +144,17 @@ function (_, kbn) {
}
return
result
;
}
;
}
TimeSeries
.
prototype
.
updateLegendValues
=
function
(
formater
,
decimals
,
scaledDecimals
)
{
updateLegendValues
(
formater
,
decimals
,
scaledDecimals
)
{
this
.
valueFormater
=
formater
;
this
.
decimals
=
decimals
;
this
.
scaledDecimals
=
scaledDecimals
;
}
;
}
TimeSeries
.
prototype
.
formatValue
=
function
(
value
)
{
formatValue
(
value
)
{
return
this
.
valueFormater
(
value
,
this
.
decimals
,
this
.
scaledDecimals
);
};
return
TimeSeries
;
}
}
})
;
export
=
TimeSeries
;
public/app/panels/graph/module.html
View file @
36c4d01e
...
...
@@ -3,10 +3,6 @@
<div
class=
"graph-wrapper"
ng-class=
"{'graph-legend-rightside': panel.legend.rightSide}"
>
<div
class=
"graph-canvas-wrapper"
>
<!-- <span class="graph-time-info" ng-if="panelMeta.timeInfo"> -->
<!-- <i class="fa fa-clock-o"></i> {{panelMeta.timeInfo}} -->
<!-- </span> -->
<div
ng-if=
"datapointsWarning"
class=
"datapoints-warning"
>
<span
class=
"small"
ng-show=
"!datapointsCount"
>
No datapoints
<tip>
No datapoints returned from metric query
</tip>
...
...
public/app/panels/table/module.html
0 → 100644
View file @
36c4d01e
<grafana-panel>
<div
class=
"table-panel-container"
>
</div>
</grafana-panel>
public/app/panels/table/module.ts
0 → 100644
View file @
36c4d01e
///<reference path="../../headers/common.d.ts" />
import
angular
=
require
(
'angular'
);
import
$
=
require
(
'jquery'
);
import
_
=
require
(
'lodash'
);
import
moment
=
require
(
'moment'
);
import
PanelMeta
=
require
(
'app/features/panel/panel_meta'
);
import
TimeSeries
=
require
(
'app/core/time_series'
);
var
panelDefaults
=
{
targets
:
[{}],
};
export
class
TablePanelCtrl
{
constructor
(
$scope
,
$rootScope
,
$q
,
panelSrv
,
panelHelper
)
{
$scope
.
ctrl
=
this
;
$scope
.
panelMeta
=
new
PanelMeta
({
panelName
:
'Table'
,
editIcon
:
"fa fa-table"
,
fullscreen
:
true
,
metricsEditor
:
true
,
});
$scope
.
panelMeta
.
addEditorTab
(
'Options'
,
'app/panels/table/options.html'
);
$scope
.
panelMeta
.
addEditorTab
(
'Time range'
,
'app/features/panel/partials/panelTime.html'
);
_
.
defaults
(
$scope
.
panel
,
panelDefaults
);
$scope
.
refreshData
=
function
(
datasource
)
{
var
data
=
{
columns
:
[],
rows
:
[],
};
data
.
columns
.
push
({
text
:
'Time'
});
data
.
columns
.
push
({
text
:
'Value'
});
data
.
columns
.
push
({
text
:
'Value2'
});
data
.
rows
.
push
([
moment
().
format
(
'LLL'
),
17.2
,
15.12
]);
data
.
rows
.
push
([
moment
().
format
(
'LLL'
),
12.2
,
122.3244
]);
data
.
rows
.
push
([
moment
().
format
(
'LLL'
),
111.2
,
2312.22
]);
panelHelper
.
broadcastRender
(
$scope
,
data
);
// panelHelper.updateTimeRange($scope);
//
// return panelHelper.issueMetricQuery($scope, datasource)
// .then($scope.dataHandler, function(err) {
// $scope.seriesList = [];
// $scope.render([]);
// throw err;
// });
};
$scope
.
dataHandler
=
function
(
results
)
{
$scope
.
seriesList
=
_
.
map
(
results
.
data
,
$scope
.
seriesHandler
);
panelHelper
.
broadcastRender
(
$scope
,
$scope
.
seriesList
);
};
$scope
.
seriesHandler
=
function
(
seriesData
,
index
)
{
var
datapoints
=
seriesData
.
datapoints
;
var
alias
=
seriesData
.
target
;
var
colorIndex
=
index
%
$rootScope
.
colors
.
length
;
var
color
=
$scope
.
panel
.
aliasColors
[
alias
]
||
$rootScope
.
colors
[
colorIndex
];
var
series
=
new
TimeSeries
({
datapoints
:
datapoints
,
alias
:
alias
,
color
:
color
,
});
return
series
;
};
panelSrv
.
init
(
$scope
);
}
}
export
function
tablePanelDirective
()
{
'use strict'
;
return
{
restrict
:
'E'
,
templateUrl
:
'app/panels/table/module.html'
,
controller
:
TablePanelCtrl
,
link
:
function
(
scope
,
elem
)
{
var
data
;
function
renderPanel
()
{
var
rootDiv
=
elem
.
find
(
'.table-panel-container'
);
var
tableDiv
=
$
(
'<table class="table-panel"></table>'
);
var
i
,
y
,
rowElem
,
colElem
,
column
,
row
;
rowElem
=
$
(
'<tr></tr>'
);
for
(
i
=
0
;
i
<
data
.
columns
.
length
;
i
++
)
{
column
=
data
.
columns
[
i
];
colElem
=
$
(
'<td>'
+
column
.
text
+
'</td>'
);
rowElem
.
append
(
colElem
);
}
tableDiv
.
append
(
rowElem
);
for
(
y
=
0
;
y
<
data
.
rows
.
length
;
y
++
)
{
row
=
data
.
rows
[
y
];
rowElem
=
$
(
'<tr></tr>'
)
for
(
i
=
0
;
i
<
data
.
columns
.
length
;
i
++
)
{
colElem
=
$
(
'<td>'
+
row
[
i
]
+
'</td>'
);
rowElem
.
append
(
colElem
);
}
tableDiv
.
append
(
rowElem
);
}
rootDiv
.
empty
();
rootDiv
.
append
(
tableDiv
);
}
scope
.
$on
(
'render'
,
function
(
event
,
renderData
)
{
data
=
renderData
||
data
;
if
(
!
data
)
{
scope
.
get_data
();
return
;
}
renderPanel
();
});
}
};
}
angular
.
module
(
'grafana.directives'
).
directive
(
'grafanaPanelTable'
,
tablePanelDirective
);
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