Merge branch 'main' of https://github.com/RedisInsight/RedisInsight into feature/RI-4616-rdi-support

Author: AmirAllayarovSofteq

redisinsight/api/config/default.ts

@@ -100,6 +100,7 @@ export default {
     retryTimes: parseInt(process.env.RI_CLIENTS_RETRY_TIMES, 10) || 3,
     retryDelay: parseInt(process.env.RI_CLIENTS_RETRY_DELAY, 10) || 500,
     maxRetriesPerRequest: parseInt(process.env.RI_CLIENTS_MAX_RETRIES_PER_REQUEST, 10) || 1,
+    slotsRefreshTimeout: parseInt(process.env.RI_CLIENTS_SLOTS_REQUEST_TIMEOUT, 10) || 5000,
   },
   redis_scan: {
     countDefault: parseInt(process.env.RI_SCAN_COUNT_DEFAULT, 10) || 200,

redisinsight/api/config/features-config.json

@@ -1,5 +1,5 @@
 {
-  "version": 2.5201,
+  "version": 2.52,
   "features": {
     "rdi": {
       "flag": true,
@@ -16,6 +16,28 @@
       "flag": true,
       "perc": [[0,100]]
     },
+    "documentationChat": {
+      "flag": true,
+      "perc": [[0,5]],
+      "filters": [
+        {
+          "name": "config.server.buildType",
+          "value": "ELECTRON",
+          "cond": "eq"
+        }
+      ]
+    },
+    "databaseChat": {
+      "flag": true,
+      "perc": [[0,5]],
+      "filters": [
+        {
+          "name": "config.server.buildType",
+          "value": "ELECTRON",
+          "cond": "eq"
+        }
+      ]
+    },
     "cloudSso": {
       "flag": true,
       "perc": [[0,100]],

redisinsight/api/package.json

@@ -56,8 +56,8 @@
     "@nestjs/typeorm": "^9.0.1",
     "@nestjs/websockets": "^10.3.7",
     "@okta/okta-auth-js": "^7.3.0",
+    "@segment/analytics-node": "^2.1.2",
     "adm-zip": "^0.5.9",
-    "analytics-node": "^4.0.1",
     "axios": "^1.6.0",
     "body-parser": "^1.19.0",
     "busboy": "^1.6.0",

redisinsight/api/src/constants/telemetry-events.ts

@@ -89,7 +89,7 @@ export enum TelemetryEvents {
   FeatureFlagRecalculated = 'FEATURE_FLAG_RECALCULATED',
 
   // Insights
-  InsightsRecommendationGenerated = 'INSIGHTS_RECOMMENDATION_GENERATED',
+  InsightsTipGenerated = 'INSIGHTS_TIP_GENERATED',
 
   // RDI
   RdiInstanceDeleted = 'RDI_INSTANCE_DELETED',

redisinsight/api/src/modules/analytics/analytics.service.spec.ts

@@ -17,12 +17,13 @@ import {
 let mockAnalyticsTrack;
 let mockAnalyticsPage;
 jest.mock(
-  'analytics-node',
-  () => jest.fn()
-    .mockImplementation(() => ({
+  '@segment/analytics-node',
+  () => ({
+    Analytics: jest.fn().mockImplementation(() => ({
       track: mockAnalyticsTrack,
       page: mockAnalyticsPage,
     })),
+  }),
 );
 
 const mockAnonymousId = 'a77b23c1-7816-4ea4-b61f-d37795a0f805';

redisinsight/api/src/modules/analytics/analytics.service.ts

@@ -1,9 +1,10 @@
 import { Injectable } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
 import { get } from 'lodash';
-import * as Analytics from 'analytics-node';
+import { Analytics } from '@segment/analytics-node';
 import { AppAnalyticsEvents } from 'src/constants';
 import config from 'src/utils/config';
+import axios from 'axios';
 import { SettingsService } from 'src/modules/settings/settings.service';
 
 export const NON_TRACKING_ANONYMOUS_ID = '00000000-0000-0000-0000-000000000001';
@@ -65,8 +66,14 @@ export class AnalyticsService {
     this.controlGroup = controlGroup;
     this.appVersion = appVersion;
     this.controlNumber = controlNumber;
-    this.analytics = new Analytics(ANALYTICS_CONFIG.writeKey, {
+    this.analytics = new Analytics({
+      writeKey: ANALYTICS_CONFIG.writeKey,
       flushInterval: ANALYTICS_CONFIG.flushInterval,
+      httpClient: (url, requestInit) => axios.request({
+        ...requestInit,
+        url,
+        data: requestInit.body,
+      }),
     });
   }
 

redisinsight/api/src/modules/database-recommendation/database-recommendation.analytics.spec.ts

@@ -36,7 +36,7 @@ describe('DatabaseRecommendationAnalytics', () => {
       );
 
       expect(sendEventSpy).toHaveBeenCalledWith(
-        TelemetryEvents.InsightsRecommendationGenerated,
+        TelemetryEvents.InsightsTipGenerated,
         {
           recommendationName: mockDatabaseRecommendation.name,
           databaseId: mockDatabase.id,

redisinsight/api/src/modules/database-recommendation/database-recommendation.analytics.ts

@@ -14,7 +14,7 @@ export class DatabaseRecommendationAnalytics extends TelemetryBaseService {
   sendCreatedRecommendationEvent(recommendation: DatabaseRecommendation, database: Database): void {
     try {
       this.sendEvent(
-        TelemetryEvents.InsightsRecommendationGenerated,
+        TelemetryEvents.InsightsTipGenerated,
         {
           recommendationName: recommendation.name,
           databaseId: database.id,

redisinsight/api/src/modules/database/entities/database.entity.ts

@@ -12,10 +12,11 @@ import { CloudDatabaseDetailsEntity } from 'src/modules/cloud/database/entities/
 export enum HostingProvider {
   RE_CLUSTER = 'RE_CLUSTER',
   RE_CLOUD = 'RE_CLOUD',
-  REDIS_MANAGED = 'REDIS_MANAGED',
+  REDIS_STACK = 'REDIS_STACK',
+  REDIS_ENTERPRISE = 'REDIS_ENTERPRISE',
   AZURE_CACHE = 'AZURE_CACHE',
   AZURE_CACHE_REDIS_ENTERPRISE = 'AZURE_CACHE_REDIS_ENTERPRISE',
-  COMMUNITY_EDITION = 'COMMUNITY_EDITION',
+  REDIS_COMMUNITY_EDITION = 'REDIS_COMMUNITY_EDITION',
   AWS_ELASTICACHE = 'AWS_ELASTICACHE',
   AWS_MEMORYDB = 'AWS_MEMORYDB',
   VALKEY = 'VALKEY',
@@ -26,6 +27,7 @@ export enum HostingProvider {
   KVROCKS = 'KVROCKS',
   REDICT = 'REDICT',
   UPSTASH = 'UPSTASH',
+  UNKNOWN_LOCALHOST = 'UNKNOWN_LOCALHOST',
   UNKNOWN = 'UNKNOWN',
 }
 

redisinsight/api/src/modules/profiler/models/profiler.client.ts

@@ -43,8 +43,14 @@ export class ProfilerClient {
       time, args, source, database,
     } = payload;
 
+    // If there's [ in the time, strip it out.
+    //
+    // There is a case of a timestamp coming with '[' on Alibaba
+    // Redis's monitor.
+    const newTime = time.split('[')[0];
+
     this.items.push({
-      time, args, source, database,
+      time: newTime, args, source, database,
     });
 
     this.debounce();