Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tall-timers-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes workspace statistics deployment data not updating on server version changes.
55 changes: 55 additions & 0 deletions apps/meteor/app/statistics/server/lib/statistics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import { getImporterStatistics } from './getImporterStatistics';
import { getServicesStatistics } from './getServicesStatistics';
import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred';
import { isRunningMs } from '../../../../server/lib/isRunningMs';
import { SystemLogger } from '../../../../server/lib/logger/system';
import { getControl } from '../../../../server/lib/migrations';
import { getSettingsStatistics } from '../../../../server/lib/statistics/getSettingsStatistics';
import { getMatrixFederationStatistics } from '../../../../server/services/federation/infrastructure/rocket-chat/adapters/Statistics';
Expand Down Expand Up @@ -599,4 +600,58 @@ export const statistics = {

return rcStatistics;
},
async updateDeploymentData(): Promise<void> {
try {
const lastStatistics = await Statistics.findLast();

if (!lastStatistics) {
return;
}

const { mongoVersion, mongoStorageEngine } = await getMongoInfo();

const deploymentInfo: Partial<IStats> = {
os: {
type: os.type(),
platform: os.platform(),
arch: os.arch(),
release: os.release(),
uptime: os.uptime(),
loadavg: os.loadavg(),
totalmem: os.totalmem(),
freemem: os.freemem(),
cpus: os.cpus(),
},
process: {
nodeVersion: process.version,
pid: process.pid,
uptime: process.uptime(),
},
deploy: {
method: process.env.DEPLOY_METHOD || 'tar',
platform: process.env.DEPLOY_PLATFORM || 'selfinstall',
},
msEnabled: isRunningMs(),
mongoVersion,
mongoStorageEngine: mongoStorageEngine || '',
migration: await getControl(),
};

if (Info) {
deploymentInfo.version = Info.version;
}

const { _id, ...baseStatistics } = lastStatistics;

const newStatistics: Omit<IStats, '_id'> = {
...baseStatistics,
...deploymentInfo,
createdAt: new Date(),
};

await Statistics.insertOne(newStatistics);
} catch (error) {
SystemLogger.error({ msg: 'Error saving statistics with new deployment data', err: error });
}
},
};
2 changes: 2 additions & 0 deletions apps/meteor/server/startup/migrations/xrun.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { UpdateResult } from 'mongodb';

import { upsertPermissions } from '../../../app/authorization/server/functions/upsertPermissions';
import { settings } from '../../../app/settings/server';
import { statistics } from '../../../app/statistics/server/lib/statistics';
import { migrateDatabase, onServerVersionChange } from '../../lib/migrations';
import { ensureCloudWorkspaceRegistered } from '../cloudRegistration';

Expand Down Expand Up @@ -62,5 +63,6 @@ export const performMigrationProcedure = async (): Promise<void> => {
await upsertPermissions();
await ensureCloudWorkspaceRegistered();
await moveRetentionSetting();
await statistics.updateDeploymentData();
});
};
Loading