IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat: metrics tab, minor change

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-20 22:55:36 +02:00
parent a8673a2e33
commit d840645dd7
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/services/backend_srv.ts
View File

@ -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) {
err.data = {
error: err.statusText,

11
public/app/features/panel/query_troubleshooter.ts
View File

@ -40,6 +40,7 @@ export class QueryTroubleshooterCtrl {
this.onRequestErrorEventListener = this.onRequestError.bind(this);
this.onRequestResponseEventListener = this.onRequestResponse.bind(this);
appEvents.on('ds-request-response', this.onRequestResponseEventListener);
appEvents.on('ds-request-error', this.onRequestErrorEventListener);
$scope.$on('$destroy', this.removeEventsListeners.bind(this));
}
@ -57,7 +58,6 @@ export class QueryTroubleshooterCtrl {
stateChanged() {
if (this.isOpen) {
appEvents.on('ds-request-response', this.onRequestResponseEventListener);
this.panelCtrl.refresh();
this.isLoading = true;
}
@ -70,6 +70,11 @@ export class QueryTroubleshooterCtrl {
}
onRequestResponse(data) {
// ignore if closed
if (!this.isOpen) {
return;
}
this.isLoading = false;
data = _.cloneDeep(data);
@ -135,7 +140,9 @@ export function queryTroubleshooter() {
ctrl.renderJsonExplorer = function(data) {
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);
jsonElem.html(html);

6
public/sass/_variables.dark.scss
View File

@ -286,9 +286,9 @@ $collapse-box-body-error-border: $red;
// json-explorer
$json-explorer-default-color: white;
$json-explorer-string-color: #31F031;
$json-explorer-number-color: #66C2FF;
$json-explorer-boolean-color: #EC4242;
$json-explorer-string-color: #23d662;
$json-explorer-number-color: $variable;
$json-explorer-boolean-color: $variable;
$json-explorer-null-color: #EEC97D;
$json-explorer-undefined-color: rgb(239, 143, 190);
$json-explorer-function-color: #FD48CB;