Skip to content

Commit 0746e2b

Browse files
committed
Merge branch 'master' into ApplicationsUpdate
2 parents 60dc413 + ef4f3cd commit 0746e2b

23 files changed

Lines changed: 271 additions & 201 deletions

app/assets/chronos-v4.png

525 KB
Loading

app/charts/DockerChart.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import React, { useContext } from 'react';
2+
3+
import moment from 'moment';
24
import { DockerContext } from '../context/DockerContext';
35

46
interface IContainer {
@@ -39,12 +41,11 @@ const DockerStatsChart = () => {
3941

4042
// Render the component if there is available data
4143
return containerid ? (
42-
<div id="chart">
43-
<header id="docker-stats-chart-header">Docker Container Stats</header>
44+
<div className="chart docker-chart">
45+
<h2>Docker Container Stats</h2>
4446
<span>Container Name: {containername}</span>
45-
<span>Container ID: {containerid}</span>
4647
<span>Platform: {platform}</span>
47-
<span>Start time: {starttime}</span>
48+
<span>Start time: {moment(starttime).format('LLL')}</span>
4849
<span>Memory Usage: {(memoryusage / 1000000).toFixed(2)}</span>
4950
<span>Memory Limit: {(memorylimit / 1000000).toFixed(2)}</span>
5051
<span>Memory Percent: {memorypercent.toFixed(2)}%</span>

app/charts/LatencyChart.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const LatencyChart = () => {
3232
font: {
3333
color: 'black',
3434
size: 15,
35-
family: 'Nunito, san serif',
35+
family: 'Nunito sans, sans serif',
3636
},
3737
paper_bgcolor: 'white',
3838
plot_bgcolor: 'white',

app/charts/MemoryChart.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const MemoryChart = () => {
4444
font: {
4545
color: 'black',
4646
size: 15,
47-
family: 'Nunito, san serif',
47+
family: 'Nunito sans, sans serif',
4848
},
4949
paper_bgcolor: 'white',
5050
plot_bgcolor: 'white',

app/charts/ProcessesChart.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const ProcessesChart = () => {
5050
font: {
5151
color: 'black',
5252
size: 15,
53-
family: 'Nunito, san serif',
53+
family: 'Nunito sans, sans serif',
5454
},
5555
paper_bgcolor: 'white',
5656
plot_bgcolor: 'white',

app/charts/RequestTypesChart.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const RequestTypesChart: React.FC = () => {
6060
font: {
6161
color: 'black',
6262
size: 15,
63-
family: 'Nunito, san serif',
63+
family: 'Nunito sans, sans serif',
6464
},
6565
paper_bgcolor: 'white',
6666
legend: {

app/charts/ResponseCodesChart.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const ResponseCodesChart: React.FC = () => {
7777
font: {
7878
color: 'black',
7979
size: 15,
80-
family: 'Nunito, san serif',
80+
family: 'Nunito sans, sans serif',
8181
},
8282
paper_bgcolor: 'white',
8383
legend: {

app/charts/SpeedChart.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const SpeedChart = () => {
4040
font: {
4141
color: 'black',
4242
size: 14,
43-
family: 'Nunito, san serif',
43+
family: 'Nunito sans, sans serif',
4444
},
4545
xaxis: {
4646
title: 'Time (PST)',

app/charts/TemperatureChart.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const TemperatureChart = () => {
4444
font: {
4545
color: 'black',
4646
size: 15,
47-
family: 'Nunito, san serif',
47+
family: 'Nunito sans, sans serif',
4848
},
4949
paper_bgcolor: 'white',
5050
plot_bgcolor: 'white',

app/charts/TrafficChart.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ const TrafficChart = () => {
9595
},
9696
]}
9797
layout={{
98-
title: 'Microservice Traffic',
98+
title: 'Server Traffic',
9999
height: 400,
100100
width: 400,
101101
font: {
102102
color: 'black',
103103
size: 15,
104-
family: 'Nunito, san serif',
104+
family: 'Nunito sans, sans serif',
105105
},
106106
paper_bgcolor: 'white',
107107
plot_bgcolor: 'white',

0 commit comments

Comments
 (0)