From 251eb63ec198564fdd79833f420ca64a4d44b47f Mon Sep 17 00:00:00 2001 From: John Wu <76966357+jwu-fisker@users.noreply.github.com> Date: Tue, 9 Nov 2021 11:23:10 -0800 Subject: [PATCH] CEC-607 Parameterize Grafana (#103) * CEC-607 Parameterize Grafana * Update urls --- .env.dev | 10 ++++ .env.local | 10 ++++ .env.prd | 10 ++++ .env.stg | 10 ++++ .env.template | 7 ++- Dockerfile | 2 +- .../App/__snapshots__/App.test.js.snap | 44 +++++++------- src/components/Datascope/Battery/index.jsx | 15 ++--- src/components/Datascope/Home/index.jsx | 5 +- src/components/Layouts/SideMenu.jsx | 12 ++-- .../__snapshots__/SideMenu.test.jsx.snap | 2 +- src/services/grafanaAPI.js | 36 +++++++---- src/services/grafanaCharts.js | 50 ++++++++++++++++ src/services/grafanaCharts.test.js | 59 +++++++++++++++++++ 14 files changed, 219 insertions(+), 53 deletions(-) create mode 100644 src/services/grafanaCharts.js create mode 100644 src/services/grafanaCharts.test.js diff --git a/.env.dev b/.env.dev index 0c3250f..6a3aade 100644 --- a/.env.dev +++ b/.env.dev @@ -1,3 +1,13 @@ REACT_APP_AUTH_SERVICE_URL=https://gw-dev.fiskerdps.com/compute_auth REACT_APP_UPLOAD_SERVICE_URL=https://gw-dev.fiskerdps.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://dev-ota-admin.fiskerdps.com +REACT_APP_GRAFANA_BASE_URL=https://dev-grafana.fiskerdps.com +REACT_APP_GRAFANA_HOME_CHART_PATH=/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12 +REACT_APP_GRAFANA_VOLTAGE_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellVolt${cellNum}&panelId=2 +REACT_APP_GRAFANA_CELLTEMP_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellT${cellNum}&panelId=2 +REACT_APP_GRAFANA_BATTERYTEMP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=4 +REACT_APP_GRAFANA_BATTERYCAP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=6 +REACT_APP_GRAFANA_BATTERYPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&panelId=12 +REACT_APP_GRAFANA_BATTERY12VPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=2 +REACT_APP_GRAFANA_BATTERY12VVOLTAGE_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=9 +REACT_APP_GRAFANA_API=https://dev-grafana.fiskerdps.com/api/datasources/proxy/2 diff --git a/.env.local b/.env.local index 6760ebe..af4cb29 100644 --- a/.env.local +++ b/.env.local @@ -1,3 +1,13 @@ REACT_APP_AUTH_SERVICE_URL=http://localhost/compute_auth REACT_APP_UPLOAD_SERVICE_URL=http://localhost/ota_update REACT_APP_AUTH_CALLBACK_URL=http://localhost:3000 +REACT_APP_GRAFANA_BASE_URL=https://dev-grafana.fiskerdps.com +REACT_APP_GRAFANA_HOME_CHART_PATH=/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12 +REACT_APP_GRAFANA_VOLTAGE_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellVolt${cellNum}&panelId=2 +REACT_APP_GRAFANA_CELLTEMP_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellT${cellNum}&panelId=2 +REACT_APP_GRAFANA_BATTERYTEMP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=4 +REACT_APP_GRAFANA_BATTERYCAP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=6 +REACT_APP_GRAFANA_BATTERYPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&panelId=12 +REACT_APP_GRAFANA_BATTERY12VPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=2 +REACT_APP_GRAFANA_BATTERY12VVOLTAGE_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=9 +REACT_APP_GRAFANA_API=https://dev-grafana.fiskerdps.com/api/datasources/proxy/2 diff --git a/.env.prd b/.env.prd index 9ec77df..e4ef37d 100644 --- a/.env.prd +++ b/.env.prd @@ -1,3 +1,13 @@ REACT_APP_AUTH_SERVICE_URL=https://gw.fiskerdps.com/compute_auth REACT_APP_UPLOAD_SERVICE_URL=https://gw.fiskerdps.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://ota-admin.fiskerdps.com +REACT_APP_GRAFANA_BASE_URL=https://grafana.fiskerdps.com +REACT_APP_GRAFANA_HOME_CHART_PATH=/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12 +REACT_APP_GRAFANA_VOLTAGE_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellVolt${cellNum}&panelId=2 +REACT_APP_GRAFANA_CELLTEMP_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellT${cellNum}&panelId=2 +REACT_APP_GRAFANA_BATTERYTEMP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=4 +REACT_APP_GRAFANA_BATTERYCAP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=6 +REACT_APP_GRAFANA_BATTERYPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&panelId=12 +REACT_APP_GRAFANA_BATTERY12VPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=2 +REACT_APP_GRAFANA_BATTERY12VVOLTAGE_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=9 +REACT_APP_GRAFANA_API=https://grafana.fiskerdps.com/api/datasources/proxy/1 diff --git a/.env.stg b/.env.stg index f400e02..c944ca0 100644 --- a/.env.stg +++ b/.env.stg @@ -1,3 +1,13 @@ REACT_APP_AUTH_SERVICE_URL=https://gw-stg.fiskerdps.com/compute_auth REACT_APP_UPLOAD_SERVICE_URL=https://gw-stg.fiskerdps.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://stg-ota-admin.fiskerdps.com +REACT_APP_GRAFANA_BASE_URL=https://stg-grafana.fiskerdps.com +REACT_APP_GRAFANA_HOME_CHART_PATH=/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12 +REACT_APP_GRAFANA_VOLTAGE_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellVolt${cellNum}&panelId=2 +REACT_APP_GRAFANA_CELLTEMP_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellT${cellNum}&panelId=2 +REACT_APP_GRAFANA_BATTERYTEMP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=4 +REACT_APP_GRAFANA_BATTERYCAP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=6 +REACT_APP_GRAFANA_BATTERYPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&panelId=12 +REACT_APP_GRAFANA_BATTERY12VPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=2 +REACT_APP_GRAFANA_BATTERY12VVOLTAGE_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=9 +REACT_APP_GRAFANA_API=https://stg-grafana.fiskerdps.com/api/datasources/proxy/1 diff --git a/.env.template b/.env.template index e3ba686..b024aa7 100644 --- a/.env.template +++ b/.env.template @@ -1,3 +1,4 @@ -REACT_APP_AUTH_SERVICE_URL = http://localhost/compute_auth -REACT_APP_UPLOAD_SERVICE_URL = http://localhost/ota_update -REACT_APP_AUTH_CALLBACK_URL = http://localhost:3000 \ No newline at end of file +REACT_APP_AUTH_SERVICE_URL=http://localhost/compute_auth +REACT_APP_UPLOAD_SERVICE_URL=http://localhost/ota_update +REACT_APP_AUTH_CALLBACK_URL=http://localhost:3000 +REACT_APP_GRAFANA_API=https://grafana.fiskerdps.com/api/datasources/proxy/2 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 36a2580..b03d55f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:14-alpine as builder -ARG ENVIRONMENT +ARG ENVIRONMENT=local COPY package*.json ./ RUN npm install diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap index 7f14267..d4edb4d 100644 --- a/src/components/App/__snapshots__/App.test.js.snap +++ b/src/components/App/__snapshots__/App.test.js.snap @@ -240,7 +240,7 @@ exports[`App Route / authenticated 1`] = `