From dbad7bbdc908d1a823c9be412f32c7c7d04c875a Mon Sep 17 00:00:00 2001 From: Piotr Roszatycki Date: Sun, 22 Oct 2023 11:50:38 +0200 Subject: [PATCH] Less hardcoded values Signed-off-by: Piotr Roszatycki --- packages/core/src/common/cluster-types.ts | 5 +++++ .../src/main/routes/metrics/add-metrics-route.injectable.ts | 4 ++-- .../components/cluster-settings/prometheus-setting.tsx | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/core/src/common/cluster-types.ts b/packages/core/src/common/cluster-types.ts index cd4f89d51c8a..6cc923da0d70 100644 --- a/packages/core/src/common/cluster-types.ts +++ b/packages/core/src/common/cluster-types.ts @@ -175,6 +175,11 @@ export enum ClusterMetricsResourceType { Namespace = "Namespace", } +/** + * The default filesystem mountpoints for metrics + */ +export const initialFilesystemMountpoints = "/"; + /** * The default node shell image */ diff --git a/packages/core/src/main/routes/metrics/add-metrics-route.injectable.ts b/packages/core/src/main/routes/metrics/add-metrics-route.injectable.ts index eaf6dba4cd18..e356da731580 100644 --- a/packages/core/src/main/routes/metrics/add-metrics-route.injectable.ts +++ b/packages/core/src/main/routes/metrics/add-metrics-route.injectable.ts @@ -6,7 +6,7 @@ import { apiPrefix } from "../../../common/vars"; import { getRouteInjectable } from "../../router/router.injectable"; import type { ClusterPrometheusMetadata } from "../../../common/cluster-types"; -import { ClusterMetadataKey } from "../../../common/cluster-types"; +import { ClusterMetadataKey, initialFilesystemMountpoints } from "../../../common/cluster-types"; import type { Cluster } from "../../../common/cluster/cluster"; import { clusterRoute } from "../../router/route"; import { isObject } from "lodash"; @@ -69,7 +69,7 @@ const addMetricsRouteInjectable = getRouteInjectable({ const queryParams: Partial> = Object.fromEntries(query.entries()); const prometheusMetadata: ClusterPrometheusMetadata = {}; const prometheusHandler = di.inject(prometheusHandlerInjectable, cluster); - const mountpoints = cluster.preferences.filesystemMountpoints || "/"; + const mountpoints = cluster.preferences.filesystemMountpoints || initialFilesystemMountpoints; try { const { prometheusPath, provider } = await prometheusHandler.getPrometheusDetails(); diff --git a/packages/core/src/renderer/components/cluster-settings/prometheus-setting.tsx b/packages/core/src/renderer/components/cluster-settings/prometheus-setting.tsx index 0597752c3868..810a20c05120 100644 --- a/packages/core/src/renderer/components/cluster-settings/prometheus-setting.tsx +++ b/packages/core/src/renderer/components/cluster-settings/prometheus-setting.tsx @@ -6,6 +6,7 @@ import React from "react"; import { observer, disposeOnUnmount } from "mobx-react"; import type { Cluster } from "../../../common/cluster/cluster"; +import { initialFilesystemMountpoints } from "../../../common/cluster-types"; import { SubTitle } from "../layout/sub-title"; import type { SelectOption } from "../select"; import { Select } from "../select"; @@ -36,6 +37,7 @@ class NonInjectedClusterPrometheusSetting extends React.Component(); @computed get options(): SelectOption[] { @@ -183,7 +185,7 @@ class NonInjectedClusterPrometheusSetting extends React.Component this.mountpoints = value} onBlur={this.onSaveMountpoints} - placeholder="/" + placeholder={this.initialFilesystemMountpoints} /> {`A regexp for the label with the filesystem mountpoints that will create a graph for disk usage. For the root disk only use "/" and for all disks use ".*".`}