Skip to content

Commit 4508969

Browse files
#RI-4124 - add dbindex to telemetry
1 parent 9eb38af commit 4508969

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ describe('DatabaseAnalytics', () => {
103103
numberedDatabases: mockRedisGeneralInfo.databases,
104104
numberOfModules: 0,
105105
timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
106+
databaseIndex: 0,
106107
...DEFAULT_REDIS_MODULES_SUMMARY,
107108
},
108109
);
@@ -132,6 +133,7 @@ describe('DatabaseAnalytics', () => {
132133
numberedDatabases: mockRedisGeneralInfo.databases,
133134
numberOfModules: 0,
134135
timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
136+
databaseIndex: 0,
135137
...DEFAULT_REDIS_MODULES_SUMMARY,
136138
},
137139
);
@@ -163,6 +165,45 @@ describe('DatabaseAnalytics', () => {
163165
numberedDatabases: undefined,
164166
numberOfModules: 2,
165167
timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
168+
databaseIndex: 0,
169+
...DEFAULT_REDIS_MODULES_SUMMARY,
170+
RediSearch: {
171+
loaded: true,
172+
version: 20000,
173+
},
174+
customModules: [{ name: 'rediSQL', version: 1 }],
175+
},
176+
);
177+
});
178+
it('should emit event without db index', () => {
179+
const instance = {
180+
...mockDatabaseWithTlsAuth,
181+
db: 2,
182+
modules: [{ name: 'search', version: 20000 }, { name: 'rediSQL', version: 1 }],
183+
};
184+
service.sendInstanceAddedEvent(instance, {
185+
version: mockRedisGeneralInfo.version,
186+
});
187+
188+
expect(sendEventSpy).toHaveBeenCalledWith(
189+
TelemetryEvents.RedisInstanceAdded,
190+
{
191+
databaseId: instance.id,
192+
connectionType: instance.connectionType,
193+
provider: instance.provider,
194+
useTLS: 'enabled',
195+
verifyTLSCertificate: 'enabled',
196+
useTLSAuthClients: 'enabled',
197+
useSNI: 'enabled',
198+
useSSH: 'disabled',
199+
version: mockRedisGeneralInfo.version,
200+
numberOfKeys: undefined,
201+
numberOfKeysRange: undefined,
202+
totalMemory: undefined,
203+
numberedDatabases: undefined,
204+
numberOfModules: 2,
205+
timeout: mockDatabaseWithTlsAuth.timeout / 1_000, // milliseconds to seconds
206+
databaseIndex: 2,
166207
...DEFAULT_REDIS_MODULES_SUMMARY,
167208
RediSearch: {
168209
loaded: true,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export class DatabaseAnalytics extends TelemetryBaseService {
6666
numberedDatabases: additionalInfo.databases,
6767
numberOfModules: instance.modules?.length || 0,
6868
timeout: instance.timeout / 1_000, // milliseconds to seconds
69+
databaseIndex: instance.db || 0,
6970
...modulesSummary,
7071
},
7172
);

0 commit comments

Comments
 (0)