Use cluster_uuid as localStorage key.

sw-jung · Aug 25, 2017 · 4edff41 · 4edff41
1 parent 9c16578
commit 4edff41
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -1,6 +1,7 @@
 import { readdirSync, lstatSync } from 'fs';
 import { resolve } from 'path';
 import { init } from './server/init';
+import { replaceInjectedVars } from './server/lib/replace_injected_vars';
 
 export default function (kibana) {
   const translations = (function getTranslations(translationsPath) {
@@ -24,7 +25,9 @@ export default function (kibana) {
 
       chromeNavControls: [
         'plugins/notification_center/nav_control'
-      ]
+      ],
+
+      replaceInjectedVars
 
     },
 

diff --git a/public/components/notification_center/index.js b/public/components/notification_center/index.js
@@ -14,9 +14,9 @@ const module = uiModules.get('notification_center', []);
 
 module.run(pollingNotifications);
 
-module.service('NotificationCenter', () => {
-  const notifications = new StoredNotifications().load();
-  const config = new StoredConfig({
+module.service('NotificationCenter', (clusterUuid) => {
+  const notifications = new StoredNotifications(clusterUuid).load();
+  const config = new StoredConfig(clusterUuid, {
     pollingInterval: 10000,
     lastPulledAt: Date.now()
   }).load().save();

diff --git a/public/components/notification_center/lib/stored_config.js b/public/components/notification_center/lib/stored_config.js
@@ -1,8 +1,8 @@
 import { has, get, set, isObject } from 'lodash';
 
 export class StoredConfig {
-  constructor(defaultConfig = {}, key = 'KBN::NOTIFS::CONFIG') {
-    this.key = key;
+  constructor(key, defaultConfig = {}) {
+    this.key = `KBN::NOTIFS::CONFIG-${key}`;
     this.config = defaultConfig;
   };
 

diff --git a/public/components/notification_center/lib/stored_notifications.js b/public/components/notification_center/lib/stored_notifications.js
@@ -2,9 +2,9 @@ import { find, isArray, remove, chain, pick, defaults, union } from 'lodash';
 
 const NOT_INSERTABLE_ERROR = new Error('StoredNotifications cannot insert directly. Please use `StoredNotifications.merge`.');
 export class StoredNotifications extends Array {
-  constructor(key = 'KBN::NOTIFS') {
+  constructor(key) {
     super();
-    this.key = key;
+    this.key = `KBN::NOTIFS-${key}`;
 
     this.push = (...items) => {
       throw NOT_INSERTABLE_ERROR;

diff --git a/server/lib/replace_injected_vars.js b/server/lib/replace_injected_vars.js
@@ -0,0 +1,10 @@
+import { extend } from 'lodash';
+
+export async function replaceInjectedVars(originalInjectedVars, request, server) {
+  const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
+  return callWithRequest(request, 'info')
+  .then(resp => extend(originalInjectedVars, {
+    clusterUuid: resp.cluster_uuid
+  }));
+};
+