Finish up, ref #453

dbrepo-dashboard-service/Dockerfile

-FROM docker.io/grafana/grafana-oss:11.2.2 AS runtime
+FROM docker.io/bitnami/grafana:10.4.9-debian-12-r0 AS runtime
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 WORKDIR /app

dbrepo-dashboard-service/grafana.ini

 [server]
+protocol = http
+domain = localhost
+root_url = http://%(domain)s/dashboard/
 http_port = 3000
 
 [security]

dbrepo-gateway-service/dbrepo.conf

@@ -48,6 +48,26 @@ server {
     listen 80 default_server;
     server_name _;
 
+    location /dashboard/ {
+        rewrite  ^/dashboard/(.*)  /$1 break;
+        proxy_set_header           Host $host;
+        proxy_set_header           X-Real-IP $remote_addr;
+        proxy_set_header           X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header           X-Forwarded-Proto $scheme;
+        proxy_pass                 http://dashboard-service;
+        proxy_read_timeout         90;
+    }
+
+    # Proxy Grafana Live WebSocket connections.
+    location /dashboard/api/live/ {
+        rewrite  ^/dashboard/(.*)  /$1 break;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Host $host;
+        proxy_pass http://dashboard-service;
+    }
+
     location /api/search {
         proxy_set_header        Host $host;
         proxy_set_header        X-Real-IP $remote_addr;

dbrepo-ui/components/table/TableImport.vue

@@ -83,39 +83,6 @@
               </v-select>
             </v-col>
           </v-row>
-          <v-row dense>
-            <v-col md="8">
-              <v-text-field
-                v-model="tableImport.null_element"
-                clearable
-                persistent-hint
-                :variant="inputVariant"
-                :hint="$t('pages.table.subpages.import.null.hint')"
-                :label="$t('pages.table.subpages.import.null.label')"/>
-            </v-col>
-          </v-row>
-          <v-row dense>
-            <v-col md="8">
-              <v-text-field
-                v-model="tableImport.true_element"
-                clearable
-                persistent-hint
-                :variant="inputVariant"
-                :hint="$t('pages.table.subpages.import.true.hint')"
-                :label="$t('pages.table.subpages.import.true.label')"/>
-            </v-col>
-          </v-row>
-          <v-row dense>
-            <v-col md="8">
-              <v-text-field
-                v-model="tableImport.false_element"
-                clearable
-                persistent-hint
-                :variant="inputVariant"
-                :hint="$t('pages.table.subpages.import.false.hint')"
-                :label="$t('pages.table.subpages.import.false.label')"/>
-            </v-col>
-          </v-row>
         </v-container>
       </v-form>
     </v-stepper-window>
@@ -356,9 +323,6 @@ export default {
     this.cacheStore.setUploadProgress(null)
     this.setQueryParamSafely('location')
     this.setQueryParamSafely('quote')
-    this.setQueryParamSafely('false_element')
-    this.setQueryParamSafely('true_element')
-    this.setQueryParamSafely('null_element')
     this.setQueryParamSafely('separator')
     this.setQueryParamSafely('line_termination')
     this.setQueryParamSafely('skip_lines')
@@ -541,9 +505,6 @@ export default {
             separator: this.tableImport.separator,
             skip_lines: this.tableImport.skip_lines,
             quote: this.tableImport.quote,
-            null_element: this.tableImport.null_element,
-            true_element: this.tableImport.true_element,
-            false_element: this.tableImport.false_element
           })
           this.loading = false
         })

dbrepo-ui/dto/index.ts

@@ -532,9 +532,6 @@ interface ImportCsv {
   separator: string;
   quote: string;
   skip_lines: number;
-  false_element: string;
-  true_element: string;
-  null_element: string;
   line_termination: string;
 }
 
@@ -656,9 +653,6 @@ interface ImportDto {
   separator: string;
   quote: string;
   skip_lines: number;
-  false_element: string;
-  true_element: string;
-  null_element: string;
   line_termination: string;
 }
 

dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue

@@ -241,9 +241,6 @@ export default {
       tableImport: {
         location: null,
         quote: '"',
-        false_element: null,
-        true_element: null,
-        null_element: '',
         separator: ',',
         line_termination: null,
         skip_lines: 1
@@ -364,9 +361,6 @@ export default {
       this.tableImport.separator = separator
       this.tableImport.skip_lines = skip_lines
       this.tableImport.quote = quote
-      this.tableImport.null_element = null_element
-      this.tableImport.true_element = true_element
-      this.tableImport.false_element = false_element
       if (filename) {
         this.step = 4
       }

docker-compose.yml

@@ -458,17 +458,12 @@ services:
       network: host
     volumes:
       - dashboard-service-data:/opt/bitnami/grafana/data
-    ports:
-      - "3000:3000"
     environment:
-      GF_SERVER_DOMAIN: "dashboard-service"
-      GF_SERVER_ROOT_URL: "${BASE_URL:-http://localhost}"
-      GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION: "true"
       LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
       LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
       LDAP_ROOT: "${IDENTITY_SERVICE_ROOT:-dc=dbrepo,dc=at}"
     healthcheck:
-      test: test -f /var/lib/grafana/grafana.db
+      test: test -f /opt/bitnami/grafana/tmp/grafana.pid
       interval: 10s
       timeout: 5s
       retries: 12