Bladeren bron

Merge branch 'hotfix-csvname' of oscarleiva/energylink into development

Merge con branch 'hotfix-csvname' closes #14
Oscar Alfredo Leiva Salomón 6 jaren geleden
bovenliggende
commit
5762d142e2
2 gewijzigde bestanden met toevoegingen van 34 en 1 verwijderingen
  1. 33 0
      docker-compose.yml
  2. 1 1
      public/app/core/utils/file_export.ts

+ 33 - 0
docker-compose.yml

@@ -0,0 +1,33 @@
+version: '3'
+
+services:
+    energylink:
+        container_name: energylink
+        build: .
+        ports: 
+            - '3030:3000'
+        environment:
+            - GF_SMTP_ENABLED=true
+            - GF_SMTP_FROM_NAME=EnergyLink
+            - GF_SMTP_HOST=smtp-relay.sendinblue.com:587
+            - GF_SMTP_PASSWORD=xsmtpsib-dbc182c1e11344bbccdfefd60c64e8ab030c33dbe27a2caa5c19530d72468198-DR1afTZL4X5vOxcE 
+            - GF_SMTP_USER=oscar.leiva@mercadoselectricos.com.sv
+            - GF_SMTP_FROM_ADDRESS=no-reply@grupomerelec.com
+            - GF_EMAILS_WELCOME_EMAIL_ON_SIGN_UP=true
+            - GF_DATABASE_TYPE=postgres
+            - GF_DATABASE_NAME=DEV_ENERGY_LINK
+            - GF_DATABASE_HOST=192.168.100.5:5432
+            - GF_DATABASE_PASSWORD=MI019Mercados
+            - GF_DATABASE_USER=postgres
+            - GF_AUTH_ANONYMOUS_ENABLED=false
+            - GF_AUTH_ANONYMOUS_ORG_NAME=Public Link
+            - GF_AUTH_ANONYMOUS_ORG_ROLE=Viewer
+            - GF_SERVER_ENABLE_GZIP=true
+            - GF_SERVER_ROOT_URL=https://192.168.98.10:3000
+            - GF_USERS_ALLOW_SING_UP=false
+            - GF_PANELS_DISABLE_SANITIZE_HTML=true
+            - GF_EXPLORE_ENABLED=false
+            - GF_SECURITY_DISABLE_GRAVATAR=true
+        restart: unless-stopped
+
+

+ 1 - 1
public/app/core/utils/file_export.ts

@@ -10,7 +10,7 @@ const POINT_VALUE_INDEX = 0;
 const END_COLUMN = ';';
 const END_COLUMN = ';';
 const END_ROW = '\r\n';
 const END_ROW = '\r\n';
 const QUOTE = '"';
 const QUOTE = '"';
-const EXPORT_FILENAME = 'grafana_data_export.csv';
+const EXPORT_FILENAME = 'energylink_data_export.csv';
 
 
 interface SeriesListToCsvColumnsOptions {
 interface SeriesListToCsvColumnsOptions {
   dateTimeFormat: string;
   dateTimeFormat: string;