[backend] fixes (#6292)

OpenCTI-Platform · May 3, 2024 · 06a3de2 · 06a3de2
1 parent 8f3ff36
commit 06a3de2
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 4 deletions.
diff --git a/opencti-platform/opencti-front/lang/back/de.json b/opencti-platform/opencti-front/lang/back/de.json
@@ -600,6 +600,7 @@
   "Task filters": "Aufgabenfilter",
   "Tasks": "Aufgaben",
   "Telemetry manager": "Telemetrie-Manager",
+  "TELEMETRY_MANAGER": "Telemetrie-Manager",
   "Template id": "Vorlage id",
   "Theme": "Thema",
   "Threat actor types": "Typen von Bedrohungsakteuren",

diff --git a/opencti-platform/opencti-front/lang/back/en.json b/opencti-platform/opencti-front/lang/back/en.json
@@ -600,6 +600,7 @@
   "Task filters": "Task filters",
   "Tasks": "Tasks",
   "Telemetry manager": "Telemetry manager",
+  "TELEMETRY_MANAGER": "Telemetry manager",
   "Template id": "Template id",
   "Theme": "Theme",
   "Threat actor types": "Threat actor types",

diff --git a/opencti-platform/opencti-front/lang/back/es.json b/opencti-platform/opencti-front/lang/back/es.json
@@ -600,6 +600,7 @@
   "Task filters": "Filtros de tareas",
   "Tasks": "Tareas",
   "Telemetry manager": "Gestor de telemetría",
+  "TELEMETRY_MANAGER": "Gestor de telemetría",
   "Template id": "Id de plantilla",
   "Theme": "Tema",
   "Threat actor types": "Tipos de actores de amenazas",

diff --git a/opencti-platform/opencti-front/lang/back/fr.json b/opencti-platform/opencti-front/lang/back/fr.json
@@ -600,6 +600,7 @@
   "Task filters": "Filtres de tâches",
   "Tasks": "Tâches",
   "Telemetry manager": "Manager de télémétrie",
+  "TELEMETRY_MANAGER": "Manager de télémétrie",
   "Template id": "Template id",
   "Theme": "Thème",
   "Threat actor types": "Types d'acteurs de la menace",

diff --git a/opencti-platform/opencti-front/lang/back/ja.json b/opencti-platform/opencti-front/lang/back/ja.json
@@ -600,6 +600,7 @@
   "Task filters": "タスクフィルタ",
   "Tasks": "ケーステンプレート",
   "Telemetry manager": "テレメトリー・マネージャー",
+  "TELEMETRY_MANAGER": "テレメトリー・マネージャー",
   "Template id": "テンプレートID",
   "Theme": "テーマ",
   "Threat actor types": "洗練度",

diff --git a/opencti-platform/opencti-front/lang/back/zh.json b/opencti-platform/opencti-front/lang/back/zh.json
@@ -600,6 +600,7 @@
   "Task filters": "任务过滤器",
   "Tasks": "任务",
   "Telemetry manager": "遥测管理器",
+  "TELEMETRY_MANAGER": "遥测管理器",
   "Template id": "模板 ID",
   "Theme": "主题",
   "Threat actor types": "威胁行为者类型",

diff --git a/opencti-platform/opencti-graphql/config/default.json b/opencti-platform/opencti-graphql/config/default.json
@@ -50,7 +50,7 @@
       },
       "filigran": {
         "enabled": true,
-        "exporter_otlp": "https://otlp.filigran.io/v1/metrics"
+        "exporter_otlp": "https://telemetry.filigran.io/v1/metrics"
       }
     },
     "health_access_key": "ChangeMe",

diff --git a/opencti-platform/opencti-graphql/src/domain/settings.js b/opencti-platform/opencti-graphql/src/domain/settings.js
@@ -23,7 +23,7 @@ export const getMemoryStatistics = () => {
   return { ...process.memoryUsage(), ...getHeapStatistics() };
 };
 
-const getClusterInformation = async () => {
+export const getClusterInformation = async () => {
   const clusterConfig = await getClusterInstances();
   const info = { instances_number: clusterConfig.length };
   const allManagers = clusterConfig.map((i) => i.managers).flat();

diff --git a/opencti-platform/opencti-graphql/src/manager/telemetryManager.ts b/opencti-platform/opencti-graphql/src/manager/telemetryManager.ts
@@ -8,7 +8,7 @@ import conf, { booleanConf, ENABLED_TELEMETRY, logApp, PLATFORM_VERSION } from '
 import { executionContext, TELEMETRY_MANAGER_USER } from '../utils/access';
 import { isNotEmptyField } from '../database/utils';
 import type { Settings } from '../generated/graphql';
-import { getSettings } from '../domain/settings';
+import { getClusterInformation, getSettings } from '../domain/settings';
 import { usersWithActiveSession } from '../database/session';
 import { TELEMETRY_SERVICE_NAME, TelemetryMeterManager } from '../config/TelemetryMeterManager';
 import type { ManagerDefinition } from './managerModule';
@@ -74,10 +74,11 @@ const fetchTelemetryData = async (filigranTelemetryMeterManager?: TelemetryMeter
       // Fetch settings
       const settingsArray = await getEntitiesListFromCache(context, TELEMETRY_MANAGER_USER, ENTITY_TYPE_SETTINGS);
       const settings = settingsArray[0] as unknown as Settings;
+      const clusterInfo = await getClusterInformation();
       // Set filigranTelemetryManager settings telemetry data
       filigranTelemetryMeterManager.setIsEEActivated(isNotEmptyField(settings.enterprise_edition) ? 1 : 0);
       filigranTelemetryMeterManager.setEEActivationDate(settings.enterprise_edition);
-      filigranTelemetryMeterManager.setInstancesCount(settings.platform_cluster.instances_number);
+      filigranTelemetryMeterManager.setInstancesCount(clusterInfo.info.instances_number);
       // Get number of active users since fetchTelemetryData() last execution
       const activUsers = await usersWithActiveSession(TELEMETRY_EXPORT_INTERVAL / 1000 / 60); // TODO use SCHEDULE_TIME instead when active users are stored in histogram
       // filigranTelemetryMeterManager.setActivUsersHistogram(activUsers.length);