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

Merge pull request #15346 from grafana/logs-graph-series-names

Browse Source 
Fix for logs graph series names (level names)
This commit is contained in:
Torkel Ödegaard 2019-02-11 11:13:37 +01:00 committed by GitHub
commit 8f6ccce16f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/core/core.ts
View File

@ -1,4 +1,3 @@
import './directives/dash_class';
import './directives/dropdown_typeahead'; import './directives/dropdown_typeahead';
import './directives/autofill_event_fix'; import './directives/autofill_event_fix';
import './directives/metric_segment'; import './directives/metric_segment';

39
public/app/core/directives/dash_class.ts
View File

@ -1,39 +0,0 @@
import $ from 'jquery';
import _ from 'lodash';
import coreModule from '../core_module';
/** @ngInject */
function dashClass($timeout) {
return {
link: ($scope, elem) => {
const body = $('body');
$scope.ctrl.dashboard.events.on('view-mode-changed', panel => {
console.log('view-mode-changed', panel.fullscreen);
if (panel.fullscreen) {
body.addClass('panel-in-fullscreen');
} else {
$timeout(() => {
body.removeClass('panel-in-fullscreen');
});
}
});
body.toggleClass('panel-in-fullscreen', $scope.ctrl.dashboard.meta.fullscreen === true);
$scope.$watch('ctrl.dashboardViewState.state.editview', newValue => {
if (newValue) {
elem.toggleClass('dashboard-page--settings-opening', _.isString(newValue));
setTimeout(() => {
elem.toggleClass('dashboard-page--settings-open', _.isString(newValue));
}, 10);
} else {
elem.removeClass('dashboard-page--settings-opening');
elem.removeClass('dashboard-page--settings-open');
}
});
},
};
}
coreModule.directive('dashClass', dashClass);

7
public/app/core/logs_model.ts
View File

@ -340,6 +340,11 @@ export function makeSeriesForLogs(rows: LogRowModel[], intervalMs: number): Time
return a[1] - b[1]; return a[1] - b[1];
}); });
return { datapoints: series.datapoints, target: series.alias, color: series.color }; return {
datapoints: series.datapoints,
target: series.alias,
alias: series.alias,
color: series.color
};
}); });
} }

85
public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
View File

@ -2,61 +2,65 @@
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react';
// Components // Components
import { Select, SelectOptionItem } from '@grafana/ui'; // import { Select, SelectOptionItem } from '@grafana/ui';
// Types // Types
import { QueryEditorProps } from '@grafana/ui/src/types'; import { QueryEditorProps } from '@grafana/ui/src/types';
import { LokiDatasource } from '../datasource'; import { LokiDatasource } from '../datasource';
import { LokiQuery } from '../types'; import { LokiQuery } from '../types';
import { LokiQueryField } from './LokiQueryField'; // import { LokiQueryField } from './LokiQueryField';
type Props = QueryEditorProps<LokiDatasource, LokiQuery>; type Props = QueryEditorProps<LokiDatasource, LokiQuery>;
interface State { // interface State {
query: LokiQuery; // query: LokiQuery;
} // }
export class LokiQueryEditor extends PureComponent<Props> { export class LokiQueryEditor extends PureComponent<Props> {
state: State = { // state: State = {
query: this.props.query, // query: this.props.query,
}; // };
//
onRunQuery = () => { // onRunQuery = () => {
const { query } = this.state; // const { query } = this.state;
//
this.props.onChange(query); // this.props.onChange(query);
this.props.onRunQuery(); // this.props.onRunQuery();
}; // };
//
onFieldChange = (query: LokiQuery, override?) => { // onFieldChange = (query: LokiQuery, override?) => {
this.setState({ // this.setState({
query: { // query: {
...this.state.query, // ...this.state.query,
expr: query.expr, // expr: query.expr,
}, // },
}); // });
}; // };
//
onFormatChanged = (option: SelectOptionItem) => { // onFormatChanged = (option: SelectOptionItem) => {
this.props.onChange({ // this.props.onChange({
...this.state.query, // ...this.state.query,
resultFormat: option.value, // resultFormat: option.value,
}); // });
}; // };
render() { render() {
const { query } = this.state; // const { query } = this.state;
const { datasource } = this.props; // const { datasource } = this.props;
const formatOptions: SelectOptionItem[] = [ // const formatOptions: SelectOptionItem[] = [
{ label: 'Time Series', value: 'time_series' }, // { label: 'Time Series', value: 'time_series' },
{ label: 'Table', value: 'table' }, // { label: 'Table', value: 'table' },
]; // ];
//
query.resultFormat = query.resultFormat || 'time_series'; // query.resultFormat = query.resultFormat || 'time_series';
const currentFormat = formatOptions.find(item => item.value === query.resultFormat); // const currentFormat = formatOptions.find(item => item.value === query.resultFormat);
return ( return (
<div> <div>
<div className="gf-form">
<div className="gf-form-label">Loki is currently not supported as dashboard data source. We are working on it!</div>
</div>
{/*
<LokiQueryField <LokiQueryField
datasource={datasource} datasource={datasource}
query={query} query={query}
@ -78,6 +82,7 @@ export class LokiQueryEditor extends PureComponent<Props> {
<div className="gf-form-label gf-form-label--grow" /> <div className="gf-form-label gf-form-label--grow" />
</div> </div>
</div> </div>
*/}
</div> </div>
); );
} }