fix(compatibility): fix the platform index name

wazuh · Nov 7, 2022 · 1410f29 · 1410f29
1 parent 690cddb
commit 1410f29
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/server/plugin.ts b/server/plugin.ts
@@ -60,13 +60,16 @@ declare module 'kibana/server' {
 
 export class WazuhPlugin implements Plugin<WazuhPluginSetup, WazuhPluginStart> {
   private readonly logger: Logger;
+  private savedObjectsIndex: string
 
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.logger = initializerContext.logger.get();
+    this.savedObjectsIndex = '';
   }
 
   public async setup(core: CoreSetup, plugins: PluginSetup) {
     this.logger.debug('Wazuh-wui: Setup');
+    this.savedObjectsIndex = core.savedObjects.getKibanaIndex();
 
     const serverInfo = core.http.getServerInfo();
 
@@ -132,7 +135,8 @@ export class WazuhPlugin implements Plugin<WazuhPluginSetup, WazuhPluginStart> {
         logger: this.logger.get('initialize'),
         api: wazuhApiClient
       },
-      server: contextServer
+      server: contextServer,
+      savedObjectsIndex: this.savedObjectsIndex
     });
 
     // Migration tasks
@@ -142,7 +146,8 @@ export class WazuhPlugin implements Plugin<WazuhPluginSetup, WazuhPluginStart> {
         logger: this.logger.get('migration-task'),
         api: wazuhApiClient
       },
-      server: contextServer
+      server: contextServer,
+      savedObjectsIndex: this.savedObjectsIndex
     });
 
     // Monitoring
@@ -152,7 +157,8 @@ export class WazuhPlugin implements Plugin<WazuhPluginSetup, WazuhPluginStart> {
         logger: this.logger.get('monitoring'),
         api: wazuhApiClient
       },
-      server: contextServer
+      server: contextServer,
+      savedObjectsIndex: this.savedObjectsIndex
     });
 
     // Scheduler
@@ -162,7 +168,8 @@ export class WazuhPlugin implements Plugin<WazuhPluginSetup, WazuhPluginStart> {
         logger: this.logger.get('cron-scheduler'),
         api: wazuhApiClient
       },
-      server: contextServer
+      server: contextServer,
+      savedObjectsIndex: this.savedObjectsIndex
     });
 
     // Queue
@@ -172,7 +179,8 @@ export class WazuhPlugin implements Plugin<WazuhPluginSetup, WazuhPluginStart> {
         logger: this.logger.get('queue'),
         api: wazuhApiClient
       },
-      server: contextServer
+      server: contextServer,
+      savedObjectsIndex: this.savedObjectsIndex
     });
     return {};
   }

diff --git a/server/start/cron-scheduler/scheduler-handler.ts b/server/start/cron-scheduler/scheduler-handler.ts
@@ -45,10 +45,10 @@ const checkPluginPlatformStatus = async function (context) {
  const checkElasticsearchServer = async function (context) {
    try {
      const data = await context.core.elasticsearch.client.asInternalUser.indices.exists({
-       index: context.server.config.kibana.index
+       index: context.savedObjectsIndex
      });
 
-     return data.body;
+     return data;
    } catch (error) {
      log('scheduler-handler:checkElasticsearchServer', error.message || error);
      return Promise.reject(error);

diff --git a/server/start/initialize/index.ts b/server/start/initialize/index.ts
@@ -22,7 +22,7 @@ import { getSettingDefaultValue, getSettingsDefault } from '../../../common/serv
 
 
 export function jobInitializeRun(context) {
-  const PLUGIN_PLATFORM_INDEX = context.server.config.kibana.index;
+  const PLUGIN_PLATFORM_INDEX = context.savedObjectsIndex;
   log('initialize', `${PLUGIN_PLATFORM_NAME} index: ${PLUGIN_PLATFORM_INDEX}`, 'info');
   log('initialize', `App revision: ${packageJSON.revision}`, 'info');
 
@@ -274,7 +274,7 @@ export function jobInitializeRun(context) {
       const response = await context.core.elasticsearch.client.asInternalUser.indices.exists({
         index: PLUGIN_PLATFORM_INDEX
       });
-      if (response.body) {
+      if (response) {
         // It exists, initialize!
         await init();
       } else {

diff --git a/server/start/monitoring/index.ts b/server/start/monitoring/index.ts
@@ -312,10 +312,10 @@ async function checkPluginPlatformStatus(context) {
 async function checkElasticsearchServer(context) {
   try {
     const data = await context.core.elasticsearch.client.asInternalUser.indices.exists({
-      index: context.server.config.kibana.index
+      index: context.savedObjectsIndex
     });
 
-    return data.body;
+    return data;
     // TODO: check if Elasticsearch can receive requests
     // if (data) {
     //   const pluginsData = await this.server.plugins.elasticsearch.waitUntilReady();