GitLab wurde aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Vielen Dank für Ihre Geduld.

Commit 183b9142 authored by Phil Hughes's avatar Phil Hughes
Browse files

Merge branch 'tr-add-requested-resource-metric-ce' into 'master'

Add requested resources to cluster health - ce port

See merge request gitlab-org/gitlab-ce!26326
parents 3a477fec f4b8ec7e
......@@ -69,17 +69,17 @@ export default {
appearance && appearance.line && appearance.line.type
? appearance.line.type
: lineTypes.default;
const lineColor = lineType === lineTypes.threshold ? this.primaryColor : undefined;
const lineWidth =
appearance && appearance.line && appearance.line.width
? appearance.line.width
: undefined;
return {
name: this.formatLegendLabel(query),
data: this.concatenateResults(query.result),
lineStyle: {
type: lineType,
color: lineColor,
},
itemStyle: {
color: lineColor,
width: lineWidth,
},
areaStyle: {
opacity:
......
......@@ -6,5 +6,4 @@ export const graphTypes = {
export const lineTypes = {
default: 'solid',
threshold: 'dashed',
};
......@@ -203,6 +203,10 @@ describe('Area component', () => {
.length,
).toBe(data.length);
});
it('formats line width correctly', () => {
expect(chartData[0].lineStyle.width).toBe(2);
});
});
describe('scatterSeries', () => {
......
......@@ -330,6 +330,11 @@ export const metricsGroupsAPIResponse = {
weight: 1,
queries: [
{
appearance: {
line: {
width: 2,
},
},
query_range:
'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100',
label: 'Core Usage',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment