github/skooner
1
0
Fork 0
mirror of https://github.com/skooner-k8s/skooner.git synced 2026-08-28 19:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Prometheus' into Prometheus-#264

Browse Source
This commit is contained in:
Yuqiu Wang
2021-08-26 12:54:49 -05:00
committed by GitHub
parent e7088f6810 f1b4a99cc7
commit 69ea8ab75a
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/podCpuChart.tsx
+3 -4
View File
@@ -3,15 +3,15 @@ import React, {useEffect, useState} from 'react';
import Chart from './chart';
import LoadingChart from './loadingChart';
import {parseCpu, TO_ONE_CPU} from '../utils/unitHelpers';
import {Pod, Metrics} from '../utils/types';
import {Pod, Metrics, ReplicaSet} from '../utils/types';
import PrometheusGraph, {BASE_HTTP_URL} from '../views/prometheusgraph';
import api from '../services/api';
export default function PodCpuChart({items, metrics, pod}: {items?: Pod[], metrics?: _.Dictionary<Metrics>, pod?: Pod}) {
export default function PodCpuChart({items, metrics, item}: {items?: Pod[], metrics?: _.Dictionary<Metrics>, item?: Pod | ReplicaSet}) {
const totals = getPodCpuTotals(items, metrics);
const decimals = totals && totals.used > 10 ? 1 : 2;
const defaultLabels = "unit='core', resource='cpu'";
const labelMatchers = pod ? `${defaultLabels}, pod="${pod.metadata.name}"` : defaultLabels;
const labelMatchers = item ? `${defaultLabels}, pod="${item.metadata.name}"` : defaultLabels;
const query = {
queryString: `sum(kube_pod_container_resource_requests{${labelMatchers}})`,
@@ -57,7 +57,6 @@ export default function PodCpuChart({items, metrics, pod}: {items?: Pod[], metri
function getPodCpuTotals(pods?: Pod[], metrics?: _.Dictionary<Metrics>) {
if (!pods || !metrics) return null;
const used = _(metrics)
.flatMap(x => x.containers)
.sumBy(x => parseCpu(x.usage.cpu));
client/src/components/podRamChart.tsx
+4 -3
View File
@@ -3,16 +3,17 @@ import React, {useEffect, useState} from 'react';
import Chart from './chart';
import LoadingChart from './loadingChart';
import {parseRam, TO_GB} from '../utils/unitHelpers';
import {Pod, Metrics} from '../utils/types';
import {Pod, Metrics, ReplicaSet} from '../utils/types';
import PrometheusGraph, {BASE_HTTP_URL} from '../views/prometheusgraph';
import api from '../services/api';
export default function RamChart({items, metrics, pod}: {items?: Pod[], metrics?: _.Dictionary<Metrics>, pod?: Pod}) {
export default function RamChart({items, metrics, item}: {items?: Pod[], metrics?: _.Dictionary<Metrics>, item?: Pod | ReplicaSet}) {
const totals = getPodRamTotals(items, metrics);
const decimals = totals && totals.used > 10 ? 1 : 2;
const defaultLabels = "unit='byte'";
const labelMatchers = pod ? `${defaultLabels}, pod="${pod.metadata.name}"` : defaultLabels;
const labelMatchers = item ? `${defaultLabels}, pod="${item.metadata.name}"` : defaultLabels;
const query = {
queryString: `sum(kube_pod_container_resource_requests{${labelMatchers}}/${TO_GB})`,
client/src/views/pod.tsx
+2 -2
View File
@@ -82,8 +82,8 @@ export default class PodView extends Base<Props, State> {
{errors && !!errors.length && <Error messages={errors} />}
<ChartsContainer>
<PodCpuChart items={item && [item]} metrics={filteredMetrics} pod={item}/>
<PodRamChart items={item && [item]} metrics={filteredMetrics} pod={item}/>
<PodCpuChart items={item && [item]} metrics={filteredMetrics} item={item}/>
<PodRamChart items={item && [item]} metrics={filteredMetrics} item={item}/>
</ChartsContainer>
<div className='contentPanel'>
client/src/views/replicaSet.tsx
+2 -2
View File
@@ -87,8 +87,8 @@ export default class ReplicaSetView extends Base<Props, State> {
<ChartsContainer>
<ReplicasChart item={item} />
<PodCpuChart items={filteredPods} metrics={filteredMetrics} />
<PodRamChart items={filteredPods} metrics={filteredMetrics} />
<PodCpuChart items={filteredPods} metrics={filteredMetrics} item={item}/>
<PodRamChart items={filteredPods} metrics={filteredMetrics} item={item}/>
</ChartsContainer>
<div className='contentPanel'>