mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Add the ability to hide metrics from the UI
Signed-off-by: vshakirova <vshakirova@mirantis.com>
This commit is contained in:
parent
1e5d682b9b
commit
920d43cb4f
@ -45,6 +45,19 @@ describe("user store tests", () => {
|
|||||||
expect(us.seenContexts.has("bar")).toBe(true);
|
expect(us.seenContexts.has("bar")).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("allows adding and listing hidden metrics", () => {
|
||||||
|
const us = UserStore.getInstance<UserStore>();
|
||||||
|
|
||||||
|
us.hiddenMetrics.add("foo");
|
||||||
|
expect(us.hiddenMetrics.size).toBe(1);
|
||||||
|
|
||||||
|
us.hiddenMetrics.add("foo");
|
||||||
|
us.hiddenMetrics.add("bar");
|
||||||
|
expect(us.hiddenMetrics.size).toBe(2);
|
||||||
|
expect(us.hiddenMetrics.has("foo")).toBe(true);
|
||||||
|
expect(us.hiddenMetrics.has("bar")).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
it("allows setting and getting preferences", () => {
|
it("allows setting and getting preferences", () => {
|
||||||
const us = UserStore.getInstance<UserStore>();
|
const us = UserStore.getInstance<UserStore>();
|
||||||
|
|
||||||
|
|||||||
@ -10,12 +10,14 @@ import { kubeConfigDefaultPath, loadConfig } from "./kube-helpers";
|
|||||||
import { appEventBus } from "./event-bus";
|
import { appEventBus } from "./event-bus";
|
||||||
import logger from "../main/logger";
|
import logger from "../main/logger";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
|
import { ResourceType } from "../renderer/components/+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
export interface UserStoreModel {
|
export interface UserStoreModel {
|
||||||
kubeConfigPath: string;
|
kubeConfigPath: string;
|
||||||
lastSeenAppVersion: string;
|
lastSeenAppVersion: string;
|
||||||
seenContexts: string[];
|
seenContexts: string[];
|
||||||
preferences: UserPreferences;
|
preferences: UserPreferences;
|
||||||
|
hiddenMetrics: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UserPreferences {
|
export interface UserPreferences {
|
||||||
@ -28,7 +30,8 @@ export interface UserPreferences {
|
|||||||
downloadBinariesPath?: string;
|
downloadBinariesPath?: string;
|
||||||
kubectlBinariesPath?: string;
|
kubectlBinariesPath?: string;
|
||||||
openAtLogin?: boolean;
|
openAtLogin?: boolean;
|
||||||
hiddenTableColumns?: Record<string, string[]>
|
hiddenTableColumns?: Record<string, string[]>;
|
||||||
|
hideMetrics?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UserStore extends BaseStore<UserStoreModel> {
|
export class UserStore extends BaseStore<UserStoreModel> {
|
||||||
@ -47,6 +50,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
|
|||||||
@observable kubeConfigPath = kubeConfigDefaultPath; // used in add-cluster page for providing context
|
@observable kubeConfigPath = kubeConfigDefaultPath; // used in add-cluster page for providing context
|
||||||
@observable seenContexts = observable.set<string>();
|
@observable seenContexts = observable.set<string>();
|
||||||
@observable newContexts = observable.set<string>();
|
@observable newContexts = observable.set<string>();
|
||||||
|
@observable hiddenMetrics = observable.set<string>();
|
||||||
|
|
||||||
@observable preferences: UserPreferences = {
|
@observable preferences: UserPreferences = {
|
||||||
allowTelemetry: true,
|
allowTelemetry: true,
|
||||||
@ -56,6 +60,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
|
|||||||
downloadKubectlBinaries: true, // Download kubectl binaries matching cluster version
|
downloadKubectlBinaries: true, // Download kubectl binaries matching cluster version
|
||||||
openAtLogin: false,
|
openAtLogin: false,
|
||||||
hiddenTableColumns: {},
|
hiddenTableColumns: {},
|
||||||
|
hideMetrics: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
protected async handleOnLoad() {
|
protected async handleOnLoad() {
|
||||||
@ -84,6 +89,10 @@ export class UserStore extends BaseStore<UserStoreModel> {
|
|||||||
return semver.gt(getAppVersion(), this.lastSeenAppVersion);
|
return semver.gt(getAppVersion(), this.lastSeenAppVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
isMetricHidden(resource: ResourceType) {
|
||||||
|
return this.preferences.hideMetrics || this.hiddenMetrics.has(resource);
|
||||||
|
}
|
||||||
|
|
||||||
@action
|
@action
|
||||||
setHiddenTableColumns(tableId: string, names: Set<string> | string[]) {
|
setHiddenTableColumns(tableId: string, names: Set<string> | string[]) {
|
||||||
this.preferences.hiddenTableColumns[tableId] = Array.from(names);
|
this.preferences.hiddenTableColumns[tableId] = Array.from(names);
|
||||||
@ -145,7 +154,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
|
|||||||
|
|
||||||
@action
|
@action
|
||||||
protected async fromStore(data: Partial<UserStoreModel> = {}) {
|
protected async fromStore(data: Partial<UserStoreModel> = {}) {
|
||||||
const { lastSeenAppVersion, seenContexts = [], preferences, kubeConfigPath } = data;
|
const { lastSeenAppVersion, seenContexts = [], preferences, kubeConfigPath, hiddenMetrics = [] } = data;
|
||||||
|
|
||||||
if (lastSeenAppVersion) {
|
if (lastSeenAppVersion) {
|
||||||
this.lastSeenAppVersion = lastSeenAppVersion;
|
this.lastSeenAppVersion = lastSeenAppVersion;
|
||||||
@ -155,6 +164,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
|
|||||||
this.kubeConfigPath = kubeConfigPath;
|
this.kubeConfigPath = kubeConfigPath;
|
||||||
}
|
}
|
||||||
this.seenContexts.replace(seenContexts);
|
this.seenContexts.replace(seenContexts);
|
||||||
|
this.hiddenMetrics.replace(hiddenMetrics);
|
||||||
Object.assign(this.preferences, preferences);
|
Object.assign(this.preferences, preferences);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -164,6 +174,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
|
|||||||
lastSeenAppVersion: this.lastSeenAppVersion,
|
lastSeenAppVersion: this.lastSeenAppVersion,
|
||||||
seenContexts: Array.from(this.seenContexts),
|
seenContexts: Array.from(this.seenContexts),
|
||||||
preferences: this.preferences,
|
preferences: this.preferences,
|
||||||
|
hiddenMetrics: Array.from(this.hiddenMetrics),
|
||||||
};
|
};
|
||||||
|
|
||||||
return toJS(model, {
|
return toJS(model, {
|
||||||
|
|||||||
@ -53,3 +53,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.OnlyClusterIssues {
|
||||||
|
grid-row: row1-start / row2-end;
|
||||||
|
}
|
||||||
|
|||||||
@ -7,7 +7,9 @@
|
|||||||
display: grid;
|
display: grid;
|
||||||
grid-gap: $gridGap;
|
grid-gap: $gridGap;
|
||||||
grid-template-columns: repeat(auto-fit, minmax(500px, 1fr));
|
grid-template-columns: repeat(auto-fit, minmax(500px, 1fr));
|
||||||
grid-template-rows: 1fr 1fr;
|
grid-template-rows:
|
||||||
|
[row1-start] 1fr
|
||||||
|
[row2-start] 1fr;
|
||||||
|
|
||||||
@include media(">1600px") {
|
@include media(">1600px") {
|
||||||
grid-template-columns: 1fr 1fr;
|
grid-template-columns: 1fr 1fr;
|
||||||
|
|||||||
@ -13,6 +13,8 @@ import { ClusterIssues } from "./cluster-issues";
|
|||||||
import { ClusterMetrics } from "./cluster-metrics";
|
import { ClusterMetrics } from "./cluster-metrics";
|
||||||
import { clusterOverviewStore } from "./cluster-overview.store";
|
import { clusterOverviewStore } from "./cluster-overview.store";
|
||||||
import { ClusterPieCharts } from "./cluster-pie-charts";
|
import { ClusterPieCharts } from "./cluster-pie-charts";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
@observer
|
@observer
|
||||||
export class ClusterOverview extends React.Component {
|
export class ClusterOverview extends React.Component {
|
||||||
@ -37,19 +39,40 @@ export class ClusterOverview extends React.Component {
|
|||||||
this.metricPoller.stop();
|
this.metricPoller.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
renderMetrics(isMetricsHidden: boolean) {
|
||||||
|
if (isMetricsHidden) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<ClusterMetrics/>
|
||||||
|
<ClusterPieCharts/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
renderClusterOverview(isLoaded: boolean, isMetricsHidden: boolean) {
|
||||||
|
if (!isLoaded) {
|
||||||
|
return <Spinner center/>;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{this.renderMetrics(isMetricsHidden)}
|
||||||
|
<ClusterIssues className={isMetricsHidden ? "OnlyClusterIssues" : ""}/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const isLoaded = nodesStore.isLoaded && podsStore.isLoaded;
|
const isLoaded = nodesStore.isLoaded && podsStore.isLoaded;
|
||||||
|
const isMetricsHidden = userStore.isMetricHidden(ResourceType.Cluster);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TabLayout>
|
<TabLayout>
|
||||||
<div className="ClusterOverview">
|
<div className="ClusterOverview">
|
||||||
{!isLoaded ? <Spinner center/> : (
|
{this.renderClusterOverview(isLoaded, isMetricsHidden)}
|
||||||
<>
|
|
||||||
<ClusterMetrics/>
|
|
||||||
<ClusterPieCharts/>
|
|
||||||
<ClusterIssues/>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</TabLayout>
|
</TabLayout>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -4,7 +4,7 @@ import React from "react";
|
|||||||
import { disposeOnUnmount, observer } from "mobx-react";
|
import { disposeOnUnmount, observer } from "mobx-react";
|
||||||
import { reaction } from "mobx";
|
import { reaction } from "mobx";
|
||||||
import { DrawerItem, DrawerTitle } from "../drawer";
|
import { DrawerItem, DrawerTitle } from "../drawer";
|
||||||
import { Ingress, ILoadBalancerIngress } from "../../api/endpoints";
|
import { ILoadBalancerIngress, Ingress } from "../../api/endpoints";
|
||||||
import { Table, TableCell, TableHead, TableRow } from "../table";
|
import { Table, TableCell, TableHead, TableRow } from "../table";
|
||||||
import { KubeEventDetails } from "../+events/kube-event-details";
|
import { KubeEventDetails } from "../+events/kube-event-details";
|
||||||
import { ingressStore } from "./ingress.store";
|
import { ingressStore } from "./ingress.store";
|
||||||
@ -14,6 +14,8 @@ import { IngressCharts } from "./ingress-charts";
|
|||||||
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
||||||
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
||||||
import { getBackendServiceNamePort } from "../../api/endpoints/ingress.api";
|
import { getBackendServiceNamePort } from "../../api/endpoints/ingress.api";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
interface Props extends KubeObjectDetailsProps<Ingress> {
|
interface Props extends KubeObjectDetailsProps<Ingress> {
|
||||||
}
|
}
|
||||||
@ -106,17 +108,20 @@ export class IngressDetails extends React.Component<Props> {
|
|||||||
"Network",
|
"Network",
|
||||||
"Duration",
|
"Duration",
|
||||||
];
|
];
|
||||||
|
const isMetricHidden = userStore.isMetricHidden(ResourceType.Ingress);
|
||||||
|
|
||||||
const { serviceName, servicePort } = ingress.getServiceNamePort();
|
const { serviceName, servicePort } = ingress.getServiceNamePort();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="IngressDetails">
|
<div className="IngressDetails">
|
||||||
<ResourceMetrics
|
{!isMetricHidden && (
|
||||||
loader={() => ingressStore.loadMetrics(ingress)}
|
<ResourceMetrics
|
||||||
tabs={metricTabs} object={ingress} params={{ metrics }}
|
loader={() => ingressStore.loadMetrics(ingress)}
|
||||||
>
|
tabs={metricTabs} object={ingress} params={{ metrics }}
|
||||||
<IngressCharts/>
|
>
|
||||||
</ResourceMetrics>
|
<IngressCharts/>
|
||||||
|
</ResourceMetrics>
|
||||||
|
)}
|
||||||
<KubeObjectMeta object={ingress}/>
|
<KubeObjectMeta object={ingress}/>
|
||||||
<DrawerItem name="Ports">
|
<DrawerItem name="Ports">
|
||||||
{ingress.getPorts()}
|
{ingress.getPorts()}
|
||||||
|
|||||||
@ -17,6 +17,8 @@ import { PodDetailsList } from "../+workloads-pods/pod-details-list";
|
|||||||
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
||||||
import { KubeEventDetails } from "../+events/kube-event-details";
|
import { KubeEventDetails } from "../+events/kube-event-details";
|
||||||
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
interface Props extends KubeObjectDetailsProps<Node> {
|
interface Props extends KubeObjectDetailsProps<Node> {
|
||||||
}
|
}
|
||||||
@ -52,10 +54,11 @@ export class NodeDetails extends React.Component<Props> {
|
|||||||
"Disk",
|
"Disk",
|
||||||
"Pods",
|
"Pods",
|
||||||
];
|
];
|
||||||
|
const isMetricHidden = userStore.isMetricHidden(ResourceType.Node);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="NodeDetails">
|
<div className="NodeDetails">
|
||||||
{podsStore.isLoaded && (
|
{!isMetricHidden && podsStore.isLoaded && (
|
||||||
<ResourceMetrics
|
<ResourceMetrics
|
||||||
loader={() => nodesStore.loadMetrics(node.getName())}
|
loader={() => nodesStore.loadMetrics(node.getName())}
|
||||||
tabs={metricTabs} object={node} params={{ metrics }}
|
tabs={metricTabs} object={node} params={{ metrics }}
|
||||||
|
|||||||
@ -18,6 +18,7 @@ import { KubectlBinaries } from "./kubectl-binaries";
|
|||||||
import { appPreferenceRegistry } from "../../../extensions/registries/app-preference-registry";
|
import { appPreferenceRegistry } from "../../../extensions/registries/app-preference-registry";
|
||||||
import { PageLayout } from "../layout/page-layout";
|
import { PageLayout } from "../layout/page-layout";
|
||||||
import { AddHelmRepoDialog } from "./add-helm-repo-dialog";
|
import { AddHelmRepoDialog } from "./add-helm-repo-dialog";
|
||||||
|
import { SelectMetricsDialog } from "./select-metrics-dialog";
|
||||||
|
|
||||||
@observer
|
@observer
|
||||||
export class Preferences extends React.Component {
|
export class Preferences extends React.Component {
|
||||||
@ -151,7 +152,7 @@ export class Preferences extends React.Component {
|
|||||||
onClick={AddHelmRepoDialog.open}
|
onClick={AddHelmRepoDialog.open}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<AddHelmRepoDialog onAddRepo={()=>this.loadHelmRepos()}/>
|
<AddHelmRepoDialog onAddRepo={() => this.loadHelmRepos()}/>
|
||||||
<div className="repos flex gaps column">
|
<div className="repos flex gaps column">
|
||||||
{Array.from(this.helmAddedRepos).map(([name, repo]) => {
|
{Array.from(this.helmAddedRepos).map(([name, repo]) => {
|
||||||
const tooltipId = `message-${name}`;
|
const tooltipId = `message-${name}`;
|
||||||
@ -191,6 +192,16 @@ export class Preferences extends React.Component {
|
|||||||
Does not affect cluster communications!
|
Does not affect cluster communications!
|
||||||
</small>
|
</small>
|
||||||
|
|
||||||
|
<h2>Metrics availability</h2>
|
||||||
|
<div className="flex gaps">
|
||||||
|
<Button
|
||||||
|
primary
|
||||||
|
label="Select metrics"
|
||||||
|
onClick={SelectMetricsDialog.open}
|
||||||
|
/>
|
||||||
|
<SelectMetricsDialog/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="extensions flex column gaps">
|
<div className="extensions flex column gaps">
|
||||||
{appPreferenceRegistry.getItems().map(({ title, components: { Hint, Input } }, index) => {
|
{appPreferenceRegistry.getItems().map(({ title, components: { Hint, Input } }, index) => {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -0,0 +1,10 @@
|
|||||||
|
.SelectMetricsDialog {
|
||||||
|
.Select {
|
||||||
|
&__placeholder {
|
||||||
|
width: 100%;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
120
src/renderer/components/+preferences/select-metrics-dialog.tsx
Normal file
120
src/renderer/components/+preferences/select-metrics-dialog.tsx
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
import "./select-metrics-dialog.scss";
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import { observer } from "mobx-react";
|
||||||
|
import { observable } from "mobx";
|
||||||
|
import { Dialog, DialogProps } from "../dialog/dialog";
|
||||||
|
import { Checkbox } from "../checkbox/checkbox";
|
||||||
|
import { Wizard, WizardStep } from "../wizard/wizard";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { Select, SelectOption } from "../select/select";
|
||||||
|
import { Icon } from "../icon/icon";
|
||||||
|
import { components, PlaceholderProps } from "react-select";
|
||||||
|
|
||||||
|
interface Props extends Partial<DialogProps> {
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum ResourceType {
|
||||||
|
Cluster = "Cluster",
|
||||||
|
Node = "Node",
|
||||||
|
Pod = "Pod",
|
||||||
|
Deployment = "Deployment",
|
||||||
|
StatefulSet = "StatefulSet",
|
||||||
|
Container = "Container",
|
||||||
|
Ingress = "Ingress",
|
||||||
|
VolumeClaim = "VolumeClaim",
|
||||||
|
ReplicaSet = "ReplicaSet",
|
||||||
|
DaemonSet = "DaemonSet",
|
||||||
|
}
|
||||||
|
|
||||||
|
const Placeholder = observer((props: PlaceholderProps<any>) => {
|
||||||
|
const getPlaceholder = (): React.ReactNode => {
|
||||||
|
if (userStore.hiddenMetrics.size >= 1) {
|
||||||
|
return <>Metrics: {Array.from(userStore.hiddenMetrics).join(", ")}</>;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return <>Select metrics...</>;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<components.Placeholder {...props}>
|
||||||
|
{getPlaceholder()}
|
||||||
|
</components.Placeholder>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
@observer
|
||||||
|
export class SelectMetricsDialog extends React.Component<Props> {
|
||||||
|
|
||||||
|
@observable static isOpen = false;
|
||||||
|
|
||||||
|
static open() {
|
||||||
|
SelectMetricsDialog.isOpen = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static close() {
|
||||||
|
SelectMetricsDialog.isOpen = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
onChange(values: ResourceType[]) {
|
||||||
|
values.map(value => {
|
||||||
|
if (userStore.hiddenMetrics.has(value)) {
|
||||||
|
userStore.hiddenMetrics.delete(value);
|
||||||
|
} else {
|
||||||
|
userStore.hiddenMetrics.add(value);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
reset = () => {
|
||||||
|
userStore.hiddenMetrics.clear();
|
||||||
|
userStore.preferences.hideMetrics = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { ...dialogProps } = this.props;
|
||||||
|
const header = <h5>Select metrics to hide</h5>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog
|
||||||
|
{...dialogProps}
|
||||||
|
isOpen={SelectMetricsDialog.isOpen}
|
||||||
|
close={SelectMetricsDialog.close}
|
||||||
|
>
|
||||||
|
<Wizard header={header} done={SelectMetricsDialog.close}>
|
||||||
|
<WizardStep contentClass="flow column" nextLabel={"Reset"} next={this.reset} prevLabel={"Close"}>
|
||||||
|
<div>
|
||||||
|
<Select
|
||||||
|
className={"SelectMetricsDialog"}
|
||||||
|
components={{ Placeholder }}
|
||||||
|
isMulti
|
||||||
|
closeMenuOnSelect={false}
|
||||||
|
isDisabled={userStore.preferences.hideMetrics}
|
||||||
|
options={Object.values(ResourceType)}
|
||||||
|
onChange={(options: SelectOption[]) => {
|
||||||
|
this.onChange(options.map(option => option.value));
|
||||||
|
}}
|
||||||
|
formatOptionLabel={({ value: resource }: SelectOption) => {
|
||||||
|
const isSelected = userStore.hiddenMetrics.has(resource);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex gaps align-center">
|
||||||
|
<span>{resource}</span>
|
||||||
|
{isSelected && <Icon small material="check" className="box right"/>}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<Checkbox
|
||||||
|
label="Hide metrics for all resources"
|
||||||
|
value={userStore.preferences.hideMetrics}
|
||||||
|
onChange={v => userStore.preferences.hideMetrics = v}
|
||||||
|
/>
|
||||||
|
</WizardStep>
|
||||||
|
</Wizard>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -14,6 +14,8 @@ import { VolumeClaimDiskChart } from "./volume-claim-disk-chart";
|
|||||||
import { getDetailsUrl, KubeObjectDetailsProps, KubeObjectMeta } from "../kube-object";
|
import { getDetailsUrl, KubeObjectDetailsProps, KubeObjectMeta } from "../kube-object";
|
||||||
import { PersistentVolumeClaim } from "../../api/endpoints";
|
import { PersistentVolumeClaim } from "../../api/endpoints";
|
||||||
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
interface Props extends KubeObjectDetailsProps<PersistentVolumeClaim> {
|
interface Props extends KubeObjectDetailsProps<PersistentVolumeClaim> {
|
||||||
}
|
}
|
||||||
@ -41,15 +43,18 @@ export class PersistentVolumeClaimDetails extends React.Component<Props> {
|
|||||||
const metricTabs = [
|
const metricTabs = [
|
||||||
"Disk"
|
"Disk"
|
||||||
];
|
];
|
||||||
|
const isMetricHidden = userStore.isMetricHidden(ResourceType.VolumeClaim);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="PersistentVolumeClaimDetails">
|
<div className="PersistentVolumeClaimDetails">
|
||||||
<ResourceMetrics
|
{!isMetricHidden && (
|
||||||
loader={() => volumeClaimStore.loadMetrics(volumeClaim)}
|
<ResourceMetrics
|
||||||
tabs={metricTabs} object={volumeClaim} params={{ metrics }}
|
loader={() => volumeClaimStore.loadMetrics(volumeClaim)}
|
||||||
>
|
tabs={metricTabs} object={volumeClaim} params={{ metrics }}
|
||||||
<VolumeClaimDiskChart/>
|
>
|
||||||
</ResourceMetrics>
|
<VolumeClaimDiskChart/>
|
||||||
|
</ResourceMetrics>
|
||||||
|
)}
|
||||||
<KubeObjectMeta object={volumeClaim}/>
|
<KubeObjectMeta object={volumeClaim}/>
|
||||||
<DrawerItem name="Access Modes">
|
<DrawerItem name="Access Modes">
|
||||||
{accessModes.join(", ")}
|
{accessModes.join(", ")}
|
||||||
|
|||||||
@ -18,6 +18,8 @@ import { reaction } from "mobx";
|
|||||||
import { PodDetailsList } from "../+workloads-pods/pod-details-list";
|
import { PodDetailsList } from "../+workloads-pods/pod-details-list";
|
||||||
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
||||||
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
interface Props extends KubeObjectDetailsProps<DaemonSet> {
|
interface Props extends KubeObjectDetailsProps<DaemonSet> {
|
||||||
}
|
}
|
||||||
@ -47,10 +49,11 @@ export class DaemonSetDetails extends React.Component<Props> {
|
|||||||
const nodeSelector = daemonSet.getNodeSelectors();
|
const nodeSelector = daemonSet.getNodeSelectors();
|
||||||
const childPods = daemonSetStore.getChildPods(daemonSet);
|
const childPods = daemonSetStore.getChildPods(daemonSet);
|
||||||
const metrics = daemonSetStore.metrics;
|
const metrics = daemonSetStore.metrics;
|
||||||
|
const isMetricHidden = userStore.isMetricHidden(ResourceType.DaemonSet);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="DaemonSetDetails">
|
<div className="DaemonSetDetails">
|
||||||
{podsStore.isLoaded && (
|
{!isMetricHidden && podsStore.isLoaded && (
|
||||||
<ResourceMetrics
|
<ResourceMetrics
|
||||||
loader={() => daemonSetStore.loadMetrics(daemonSet)}
|
loader={() => daemonSetStore.loadMetrics(daemonSet)}
|
||||||
tabs={podMetricTabs} object={daemonSet} params={{ metrics }}
|
tabs={podMetricTabs} object={daemonSet} params={{ metrics }}
|
||||||
|
|||||||
@ -19,6 +19,8 @@ import { reaction } from "mobx";
|
|||||||
import { PodDetailsList } from "../+workloads-pods/pod-details-list";
|
import { PodDetailsList } from "../+workloads-pods/pod-details-list";
|
||||||
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
||||||
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
interface Props extends KubeObjectDetailsProps<Deployment> {
|
interface Props extends KubeObjectDetailsProps<Deployment> {
|
||||||
}
|
}
|
||||||
@ -47,10 +49,11 @@ export class DeploymentDetails extends React.Component<Props> {
|
|||||||
const selectors = deployment.getSelectors();
|
const selectors = deployment.getSelectors();
|
||||||
const childPods = deploymentStore.getChildPods(deployment);
|
const childPods = deploymentStore.getChildPods(deployment);
|
||||||
const metrics = deploymentStore.metrics;
|
const metrics = deploymentStore.metrics;
|
||||||
|
const isMetricHidden = userStore.isMetricHidden(ResourceType.Deployment);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="DeploymentDetails">
|
<div className="DeploymentDetails">
|
||||||
{podsStore.isLoaded && (
|
{!isMetricHidden && podsStore.isLoaded && (
|
||||||
<ResourceMetrics
|
<ResourceMetrics
|
||||||
loader={() => deploymentStore.loadMetrics(deployment)}
|
loader={() => deploymentStore.loadMetrics(deployment)}
|
||||||
tabs={podMetricTabs} object={deployment} params={{ metrics }}
|
tabs={podMetricTabs} object={deployment} params={{ metrics }}
|
||||||
|
|||||||
@ -11,6 +11,8 @@ import { PodContainerPort } from "./pod-container-port";
|
|||||||
import { ResourceMetrics } from "../resource-metrics";
|
import { ResourceMetrics } from "../resource-metrics";
|
||||||
import { IMetrics } from "../../api/endpoints/metrics.api";
|
import { IMetrics } from "../../api/endpoints/metrics.api";
|
||||||
import { ContainerCharts } from "./container-charts";
|
import { ContainerCharts } from "./container-charts";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
pod: Pod;
|
pod: Pod;
|
||||||
@ -62,13 +64,14 @@ export class PodDetailsContainer extends React.Component<Props> {
|
|||||||
"Memory",
|
"Memory",
|
||||||
"Filesystem",
|
"Filesystem",
|
||||||
];
|
];
|
||||||
|
const isMetricHidden = userStore.isMetricHidden(ResourceType.Container);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="PodDetailsContainer">
|
<div className="PodDetailsContainer">
|
||||||
<div className="pod-container-title">
|
<div className="pod-container-title">
|
||||||
<StatusBrick className={cssNames(state, { ready })}/>{name}
|
<StatusBrick className={cssNames(state, { ready })}/>{name}
|
||||||
</div>
|
</div>
|
||||||
{!isInitContainer &&
|
{!isMetricHidden && !isInitContainer &&
|
||||||
<ResourceMetrics tabs={metricTabs} params={{ metrics }}>
|
<ResourceMetrics tabs={metricTabs} params={{ metrics }}>
|
||||||
<ContainerCharts/>
|
<ContainerCharts/>
|
||||||
</ResourceMetrics>
|
</ResourceMetrics>
|
||||||
|
|||||||
@ -22,6 +22,8 @@ import { getItemMetrics } from "../../api/endpoints/metrics.api";
|
|||||||
import { PodCharts, podMetricTabs } from "./pod-charts";
|
import { PodCharts, podMetricTabs } from "./pod-charts";
|
||||||
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
||||||
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
interface Props extends KubeObjectDetailsProps<Pod> {
|
interface Props extends KubeObjectDetailsProps<Pod> {
|
||||||
}
|
}
|
||||||
@ -66,15 +68,18 @@ export class PodDetails extends React.Component<Props> {
|
|||||||
const nodeSelector = pod.getNodeSelectors();
|
const nodeSelector = pod.getNodeSelectors();
|
||||||
const volumes = pod.getVolumes();
|
const volumes = pod.getVolumes();
|
||||||
const metrics = podsStore.metrics;
|
const metrics = podsStore.metrics;
|
||||||
|
const isMetricHidden = userStore.isMetricHidden(ResourceType.Pod);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="PodDetails">
|
<div className="PodDetails">
|
||||||
<ResourceMetrics
|
{!isMetricHidden && (
|
||||||
loader={() => podsStore.loadMetrics(pod)}
|
<ResourceMetrics
|
||||||
tabs={podMetricTabs} object={pod} params={{ metrics }}
|
loader={() => podsStore.loadMetrics(pod)}
|
||||||
>
|
tabs={podMetricTabs} object={pod} params={{ metrics }}
|
||||||
<PodCharts/>
|
>
|
||||||
</ResourceMetrics>
|
<PodCharts/>
|
||||||
|
</ResourceMetrics>
|
||||||
|
)}
|
||||||
<KubeObjectMeta object={pod}/>
|
<KubeObjectMeta object={pod}/>
|
||||||
<DrawerItem name="Status">
|
<DrawerItem name="Status">
|
||||||
<span className={cssNames("status", kebabCase(pod.getStatusMessage()))}>{pod.getStatusMessage()}</span>
|
<span className={cssNames("status", kebabCase(pod.getStatusMessage()))}>{pod.getStatusMessage()}</span>
|
||||||
|
|||||||
@ -17,6 +17,8 @@ import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts";
|
|||||||
import { PodDetailsList } from "../+workloads-pods/pod-details-list";
|
import { PodDetailsList } from "../+workloads-pods/pod-details-list";
|
||||||
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
||||||
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
interface Props extends KubeObjectDetailsProps<ReplicaSet> {
|
interface Props extends KubeObjectDetailsProps<ReplicaSet> {
|
||||||
}
|
}
|
||||||
@ -47,10 +49,11 @@ export class ReplicaSetDetails extends React.Component<Props> {
|
|||||||
const nodeSelector = replicaSet.getNodeSelectors();
|
const nodeSelector = replicaSet.getNodeSelectors();
|
||||||
const images = replicaSet.getImages();
|
const images = replicaSet.getImages();
|
||||||
const childPods = replicaSetStore.getChildPods(replicaSet);
|
const childPods = replicaSetStore.getChildPods(replicaSet);
|
||||||
|
const isMetricHidden = userStore.isMetricHidden(ResourceType.ReplicaSet);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="ReplicaSetDetails">
|
<div className="ReplicaSetDetails">
|
||||||
{podsStore.isLoaded && (
|
{!isMetricHidden && podsStore.isLoaded && (
|
||||||
<ResourceMetrics
|
<ResourceMetrics
|
||||||
loader={() => replicaSetStore.loadMetrics(replicaSet)}
|
loader={() => replicaSetStore.loadMetrics(replicaSet)}
|
||||||
tabs={podMetricTabs} object={replicaSet} params={{ metrics }}
|
tabs={podMetricTabs} object={replicaSet} params={{ metrics }}
|
||||||
|
|||||||
@ -18,6 +18,8 @@ import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts";
|
|||||||
import { PodDetailsList } from "../+workloads-pods/pod-details-list";
|
import { PodDetailsList } from "../+workloads-pods/pod-details-list";
|
||||||
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
import { KubeObjectMeta } from "../kube-object/kube-object-meta";
|
||||||
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
|
||||||
|
import { userStore } from "../../../common/user-store";
|
||||||
|
import { ResourceType } from "../+preferences/select-metrics-dialog";
|
||||||
|
|
||||||
interface Props extends KubeObjectDetailsProps<StatefulSet> {
|
interface Props extends KubeObjectDetailsProps<StatefulSet> {
|
||||||
}
|
}
|
||||||
@ -46,10 +48,11 @@ export class StatefulSetDetails extends React.Component<Props> {
|
|||||||
const nodeSelector = statefulSet.getNodeSelectors();
|
const nodeSelector = statefulSet.getNodeSelectors();
|
||||||
const childPods = statefulSetStore.getChildPods(statefulSet);
|
const childPods = statefulSetStore.getChildPods(statefulSet);
|
||||||
const metrics = statefulSetStore.metrics;
|
const metrics = statefulSetStore.metrics;
|
||||||
|
const isMetricHidden = userStore.isMetricHidden(ResourceType.StatefulSet);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="StatefulSetDetails">
|
<div className="StatefulSetDetails">
|
||||||
{podsStore.isLoaded && (
|
{!isMetricHidden && podsStore.isLoaded && (
|
||||||
<ResourceMetrics
|
<ResourceMetrics
|
||||||
loader={() => statefulSetStore.loadMetrics(statefulSet)}
|
loader={() => statefulSetStore.loadMetrics(statefulSet)}
|
||||||
tabs={podMetricTabs} object={statefulSet} params={{ metrics }}
|
tabs={podMetricTabs} object={statefulSet} params={{ metrics }}
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
.PieChart {
|
.PieChart {
|
||||||
.chart-container {
|
.chart-container {
|
||||||
width: 120px;
|
width: 120px;
|
||||||
|
min-height: 150px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.legend {
|
.legend {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user