Prometheus: Fix notification metric (#10803)

RocketChat · May 17, 2018 · 6d7b726 · 6d7b726
1 parent 5f5914e
commit 6d7b726
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/packages/rocketchat-lib/server/functions/notifications/audio.js b/packages/rocketchat-lib/server/functions/notifications/audio.js
@@ -24,7 +24,7 @@ export function shouldNotifyAudio({
 }
 
 export function notifyAudioUser(userId, message, room) {
-	RocketChat.metrics.notificationsSent.inc({ type: 'audio' }, 1, new Date());
+	RocketChat.metrics.notificationsSent.inc({ notification_type: 'audio' }, 1, new Date());
 	RocketChat.Notifications.notifyUser(userId, 'audioNotification', {
 		payload: {
 			_id: message._id,

diff --git a/packages/rocketchat-lib/server/functions/notifications/desktop.js b/packages/rocketchat-lib/server/functions/notifications/desktop.js
@@ -30,7 +30,7 @@ export function notifyDesktopUser({
 		return;
 	}
 
-	RocketChat.metrics.notificationsSent.inc({ type: 'desktop' }, 1, new Date());
+	RocketChat.metrics.notificationsSent.inc({ notification_type: 'desktop' }, 1, new Date());
 	RocketChat.Notifications.notifyUser(userId, 'notification', {
 		title,
 		text,

diff --git a/packages/rocketchat-lib/server/functions/notifications/email.js b/packages/rocketchat-lib/server/functions/notifications/email.js
@@ -137,7 +137,7 @@ export function sendEmail({ message, user, subscription, room, emailAddress, toA
 	}
 
 	Meteor.defer(() => {
-		RocketChat.metrics.notificationsSent.inc({ type: 'email' }, 1, new Date());
+		RocketChat.metrics.notificationsSent.inc({ notification_type: 'email' }, 1, new Date());
 		Email.send(email);
 	});
 }

diff --git a/packages/rocketchat-lib/server/lib/PushNotification.js b/packages/rocketchat-lib/server/lib/PushNotification.js
@@ -47,7 +47,7 @@ class PushNotification {
 			};
 		}
 
-		RocketChat.metrics.notificationsSent.inc({ type: 'mobile' }, 1, new Date());
+		RocketChat.metrics.notificationsSent.inc({ notification_type: 'mobile' }, 1, new Date());
 		return Push.send(config);
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ export function notifyDesktopUser({ @@
     		return;
     	}
-    	RocketChat.metrics.notificationsSent.inc({ type: 'desktop' }, 1, new Date());
+    	RocketChat.metrics.notificationsSent.inc({ notification_type: 'desktop' }, 1, new Date());
     	RocketChat.Notifications.notifyUser(userId, 'notification', {
     		title,
     		text,
@@ Expand Down @@