From f5be86e1d2f4d41ec4ea3bd8fab17b7ac7c73c50 Mon Sep 17 00:00:00 2001
From: Rares Mardare <rares.mardare@grafana.com>
Date: Fri, 16 Dec 2022 19:49:30 +0200
Subject: [PATCH] a few more tweaks

---
 grafana-plugin/.env.example      |  3 +++
 grafana-plugin/package.json      |  5 -----
 grafana-plugin/src/utils/faro.ts | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 grafana-plugin/.env.example

diff --git a/grafana-plugin/.env.example b/grafana-plugin/.env.example
new file mode 100644
index 00000000..7c145aa5
--- /dev/null
+++ b/grafana-plugin/.env.example
@@ -0,0 +1,3 @@
+FARO_URL=http://localhost:12345/collect
+FARO_API_KEY=secret
+FARO_ENABLED=true
\ No newline at end of file
diff --git a/grafana-plugin/package.json b/grafana-plugin/package.json
index 3bbfb033..b0b9392b 100644
--- a/grafana-plugin/package.json
+++ b/grafana-plugin/package.json
@@ -20,11 +20,6 @@
     "plop": "plop",
     "setversion": "setversion"
   },
-  "faro": {
-    "url": "http://localhost:12345/collect",
-    "apiKey": "secret",
-    "enabled": true
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/grafana/oncall.git"
diff --git a/grafana-plugin/src/utils/faro.ts b/grafana-plugin/src/utils/faro.ts
index f1e98484..93038d03 100644
--- a/grafana-plugin/src/utils/faro.ts
+++ b/grafana-plugin/src/utils/faro.ts
@@ -10,13 +10,24 @@ import plugin from '../../package.json'; // eslint-disable-line
 
 const IGNORE_URLS = [/^((?!\/{0,1}a\/grafana\-oncall\-app\\).)*$/];
 
+interface FaroConfig {
+  url: string;
+  apiKey: string;
+  enabled: boolean;
+}
+
 class FaroHelper {
   faro: Faro;
 
   initializeFaro() {
-    const { faro: faroConfig } = plugin as any;
+    const enabled = process.env['FARO_ENABLED'].toLowerCase();
+    const faroConfig: FaroConfig = {
+      url: process.env['FARO_URL'],
+      apiKey: process.env['FARO_API_KEY'],
+      enabled: enabled === 'true',
+    };
 
-    if (!faroConfig.enabled || this.faro) {
+    if (!faroConfig?.enabled || !faroConfig?.url || !faroConfig?.apiKey || this.faro) {
       return;
     }