mirror of
https://github.com/weaveworks/scope.git
synced 2026-07-28 09:41:57 +00:00
Enable metric feeder also for health overflow items
* tried activating it for child tables too, but that became quite CPU intensive, and feed intervals became out of sync (host CPU < container CPU, which is hard to believe)
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
import React from 'react';
|
||||
|
||||
import metricFeeder from '../../hoc/metric-feeder';
|
||||
import { formatMetric } from '../../utils/string-utils';
|
||||
|
||||
export default class NodeDetailsHealthOverflowItem extends React.Component {
|
||||
class NodeDetailsHealthOverflowItem extends React.Component {
|
||||
render() {
|
||||
return (
|
||||
<div className="node-details-health-overflow-item">
|
||||
@@ -12,3 +13,5 @@ export default class NodeDetailsHealthOverflowItem extends React.Component {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default metricFeeder(NodeDetailsHealthOverflowItem);
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
import React from 'react';
|
||||
|
||||
import { formatMetric } from '../../utils/string-utils';
|
||||
|
||||
class NodeDetailsTableNodeMetric extends React.Component {
|
||||
render() {
|
||||
return (
|
||||
<td className="node-details-table-node-metric">
|
||||
{formatMetric(this.props.value, this.props)}
|
||||
</td>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default NodeDetailsTableNodeMetric;
|
||||
@@ -2,7 +2,7 @@ import _ from 'lodash';
|
||||
import React from 'react';
|
||||
|
||||
import NodeDetailsTableNodeLink from './node-details-table-node-link';
|
||||
import { formatMetric } from '../../utils/string-utils';
|
||||
import NodeDetailsTableNodeMetric from './node-details-table-node-metric';
|
||||
|
||||
export default class NodeDetailsTable extends React.Component {
|
||||
|
||||
@@ -117,11 +117,14 @@ export default class NodeDetailsTable extends React.Component {
|
||||
return this.props.columns.map(col => {
|
||||
const field = fields[col];
|
||||
if (field) {
|
||||
return (
|
||||
<td className="node-details-table-node-value" key={field.id}>
|
||||
{field.valueType === 'metadata' ? field.value : formatMetric(field.value, field)}
|
||||
</td>
|
||||
);
|
||||
if (field.valueType === 'metadata') {
|
||||
return (
|
||||
<td className="node-details-table-node-value" key={field.id}>
|
||||
{field.value}
|
||||
</td>
|
||||
);
|
||||
}
|
||||
return <NodeDetailsTableNodeMetric key={field.id} {...field} />;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -149,6 +149,9 @@ export default ComposedComponent => class extends React.Component {
|
||||
|
||||
const lastValue = samples.length > 0 ? samples[samples.length - 1].value : null;
|
||||
const slidingWindow = {first: movingFirstDate, last: movingLastDate, max, samples, value: lastValue};
|
||||
if (this.props.label === 'CPU') {
|
||||
console.log(lastValue, movingLastDate);
|
||||
}
|
||||
|
||||
return <ComposedComponent {...this.props} {...slidingWindow} />;
|
||||
}
|
||||
|
||||
@@ -717,7 +717,7 @@ h2 {
|
||||
}
|
||||
}
|
||||
|
||||
&-value {
|
||||
&-value, &-metric {
|
||||
flex: 1;
|
||||
margin-left: 0.5em;
|
||||
text-align: right;
|
||||
|
||||
Reference in New Issue
Block a user