diff --git a/server/dashboardConfig.mjs b/server/dashboardConfig.mjs index 091640a5d..31ece76b8 100644 --- a/server/dashboardConfig.mjs +++ b/server/dashboardConfig.mjs @@ -5,6 +5,7 @@ const { board, hkubeSystemVersion, kibanaUrl, + ELASTICSEARCH_LOGS_INDEX, structuredPrefix, grafanaUrl, grafanaDashboardUrl, @@ -18,6 +19,7 @@ const { const buildDashboardConfig = () => ({ hkubeSystemVersion, kibanaUrl, + ELASTICSEARCH_LOGS_INDEX, structuredPrefix, grafanaUrl, grafanaDashboardUrl, diff --git a/server/setupConfig.mjs b/server/setupConfig.mjs index 2b3ab3f88..f04b4543f 100644 --- a/server/setupConfig.mjs +++ b/server/setupConfig.mjs @@ -20,6 +20,7 @@ const parseBool = value => { export const hkubeSystemVersion = process.env.HKUBE_SYSTEM_VERSION; export const kibanaUrl = process.env.KIBANA_URL; +export const ELASTICSEARCH_LOGS_INDEX = process.env.KIBANA_INDEX; export const structuredPrefix = process.env.ELASTICSEARCH_STRUCTURED_PREFIX; export const grafanaUrl = process.env.GRAFANA_URL; export const grafanaDashboardUrl = process.env.GRAFANA_URL; diff --git a/src/Routes/Tables/Jobs/NodeLogs.jsx b/src/Routes/Tables/Jobs/NodeLogs.jsx index d6d5722cf..890dfb192 100644 --- a/src/Routes/Tables/Jobs/NodeLogs.jsx +++ b/src/Routes/Tables/Jobs/NodeLogs.jsx @@ -87,8 +87,13 @@ const NodeLogs = ({ sideCarsDetails, }) => { const [openPopupOverListTasks, setOpenPopupOverListTasks] = useState(false); - const { kibanaUrl, structuredPrefix } = useSelector(selectors.connection); - + const { + kibanaUrl, + structuredPrefix, + ELASTICSEARCH_LOGS_INDEX: elasticsearchLogsIndexFromStore, + } = useSelector(selectors.connection); + const ELASTICSEARCH_LOGS_INDEX = + elasticsearchLogsIndexFromStore || '37127fd0-9ff3-11ea-b971-21eddb3a470d'; const [logMode, setLogMode] = useState(logModes.ALGORITHM); const [containerNames, setContainerNames] = useState([]); const [searchWord, setSearchWord] = useState(null); @@ -169,7 +174,7 @@ const NodeLogs = ({ }, [logs.length, node]); const linkKibana = useMemo(() => { - if (!kibanaUrl || !taskId) return ''; + if (!kibanaUrl || !taskId || !ELASTICSEARCH_LOGS_INDEX) return ''; const startTime = node.batch?.length > 0 @@ -186,7 +191,7 @@ const NodeLogs = ({ metaPath = `${structuredPrefix}.${metaPath}`; } - return `${kibanaUrl}app/kibana#/discover?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'${time}',to:now))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'37127fd0-9ff3-11ea-b971-21eddb3a470d',key:${metaPath},negate:!f,params:(query:'${cTaskId}'),type:phrase),query:(match:(${metaPath}:(query:'${cTaskId}',type:phrase))))),index:'37127fd0-9ff3-11ea-b971-21eddb3a470d',interval:auto,query:(language:lucene${ + return `${kibanaUrl}app/kibana#/discover?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'${time}',to:now))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'${ELASTICSEARCH_LOGS_INDEX}',key:${metaPath},negate:!f,params:(query:'${cTaskId}'),type:phrase),query:(match:(${metaPath}:(query:'${cTaskId}',type:phrase))))),index:'${ELASTICSEARCH_LOGS_INDEX}',interval:auto,query:(language:lucene${ word ? `,query:${word}` : '' }),sort:!(!('@timestamp',desc)))`; }, [ @@ -196,6 +201,7 @@ const NodeLogs = ({ node.startTime, currentTask, searchWord, + ELASTICSEARCH_LOGS_INDEX, structuredPrefix, ]); diff --git a/src/actions/connection.action.js b/src/actions/connection.action.js index 331f14cd9..e9ab29458 100644 --- a/src/actions/connection.action.js +++ b/src/actions/connection.action.js @@ -25,6 +25,7 @@ export const connectionSetup = ({ boardUrl, hkubeSystemVersion, kibanaUrl, + ELASTICSEARCH_LOGS_INDEX, structuredPrefix, grafanaUrl, grafanaDashboardUrl, @@ -40,6 +41,7 @@ export const connectionSetup = ({ boardUrl, hkubeSystemVersion, kibanaUrl, + ELASTICSEARCH_LOGS_INDEX, structuredPrefix, grafanaUrl, grafanaDashboardUrl, diff --git a/src/reducers/connection.reducer.js b/src/reducers/connection.reducer.js index 1881eb475..202bf940a 100644 --- a/src/reducers/connection.reducer.js +++ b/src/reducers/connection.reducer.js @@ -13,6 +13,7 @@ const initialState = { boardUrl: null, hkubeSystemVersion: null, kibanaUrl: null, + ELASTICSEARCH_LOGS_INDEX: null, structuredPrefix: null, grafanaUrl: null, grafanaDashboardUrl: null,