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
d840645d
Commit
d840645d
authored
May 20, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: metrics tab, minor change
parent
a8673a2e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
public/app/core/services/backend_srv.ts
+1
-1
public/app/features/panel/query_troubleshooter.ts
+9
-2
public/sass/_variables.dark.scss
+3
-3
No files found.
public/app/core/services/backend_srv.ts
View file @
d840645d
...
@@ -170,7 +170,7 @@ export class BackendSrv {
...
@@ -170,7 +170,7 @@ export class BackendSrv {
});
});
}
}
//populate error obj on Internal Error
//
populate error obj on Internal Error
if
(
_
.
isString
(
err
.
data
)
&&
err
.
status
===
500
)
{
if
(
_
.
isString
(
err
.
data
)
&&
err
.
status
===
500
)
{
err
.
data
=
{
err
.
data
=
{
error
:
err
.
statusText
,
error
:
err
.
statusText
,
...
...
public/app/features/panel/query_troubleshooter.ts
View file @
d840645d
...
@@ -40,6 +40,7 @@ export class QueryTroubleshooterCtrl {
...
@@ -40,6 +40,7 @@ export class QueryTroubleshooterCtrl {
this
.
onRequestErrorEventListener
=
this
.
onRequestError
.
bind
(
this
);
this
.
onRequestErrorEventListener
=
this
.
onRequestError
.
bind
(
this
);
this
.
onRequestResponseEventListener
=
this
.
onRequestResponse
.
bind
(
this
);
this
.
onRequestResponseEventListener
=
this
.
onRequestResponse
.
bind
(
this
);
appEvents
.
on
(
'ds-request-response'
,
this
.
onRequestResponseEventListener
);
appEvents
.
on
(
'ds-request-error'
,
this
.
onRequestErrorEventListener
);
appEvents
.
on
(
'ds-request-error'
,
this
.
onRequestErrorEventListener
);
$scope
.
$on
(
'$destroy'
,
this
.
removeEventsListeners
.
bind
(
this
));
$scope
.
$on
(
'$destroy'
,
this
.
removeEventsListeners
.
bind
(
this
));
}
}
...
@@ -57,7 +58,6 @@ export class QueryTroubleshooterCtrl {
...
@@ -57,7 +58,6 @@ export class QueryTroubleshooterCtrl {
stateChanged
()
{
stateChanged
()
{
if
(
this
.
isOpen
)
{
if
(
this
.
isOpen
)
{
appEvents
.
on
(
'ds-request-response'
,
this
.
onRequestResponseEventListener
);
this
.
panelCtrl
.
refresh
();
this
.
panelCtrl
.
refresh
();
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
}
}
...
@@ -70,6 +70,11 @@ export class QueryTroubleshooterCtrl {
...
@@ -70,6 +70,11 @@ export class QueryTroubleshooterCtrl {
}
}
onRequestResponse
(
data
)
{
onRequestResponse
(
data
)
{
// ignore if closed
if
(
!
this
.
isOpen
)
{
return
;
}
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
data
=
_
.
cloneDeep
(
data
);
data
=
_
.
cloneDeep
(
data
);
...
@@ -135,7 +140,9 @@ export function queryTroubleshooter() {
...
@@ -135,7 +140,9 @@ export function queryTroubleshooter() {
ctrl
.
renderJsonExplorer
=
function
(
data
)
{
ctrl
.
renderJsonExplorer
=
function
(
data
)
{
var
jsonElem
=
elem
.
find
(
'.query-troubleshooter-json'
);
var
jsonElem
=
elem
.
find
(
'.query-troubleshooter-json'
);
ctrl
.
jsonExplorer
=
new
JsonExplorer
(
data
,
3
,
{
});
ctrl
.
jsonExplorer
=
new
JsonExplorer
(
data
,
3
,
{
animateOpen
:
true
,
});
const
html
=
ctrl
.
jsonExplorer
.
render
(
true
);
const
html
=
ctrl
.
jsonExplorer
.
render
(
true
);
jsonElem
.
html
(
html
);
jsonElem
.
html
(
html
);
...
...
public/sass/_variables.dark.scss
View file @
d840645d
...
@@ -286,9 +286,9 @@ $collapse-box-body-error-border: $red;
...
@@ -286,9 +286,9 @@ $collapse-box-body-error-border: $red;
// json-explorer
// json-explorer
$json-explorer-default-color
:
white
;
$json-explorer-default-color
:
white
;
$json-explorer-string-color
:
#
31F031
;
$json-explorer-string-color
:
#
23d662
;
$json-explorer-number-color
:
#66C2FF
;
$json-explorer-number-color
:
$variable
;
$json-explorer-boolean-color
:
#EC4242
;
$json-explorer-boolean-color
:
$variable
;
$json-explorer-null-color
:
#EEC97D
;
$json-explorer-null-color
:
#EEC97D
;
$json-explorer-undefined-color
:
rgb
(
239
,
143
,
190
);
$json-explorer-undefined-color
:
rgb
(
239
,
143
,
190
);
$json-explorer-function-color
:
#FD48CB
;
$json-explorer-function-color
:
#FD48CB
;
...
...
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