diff --git a/web/src/components/Overview/Monitor/index.jsx b/web/src/components/Overview/Monitor/index.jsx index 51b2f6bb..7cc43cdd 100644 --- a/web/src/components/Overview/Monitor/index.jsx +++ b/web/src/components/Overview/Monitor/index.jsx @@ -113,12 +113,6 @@ const Monitor = (props) => { return monitor_configs?.node_stats?.enabled === false && monitor_configs?.index_stats?.enabled === false }, [JSON.stringify(selectedCluster?.monitor_configs)]) - console.log("spinning") - console.log(spinning) - console.log("state.refresh") - console.log(state.refresh) - - return (
diff --git a/web/src/components/vendor/console/modules/autocomplete/autocomplete.ts b/web/src/components/vendor/console/modules/autocomplete/autocomplete.ts index 5f032841..3adbb702 100644 --- a/web/src/components/vendor/console/modules/autocomplete/autocomplete.ts +++ b/web/src/components/vendor/console/modules/autocomplete/autocomplete.ts @@ -356,7 +356,6 @@ export function getCurrentMethodAndTokenPaths( // mark the url as completed. ret.urlTokenPath.push(URL_PATH_END_MARKER); } - debugger if (t && t.type === "method") { ret.method = t.value; @@ -593,7 +592,6 @@ export default function({ coreEditor: editor }: { coreEditor: CoreEditor }) { switch ((t || ({} as Token)).type) { case "method": // we moved one back - debugger return "path"; default: if (isUrlPathToken(t)) { @@ -1110,7 +1108,6 @@ export default function({ coreEditor: editor }: { coreEditor: CoreEditor }) { } else { components = getUnmatchedEndpointComponents(); } - debugger populateContext(ret.bodyTokenPath, context, editor, true, components); return context; diff --git a/web/src/pages/Platform/Overview/Cluster/Monitor/advanced.jsx b/web/src/pages/Platform/Overview/Cluster/Monitor/advanced.jsx index a5f10813..0d37acb2 100644 --- a/web/src/pages/Platform/Overview/Cluster/Monitor/advanced.jsx +++ b/web/src/pages/Platform/Overview/Cluster/Monitor/advanced.jsx @@ -8,6 +8,24 @@ import QueueMetric from "../../components/queue_metric"; import { ESPrefix } from "@/services/common"; import { SearchEngines } from "@/lib/search_engines"; +export const shouldHaveModelInferenceBreaker = (cluster) => { + if ([SearchEngines.Easysearch, SearchEngines.Opensearch].includes(cluster?.distribution)) return false; + const versions = cluster?.version?.split('.') || [] + if (parseInt(versions[0]) > 8 || (parseInt(versions[0]) === 8 && parseInt(versions[1]) >= 6 )) { + return true + } + return false +} + +export const isVersionGTE6 = (cluster) => { + if ([SearchEngines.Easysearch, SearchEngines.Opensearch].includes(cluster?.distribution)) return true; + const main = cluster?.version?.split('.')[0] + if (main && parseInt(main) >= 6) { + return true + } + return false +} + export default ({ selectedCluster, clusterID, @@ -29,14 +47,13 @@ export default ({ refresh } - const isVersionGTE6 = useMemo(() => { - if ([SearchEngines.Easysearch, SearchEngines.Opensearch].includes(selectedCluster?.distribution)) return true; - const main = selectedCluster?.version?.split('.')[0] - if (main && parseInt(main) >= 6) { - return true - } - return false - }, [selectedCluster?.version]) + const isVersionGTE8_6 = useMemo(() => { + return shouldHaveModelInferenceBreaker(selectedCluster) + }, [selectedCluster]) + + const versionGTE6 = useMemo(() => { + return isVersionGTE6(selectedCluster) + }, [selectedCluster]) const [param, setParam] = useState({ tab: "cluster", @@ -141,8 +158,8 @@ export default ({ "fielddata_breaker", "request_breaker", "in_flight_requests_breaker", - "model_inference_breaker" - ] + isVersionGTE8_6 ? "model_inference_breaker" : undefined + ].filter((item) => !!item) ], [ "io", @@ -314,7 +331,7 @@ export default ({ param={param} setParam={setParam} metrics={[ - isVersionGTE6 ? [ + versionGTE6 ? [ "thread_pool_write", [ "write_active", @@ -340,7 +357,7 @@ export default ({ "search_threads" ] ], - !isVersionGTE6 ? [ + !versionGTE6 ? [ "thread_pool_bulk", [ "bulk_active", diff --git a/web/src/pages/Platform/Overview/Host/Detail/Metrics.js b/web/src/pages/Platform/Overview/Host/Detail/Metrics.js index 825da55b..39437a77 100644 --- a/web/src/pages/Platform/Overview/Host/Detail/Metrics.js +++ b/web/src/pages/Platform/Overview/Host/Detail/Metrics.js @@ -16,14 +16,22 @@ export default (props) => { return null; } - const hasAgent = !!props.data?._source?.agent_id; + const isAgent = !!props.data?._source?.agent_id; return ( <> !!item)} renderExtraMetric={() => - !hasAgent && ( + !isAgent && (
{ ) } extra={ - hasAgent && ( + isAgent && ( <> diff --git a/web/src/pages/Platform/Overview/Host/Monitor/advanced.jsx b/web/src/pages/Platform/Overview/Host/Monitor/advanced.jsx index b569514c..d041b8cb 100644 --- a/web/src/pages/Platform/Overview/Host/Monitor/advanced.jsx +++ b/web/src/pages/Platform/Overview/Host/Monitor/advanced.jsx @@ -3,24 +3,46 @@ import { Button } from 'antd'; import InstallAgent from '@/components/Overview/Monitor/InstallAgent'; import { formatMessage } from "umi/locale"; -const timezone = "local"; - export default ({ hostID, timeRange, handleTimeChange, - info + info, + bucketSize, + timezone, + timeout, + refresh, }) => { + + const isAgent = info?.agent_id + return ( { - if (info?.agent_id) return; + if (isAgent) return; return }} + metrics={[ + 'cpu_used_percent', + 'memory_used_percent', + 'disk_used_percent', + isAgent ? 'network_summary' : undefined, + isAgent ? 'disk_read_rate' : undefined, + isAgent ? 'disk_write_rate' : undefined, + isAgent ? 'system_load' : undefined, + isAgent ? 'cpu_iowait' : undefined, + isAgent ? 'swap_memory_used_percent' : undefined, + isAgent ? 'network_packets_summary' : undefined, + isAgent ? 'disk_partition_usage' : undefined, + isAgent ? 'network_interface_output_rate' : undefined, + ].filter((item) => !!item)} /> ); } \ No newline at end of file diff --git a/web/src/pages/Platform/Overview/Host/Monitor/index.jsx b/web/src/pages/Platform/Overview/Host/Monitor/index.jsx index 85713cd9..ca39872e 100644 --- a/web/src/pages/Platform/Overview/Host/Monitor/index.jsx +++ b/web/src/pages/Platform/Overview/Host/Monitor/index.jsx @@ -15,6 +15,7 @@ const panes = [ export default (props) => { return ( { return { ...state, diff --git a/web/src/pages/Platform/Overview/Host/Monitor/overview.jsx b/web/src/pages/Platform/Overview/Host/Monitor/overview.jsx index f7dcfd83..52206527 100644 --- a/web/src/pages/Platform/Overview/Host/Monitor/overview.jsx +++ b/web/src/pages/Platform/Overview/Host/Monitor/overview.jsx @@ -9,19 +9,36 @@ export default ({ hostID, timeRange, handleTimeChange, - info + info, + bucketSize, + timezone, + timeout, + refresh, }) => { + const isAgent = info?.agent_id + return ( { - if (info?.agent_id) return; + if (isAgent) return; return }} + metrics={[ + 'cpu_used_percent', + 'memory_used_percent', + 'disk_used_percent', + isAgent ? 'network_summary' : undefined, + isAgent ? 'disk_read_rate' : undefined, + isAgent ? 'disk_write_rate' : undefined + ].filter((item) => !!item)} /> ); } diff --git a/web/src/pages/Platform/Overview/Node/Monitor/advanced.jsx b/web/src/pages/Platform/Overview/Node/Monitor/advanced.jsx index 379f3a2b..5c85476c 100644 --- a/web/src/pages/Platform/Overview/Node/Monitor/advanced.jsx +++ b/web/src/pages/Platform/Overview/Node/Monitor/advanced.jsx @@ -4,6 +4,7 @@ import NodeMetric from "../../components/node_metric"; import QueueMetric from "../../components/queue_metric"; import { formatMessage } from "umi/locale"; import { SearchEngines } from "@/lib/search_engines"; +import { isVersionGTE6, shouldHaveModelInferenceBreaker } from "../../Cluster/Monitor/advanced"; export default ({ selectedCluster, @@ -27,13 +28,12 @@ export default ({ refresh } - const isVersionGTE6 = useMemo(() => { - if ([SearchEngines.Easysearch, SearchEngines.Opensearch].includes(selectedCluster?.distribution)) return true; - const main = selectedCluster?.version?.split('.')[0] - if (main && parseInt(main) >= 6) { - return true - } - return false + const isVersionGTE8_6 = useMemo(() => { + return shouldHaveModelInferenceBreaker(selectedCluster) + }, [selectedCluster]) + + const versionGTE6 = useMemo(() => { + return isVersionGTE6(selectedCluster) }, [selectedCluster]) const [param, setParam] = useState({ @@ -120,8 +120,8 @@ export default ({ "fielddata_breaker", "request_breaker", "in_flight_requests_breaker", - "model_inference_breaker" - ] + isVersionGTE8_6 ? "model_inference_breaker" : undefined + ].filter((item) => !!item) ], [ "io", @@ -215,7 +215,7 @@ export default ({ param={param} setParam={setParam} metrics={[ - isVersionGTE6 ? [ + versionGTE6 ? [ "thread_pool_write", [ "write_active", @@ -241,7 +241,7 @@ export default ({ "search_threads" ] ], - !isVersionGTE6 ? [ + !versionGTE6 ? [ "thread_pool_bulk", [ "bulk_active", @@ -286,7 +286,7 @@ export default ({ "force_merge_threads" ] ] - ].filter((item) => !!item)} + ]} />