-
)}
@@ -393,29 +395,11 @@ export default class Logs extends PureComponent {
}
}
- // Grid options
- // const cssColumnSizes = [];
- // if (showDuplicates) {
- // cssColumnSizes.push('max-content');
- // }
- // // Log-level indicator line
- // cssColumnSizes.push('3px');
- // if (showUtc) {
- // cssColumnSizes.push('minmax(220px, max-content)');
- // }
- // if (showLocalTime) {
- // cssColumnSizes.push('minmax(140px, max-content)');
- // }
- // if (showLabels) {
- // cssColumnSizes.push('fit-content(20%)');
- // }
- // cssColumnSizes.push('1fr');
- // const logEntriesStyle = {
- // gridTemplateColumns: cssColumnSizes.join(' '),
- // };
-
const scanText = scanRange ? `Scanning ${rangeUtil.describeTimeRange(scanRange)}` : 'Scanning...';
+ // React profiler becomes unusable if we pass all rows to all rows and their labels, using getter instead
+ const getRows = () => processedRows;
+
return (
@@ -436,7 +420,13 @@ export default class Logs extends PureComponent {
{Object.keys(LogsDedupStrategy).map((dedupType, i) => (
-
+
{dedupType}
))}
@@ -463,7 +453,7 @@ export default class Logs extends PureComponent {
firstRows.map(row => (
{
lastRows.map(row => (
{
dropdownEl: any;
@@ -75,9 +88,9 @@ export default class TimePicker extends PureComponent {
- delete target.datasource;
- });
+ } else if (this.datasourceInstance) {
+ // if switching from mixed
+ if (this.datasourceInstance.meta.mixed) {
+ _.each(this.panel.targets, target => {
+ delete target.datasource;
+ });
+ } else if (this.datasourceInstance.meta.id !== datasource.meta.id) {
+ // we are changing data source type, clear queries
+ this.panel.targets = [{ refId: 'A' }];
+ this.panelCtrl.nextRefId = this.dashboard.getNextQueryLetter(this.panel);
+ }
}
this.datasourceInstance = datasource;
diff --git a/public/app/features/templating/custom_variable.ts b/public/app/features/templating/custom_variable.ts
index bc946458705..c98048f04ca 100644
--- a/public/app/features/templating/custom_variable.ts
+++ b/public/app/features/templating/custom_variable.ts
@@ -38,8 +38,9 @@ export class CustomVariable implements Variable {
}
updateOptions() {
- // extract options in comma separated string
- this.options = _.map(this.query.split(/[,]+/), text => {
+ // extract options in comma separated string (use backslash to escape wanted commas)
+ this.options = _.map(this.query.match(/(?:\\,|[^,])+/g), text => {
+ text = text.replace('\\,', ',');
return { text: text.trim(), value: text.trim() };
});
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 15984eba7d6..78733b3b2be 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -151,7 +151,7 @@
diff --git a/public/app/features/templating/specs/variable_srv.test.ts b/public/app/features/templating/specs/variable_srv.test.ts
index 3df6ccb8b5b..47522073fb2 100644
--- a/public/app/features/templating/specs/variable_srv.test.ts
+++ b/public/app/features/templating/specs/variable_srv.test.ts
@@ -493,15 +493,17 @@ describe('VariableSrv', function(this: any) {
scenario.setup(() => {
scenario.variableModel = {
type: 'custom',
- query: 'hej, hop, asd',
+ query: 'hej, hop, asd, escaped\\,var',
name: 'test',
};
});
it('should update options array', () => {
- expect(scenario.variable.options.length).toBe(3);
+ expect(scenario.variable.options.length).toBe(4);
expect(scenario.variable.options[0].text).toBe('hej');
expect(scenario.variable.options[1].value).toBe('hop');
+ expect(scenario.variable.options[2].value).toBe('asd');
+ expect(scenario.variable.options[3].value).toBe('escaped,var');
});
});
diff --git a/public/app/plugins/panel/graph/specs/time_region_manager.test.ts b/public/app/plugins/panel/graph/specs/time_region_manager.test.ts
index 35e48897282..fc0b86d1b68 100644
--- a/public/app/plugins/panel/graph/specs/time_region_manager.test.ts
+++ b/public/app/plugins/panel/graph/specs/time_region_manager.test.ts
@@ -130,6 +130,33 @@ describe('TimeRegionManager', () => {
});
});
+ plotOptionsScenario('for time from/to region', ctx => {
+ const regions = [{ from: '00:00', to: '05:00', fill: true, colorMode: 'red' }];
+ const from = moment('2018-12-01T00:00+01:00');
+ const to = moment('2018-12-03T23:59+01:00');
+ ctx.setup(regions, from, to);
+
+ it('should add 3 markings', () => {
+ expect(ctx.options.grid.markings.length).toBe(3);
+ });
+
+ it('should add one fill between 00:00 and 05:00 each day', () => {
+ const markings = ctx.options.grid.markings;
+
+ expect(moment(markings[0].xaxis.from).format()).toBe(moment('2018-12-01T01:00:00+01:00').format());
+ expect(moment(markings[0].xaxis.to).format()).toBe(moment('2018-12-01T06:00:00+01:00').format());
+ expect(markings[0].color).toBe(colorModes.red.color.fill);
+
+ expect(moment(markings[1].xaxis.from).format()).toBe(moment('2018-12-02T01:00:00+01:00').format());
+ expect(moment(markings[1].xaxis.to).format()).toBe(moment('2018-12-02T06:00:00+01:00').format());
+ expect(markings[1].color).toBe(colorModes.red.color.fill);
+
+ expect(moment(markings[2].xaxis.from).format()).toBe(moment('2018-12-03T01:00:00+01:00').format());
+ expect(moment(markings[2].xaxis.to).format()).toBe(moment('2018-12-03T06:00:00+01:00').format());
+ expect(markings[2].color).toBe(colorModes.red.color.fill);
+ });
+ });
+
plotOptionsScenario('for day of week from/to region', ctx => {
const regions = [{ fromDayOfWeek: 7, toDayOfWeek: 7, fill: true, colorMode: 'red' }];
const from = moment('2018-01-01T18:45:05+01:00');
@@ -211,6 +238,42 @@ describe('TimeRegionManager', () => {
});
});
+ plotOptionsScenario('for day of week from/to time region', ctx => {
+ const regions = [{ fromDayOfWeek: 7, from: '23:00', toDayOfWeek: 1, to: '01:40', fill: true, colorMode: 'red' }];
+ const from = moment('2018-12-07T12:51:19+01:00');
+ const to = moment('2018-12-10T13:51:29+01:00');
+ ctx.setup(regions, from, to);
+
+ it('should add 1 marking', () => {
+ expect(ctx.options.grid.markings.length).toBe(1);
+ });
+
+ it('should add one fill between sunday 23:00 and monday 01:40', () => {
+ const markings = ctx.options.grid.markings;
+
+ expect(moment(markings[0].xaxis.from).format()).toBe(moment('2018-12-10T00:00:00+01:00').format());
+ expect(moment(markings[0].xaxis.to).format()).toBe(moment('2018-12-10T02:40:00+01:00').format());
+ });
+ });
+
+ plotOptionsScenario('for day of week from/to time region', ctx => {
+ const regions = [{ fromDayOfWeek: 6, from: '03:00', toDayOfWeek: 7, to: '02:00', fill: true, colorMode: 'red' }];
+ const from = moment('2018-12-07T12:51:19+01:00');
+ const to = moment('2018-12-10T13:51:29+01:00');
+ ctx.setup(regions, from, to);
+
+ it('should add 1 marking', () => {
+ expect(ctx.options.grid.markings.length).toBe(1);
+ });
+
+ it('should add one fill between saturday 03:00 and sunday 02:00', () => {
+ const markings = ctx.options.grid.markings;
+
+ expect(moment(markings[0].xaxis.from).format()).toBe(moment('2018-12-08T04:00:00+01:00').format());
+ expect(moment(markings[0].xaxis.to).format()).toBe(moment('2018-12-09T03:00:00+01:00').format());
+ });
+ });
+
plotOptionsScenario('for day of week from/to time region with daylight saving time', ctx => {
const regions = [{ fromDayOfWeek: 7, from: '20:00', toDayOfWeek: 7, to: '23:00', fill: true, colorMode: 'red' }];
const from = moment('2018-03-17T06:00:00+01:00');
diff --git a/public/app/plugins/panel/graph/time_region_manager.ts b/public/app/plugins/panel/graph/time_region_manager.ts
index 95987e40dbe..e5ec27ee77a 100644
--- a/public/app/plugins/panel/graph/time_region_manager.ts
+++ b/public/app/plugins/panel/graph/time_region_manager.ts
@@ -87,6 +87,14 @@ export class TimeRegionManager {
continue;
}
+ if (timeRegion.from && !timeRegion.to) {
+ timeRegion.to = timeRegion.from;
+ }
+
+ if (!timeRegion.from && timeRegion.to) {
+ timeRegion.from = timeRegion.to;
+ }
+
hRange = {
from: this.parseTimeRange(timeRegion.from),
to: this.parseTimeRange(timeRegion.to),
@@ -108,21 +116,13 @@ export class TimeRegionManager {
hRange.to.dayOfWeek = Number(timeRegion.toDayOfWeek);
}
- if (!hRange.from.h && hRange.to.h) {
- hRange.from = hRange.to;
- }
-
- if (hRange.from.h && !hRange.to.h) {
- hRange.to = hRange.from;
- }
-
- if (hRange.from.dayOfWeek && !hRange.from.h && !hRange.from.m) {
+ if (hRange.from.dayOfWeek && hRange.from.h === null && hRange.from.m === null) {
hRange.from.h = 0;
hRange.from.m = 0;
hRange.from.s = 0;
}
- if (hRange.to.dayOfWeek && !hRange.to.h && !hRange.to.m) {
+ if (hRange.to.dayOfWeek && hRange.to.h === null && hRange.to.m === null) {
hRange.to.h = 23;
hRange.to.m = 59;
hRange.to.s = 59;
@@ -169,8 +169,16 @@ export class TimeRegionManager {
fromEnd.add(hRange.to.h - hRange.from.h, 'hours');
} else if (hRange.from.h + hRange.to.h < 23) {
fromEnd.add(hRange.to.h, 'hours');
+
+ while (fromEnd.hour() !== hRange.to.h) {
+ fromEnd.add(-1, 'hours');
+ }
} else {
fromEnd.add(24 - hRange.from.h, 'hours');
+
+ while (fromEnd.hour() !== hRange.to.h) {
+ fromEnd.add(1, 'hours');
+ }
}
fromEnd.set('minute', hRange.to.m);
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
index 26ce6b7722d..f83151a0c46 100644
--- a/public/app/plugins/panel/singlestat/module.ts
+++ b/public/app/plugins/panel/singlestat/module.ts
@@ -107,7 +107,10 @@ class SingleStatCtrl extends MetricsPanelCtrl {
}
onDataReceived(dataList) {
- const data: any = {};
+ const data: any = {
+ scopedVars: _.extend({}, this.panel.scopedVars),
+ };
+
if (dataList.length > 0 && dataList[0].type === 'table') {
this.dataType = 'table';
const tableData = dataList.map(this.tableHandler.bind(this));
@@ -117,6 +120,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {
this.series = dataList.map(this.seriesHandler.bind(this));
this.setValues(data);
}
+
this.data = data;
this.render();
}
@@ -320,7 +324,6 @@ class SingleStatCtrl extends MetricsPanelCtrl {
}
// Add $__name variable for using in prefix or postfix
- data.scopedVars = _.extend({}, this.panel.scopedVars);
data.scopedVars['__name'] = { value: this.series[0].label };
}
this.setValueMapping(data);
diff --git a/public/sass/components/_panel_logs.scss b/public/sass/components/_panel_logs.scss
index 4782c730cdf..7b4244902f1 100644
--- a/public/sass/components/_panel_logs.scss
+++ b/public/sass/components/_panel_logs.scss
@@ -139,7 +139,7 @@ $column-horizontal-spacing: 10px;
&--warning,
&--warn {
&::after {
- background-color: $warn;
+ background-color: $yellow;
}
}
diff --git a/public/views/index-template.html b/public/views/index-template.html
index 096684d3e37..a1c955d45d6 100644
--- a/public/views/index-template.html
+++ b/public/views/index-template.html
@@ -178,7 +178,7 @@
Custom Options
Values separated by comma
-
1. This could be caused by your reverse proxy settings.
- 2. If you host grafana under subpath make sure your grafana.ini root_path setting includes subpath
+ 2. If you host grafana under subpath make sure your grafana.ini root_url setting includes subpath
3. If you have a local dev build make sure you build frontend using: npm run dev, npm run watch, or npm run
build
4. Sometimes restarting grafana-server can help