Prep Grafana

Author: skadefro

OpenFlow/.gitignore

@@ -1,4 +1,5 @@
 package-lock.json
 node_modules
 logs
-dist
+dist
+*grafana-proxy*

OpenFlow/src/Crypt.ts

@@ -66,15 +66,16 @@ export class Crypt {
         });
     }
     static createToken(item: User | TokenUser, expiresIn: string): string {
-        var user: TokenUser = new TokenUser();
+        const user: TokenUser = new TokenUser();
         user._type = (item as User)._type;
         user._id = item._id;
         user.impostor = (item as TokenUser).impostor;
         user.name = item.name;
         user.username = item.username;
         user.roles = item.roles;
 
-        var token: string = jsonwebtoken.sign({ data: user }, Crypt.encryption_key,
+        const key = Crypt.encryption_key;
+        const token: string = jsonwebtoken.sign({ data: user }, key,
             { expiresIn: expiresIn }); // 60 (seconds), "2 days", "10h", "7d"
         return token;
     }

OpenFlow/src/LoginProvider.ts

@@ -418,7 +418,8 @@ export class LoginProvider {
     }
     static async RegisterProviders(app: express.Express, baseurl: string) {
         if (LoginProvider.login_providers.length === 0) {
-            LoginProvider.login_providers = await Config.db.query<Provider>({ _type: "provider" }, null, 10, 0, null, "config", Crypt.rootToken());
+            const _jwt = Crypt.rootToken();
+            LoginProvider.login_providers = await Config.db.query<Provider>({ _type: "provider" }, null, 10, 0, null, "config", _jwt);
         }
         var hasLocal: boolean = false;
         if (LoginProvider.login_providers.length === 0) { hasLocal = true; }

OpenFlow/src/WebServer.ts

@@ -19,7 +19,7 @@ import { Config } from "./Config";
 
 export class WebServer {
     private static _logger: winston.Logger;
-    private static app: express.Express;
+    public static app: express.Express;
 
     static async configure(logger: winston.Logger, baseurl: string): Promise<http.Server> {
         this._logger = logger;

OpenFlow/src/index.ts

@@ -82,7 +82,6 @@ async function initamqp() {
 // }
 
 
-initamqp();
 async function initDatabase(): Promise<boolean> {
     try {
         var jwt: string = Crypt.rootToken();
@@ -239,14 +238,25 @@ rejectionEmitter.on("rejectionHandled", (error, promise) => {
     console.dir(error.stack);
 });
 import * as fs from "fs";
+// import { GrafanaProxy } from "./grafana-proxy";
+var GrafanaProxy: any = null;
+try {
+    GrafanaProxy = require("./grafana-proxy");
+} catch (error) {
+
+}
 
 (async function (): Promise<void> {
     try {
+        await initamqp();
         // var wait = ms => new Promise((r, j) => setTimeout(r, ms));
         // await wait(2000);
         // await Config.get_login_providers();
         logger.info("VERSION: " + Config.version);
         const server: http.Server = await WebServer.configure(logger, Config.baseurl());
+        if (GrafanaProxy != null) {
+            const grafana = await GrafanaProxy.GrafanaProxy.configure(logger, WebServer.app);
+        }
         WebSocketServer.configure(logger, server);
         logger.info("listening on " + Config.baseurl());
         logger.info("namespace: " + Config.namespace);
@@ -255,6 +265,7 @@ import * as fs from "fs";
         }
     } catch (error) {
         // logger.error(error.message);
+        console.error(error);
         var json = JSON.stringify(error, null, 3);
         console.error(json);