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
b8baeac8
Commit
b8baeac8
authored
Apr 07, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:grafana/grafana
parents
a425ce08
513aa61d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletions
+4
-1
CHANGELOG.md
+1
-0
public/app/features/panel/metrics_panel_ctrl.ts
+1
-0
public/app/plugins/panel/graph/module.ts
+2
-1
No files found.
CHANGELOG.md
View file @
b8baeac8
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
*
**Table panel**
: Fixed table panel bug when trying to show annotations in table panel, fixes
[
#4563
](
https://github.com/grafana/grafana/issues/4563
)
*
**Table panel**
: Fixed table panel bug when trying to show annotations in table panel, fixes
[
#4563
](
https://github.com/grafana/grafana/issues/4563
)
*
**App Config**
: Fixed app config issue showing content of other app config, fixes
[
#4575
](
https://github.com/grafana/grafana/issues/4575
)
*
**App Config**
: Fixed app config issue showing content of other app config, fixes
[
#4575
](
https://github.com/grafana/grafana/issues/4575
)
*
**Graph Panel**
: Fixed legend option max not updating, fixes
[
#4601
](
https://github.com/grafana/grafana/issues/4601
)
*
**Graph Panel**
: Fixed legend option max not updating, fixes
[
#4601
](
https://github.com/grafana/grafana/issues/4601
)
*
**Graph Panel**
: Fixed issue where newly added graph panels shared same axes config, fixes
[
#4582
](
https://github.com/grafana/grafana/issues/4582
)
# 3.0.0-beta2 (2016-04-04)
# 3.0.0-beta2 (2016-04-04)
...
...
public/app/features/panel/metrics_panel_ctrl.ts
View file @
b8baeac8
...
@@ -82,6 +82,7 @@ class MetricsPanelCtrl extends PanelCtrl {
...
@@ -82,6 +82,7 @@ class MetricsPanelCtrl extends PanelCtrl {
this
.
loading
=
true
;
this
.
loading
=
true
;
// load datasource service
// load datasource service
this
.
setTimeQueryStart
();
this
.
datasourceSrv
.
get
(
this
.
panel
.
datasource
)
this
.
datasourceSrv
.
get
(
this
.
panel
.
datasource
)
.
then
(
this
.
issueQueries
.
bind
(
this
))
.
then
(
this
.
issueQueries
.
bind
(
this
))
.
then
(
this
.
handleQueryResult
.
bind
(
this
))
.
then
(
this
.
handleQueryResult
.
bind
(
this
))
...
...
public/app/plugins/panel/graph/module.ts
View file @
b8baeac8
...
@@ -5,6 +5,7 @@ import './legend';
...
@@ -5,6 +5,7 @@ import './legend';
import
'./series_overrides_ctrl'
;
import
'./series_overrides_ctrl'
;
import
template
from
'./template'
;
import
template
from
'./template'
;
import
angular
from
'angular'
;
import
moment
from
'moment'
;
import
moment
from
'moment'
;
import
kbn
from
'app/core/utils/kbn'
;
import
kbn
from
'app/core/utils/kbn'
;
import
_
from
'lodash'
;
import
_
from
'lodash'
;
...
@@ -108,7 +109,7 @@ class GraphCtrl extends MetricsPanelCtrl {
...
@@ -108,7 +109,7 @@ class GraphCtrl extends MetricsPanelCtrl {
constructor
(
$scope
,
$injector
,
private
annotationsSrv
)
{
constructor
(
$scope
,
$injector
,
private
annotationsSrv
)
{
super
(
$scope
,
$injector
);
super
(
$scope
,
$injector
);
_
.
defaults
(
this
.
panel
,
panelDefaults
);
_
.
defaults
(
this
.
panel
,
angular
.
copy
(
panelDefaults
)
);
_
.
defaults
(
this
.
panel
.
tooltip
,
panelDefaults
.
tooltip
);
_
.
defaults
(
this
.
panel
.
tooltip
,
panelDefaults
.
tooltip
);
_
.
defaults
(
this
.
panel
.
grid
,
panelDefaults
.
grid
);
_
.
defaults
(
this
.
panel
.
grid
,
panelDefaults
.
grid
);
_
.
defaults
(
this
.
panel
.
legend
,
panelDefaults
.
legend
);
_
.
defaults
(
this
.
panel
.
legend
,
panelDefaults
.
legend
);
...
...
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