From f7cfc93e45c6da62813707bac83b53bd73b340c7 Mon Sep 17 00:00:00 2001
From: noorhatoom <155294912+noorhatoom@users.noreply.github.com>
Date: Sun, 3 May 2026 14:20:11 +0300
Subject: [PATCH 1/2] Add kibanaIndex to connection state and related
 components-

---
 server/dashboardConfig.mjs          |  2 ++
 server/setupConfig.mjs              |  1 +
 src/Routes/Tables/Jobs/NodeLogs.jsx | 10 ++++++----
 src/actions/connection.action.js    |  2 ++
 src/reducers/connection.reducer.js  |  1 +
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/server/dashboardConfig.mjs b/server/dashboardConfig.mjs
index 091640a5d..a21b81872 100644
--- a/server/dashboardConfig.mjs
+++ b/server/dashboardConfig.mjs
@@ -5,6 +5,7 @@ const {
   board,
   hkubeSystemVersion,
   kibanaUrl,
+  kibanaIndex,
   structuredPrefix,
   grafanaUrl,
   grafanaDashboardUrl,
@@ -18,6 +19,7 @@ const {
 const buildDashboardConfig = () => ({
   hkubeSystemVersion,
   kibanaUrl,
+  kibanaIndex,
   structuredPrefix,
   grafanaUrl,
   grafanaDashboardUrl,
diff --git a/server/setupConfig.mjs b/server/setupConfig.mjs
index 2b3ab3f88..215a0575f 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 kibanaIndex = 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..819e95b45 100644
--- a/src/Routes/Tables/Jobs/NodeLogs.jsx
+++ b/src/Routes/Tables/Jobs/NodeLogs.jsx
@@ -87,8 +87,9 @@ const NodeLogs = ({
   sideCarsDetails,
 }) => {
   const [openPopupOverListTasks, setOpenPopupOverListTasks] = useState(false);
-  const { kibanaUrl, structuredPrefix } = useSelector(selectors.connection);
-
+  const { kibanaUrl, structuredPrefix, kibanaIndex } = useSelector(
+    selectors.connection
+  );
   const [logMode, setLogMode] = useState(logModes.ALGORITHM);
   const [containerNames, setContainerNames] = useState([]);
   const [searchWord, setSearchWord] = useState(null);
@@ -169,7 +170,7 @@ const NodeLogs = ({
   }, [logs.length, node]);
 
   const linkKibana = useMemo(() => {
-    if (!kibanaUrl || !taskId) return '';
+    if (!kibanaUrl || !taskId || !kibanaIndex) return '';
 
     const startTime =
       node.batch?.length > 0
@@ -186,7 +187,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:'${kibanaIndex}',key:${metaPath},negate:!f,params:(query:'${cTaskId}'),type:phrase),query:(match:(${metaPath}:(query:'${cTaskId}',type:phrase))))),index:'${kibanaIndex}',interval:auto,query:(language:lucene${
       word ? `,query:${word}` : ''
     }),sort:!(!('@timestamp',desc)))`;
   }, [
@@ -196,6 +197,7 @@ const NodeLogs = ({
     node.startTime,
     currentTask,
     searchWord,
+    kibanaIndex,
     structuredPrefix,
   ]);
 
diff --git a/src/actions/connection.action.js b/src/actions/connection.action.js
index 331f14cd9..12f429b6e 100644
--- a/src/actions/connection.action.js
+++ b/src/actions/connection.action.js
@@ -25,6 +25,7 @@ export const connectionSetup = ({
   boardUrl,
   hkubeSystemVersion,
   kibanaUrl,
+  kibanaIndex,
   structuredPrefix,
   grafanaUrl,
   grafanaDashboardUrl,
@@ -40,6 +41,7 @@ export const connectionSetup = ({
     boardUrl,
     hkubeSystemVersion,
     kibanaUrl,
+    kibanaIndex,
     structuredPrefix,
     grafanaUrl,
     grafanaDashboardUrl,
diff --git a/src/reducers/connection.reducer.js b/src/reducers/connection.reducer.js
index 1881eb475..558538be1 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,
+  kibanaIndex: null,
   structuredPrefix: null,
   grafanaUrl: null,
   grafanaDashboardUrl: null,

From e1fceef2c50cd738684f17036e4b2cbe789957f7 Mon Sep 17 00:00:00 2001
From: noorhatoom <155294912+noorhatoom@users.noreply.github.com>
Date: Mon, 4 May 2026 10:24:50 +0300
Subject: [PATCH 2/2] Rename kibanaIndex to ELASTICSEARCH_LOGS_INDEX across
 configuration and components also added a fallback  for the kibana index to
 dev env kibanaindex

---
 server/dashboardConfig.mjs          |  4 ++--
 server/setupConfig.mjs              |  2 +-
 src/Routes/Tables/Jobs/NodeLogs.jsx | 16 ++++++++++------
 src/actions/connection.action.js    |  4 ++--
 src/reducers/connection.reducer.js  |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/server/dashboardConfig.mjs b/server/dashboardConfig.mjs
index a21b81872..31ece76b8 100644
--- a/server/dashboardConfig.mjs
+++ b/server/dashboardConfig.mjs
@@ -5,7 +5,7 @@ const {
   board,
   hkubeSystemVersion,
   kibanaUrl,
-  kibanaIndex,
+  ELASTICSEARCH_LOGS_INDEX,
   structuredPrefix,
   grafanaUrl,
   grafanaDashboardUrl,
@@ -19,7 +19,7 @@ const {
 const buildDashboardConfig = () => ({
   hkubeSystemVersion,
   kibanaUrl,
-  kibanaIndex,
+  ELASTICSEARCH_LOGS_INDEX,
   structuredPrefix,
   grafanaUrl,
   grafanaDashboardUrl,
diff --git a/server/setupConfig.mjs b/server/setupConfig.mjs
index 215a0575f..f04b4543f 100644
--- a/server/setupConfig.mjs
+++ b/server/setupConfig.mjs
@@ -20,7 +20,7 @@ const parseBool = value => {
 
 export const hkubeSystemVersion = process.env.HKUBE_SYSTEM_VERSION;
 export const kibanaUrl = process.env.KIBANA_URL;
-export const kibanaIndex = process.env.KIBANA_INDEX;
+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 819e95b45..890dfb192 100644
--- a/src/Routes/Tables/Jobs/NodeLogs.jsx
+++ b/src/Routes/Tables/Jobs/NodeLogs.jsx
@@ -87,9 +87,13 @@ const NodeLogs = ({
   sideCarsDetails,
 }) => {
   const [openPopupOverListTasks, setOpenPopupOverListTasks] = useState(false);
-  const { kibanaUrl, structuredPrefix, kibanaIndex } = 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);
@@ -170,7 +174,7 @@ const NodeLogs = ({
   }, [logs.length, node]);
 
   const linkKibana = useMemo(() => {
-    if (!kibanaUrl || !taskId || !kibanaIndex) return '';
+    if (!kibanaUrl || !taskId || !ELASTICSEARCH_LOGS_INDEX) return '';
 
     const startTime =
       node.batch?.length > 0
@@ -187,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:'${kibanaIndex}',key:${metaPath},negate:!f,params:(query:'${cTaskId}'),type:phrase),query:(match:(${metaPath}:(query:'${cTaskId}',type:phrase))))),index:'${kibanaIndex}',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)))`;
   }, [
@@ -197,7 +201,7 @@ const NodeLogs = ({
     node.startTime,
     currentTask,
     searchWord,
-    kibanaIndex,
+    ELASTICSEARCH_LOGS_INDEX,
     structuredPrefix,
   ]);
 
diff --git a/src/actions/connection.action.js b/src/actions/connection.action.js
index 12f429b6e..e9ab29458 100644
--- a/src/actions/connection.action.js
+++ b/src/actions/connection.action.js
@@ -25,7 +25,7 @@ export const connectionSetup = ({
   boardUrl,
   hkubeSystemVersion,
   kibanaUrl,
-  kibanaIndex,
+  ELASTICSEARCH_LOGS_INDEX,
   structuredPrefix,
   grafanaUrl,
   grafanaDashboardUrl,
@@ -41,7 +41,7 @@ export const connectionSetup = ({
     boardUrl,
     hkubeSystemVersion,
     kibanaUrl,
-    kibanaIndex,
+    ELASTICSEARCH_LOGS_INDEX,
     structuredPrefix,
     grafanaUrl,
     grafanaDashboardUrl,
diff --git a/src/reducers/connection.reducer.js b/src/reducers/connection.reducer.js
index 558538be1..202bf940a 100644
--- a/src/reducers/connection.reducer.js
+++ b/src/reducers/connection.reducer.js
@@ -13,7 +13,7 @@ const initialState = {
   boardUrl: null,
   hkubeSystemVersion: null,
   kibanaUrl: null,
-  kibanaIndex: null,
+  ELASTICSEARCH_LOGS_INDEX: null,
   structuredPrefix: null,
   grafanaUrl: null,
   grafanaDashboardUrl: null,