Dev

docker-compose.yml

@@ -344,6 +344,8 @@ services:
         condition: service_healthy
       dbrepo-broker-service:
         condition: service_healthy
+      dbrepo-dashboard-service:
+        condition: service_healthy
       dbrepo-metadata-service:
         condition: service_healthy
       dbrepo-search-db:
@@ -353,22 +355,6 @@ services:
     logging:
       driver: json-file
 
-  # service not part of dbrepo system (but for developing)
-  dbrepo-search-db-dashboard:
-    restart: "no"
-    container_name: dbrepo-search-db-dashboard
-    hostname: search-db-dashboard
-    image: docker.io/opensearchproject/opensearch-dashboards:2.10.0
-    ports:
-      - "5601:5601"
-    volumes:
-      - ./dbrepo-search-db/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml
-    depends_on:
-      dbrepo-search-db:
-        condition: service_healthy
-    logging:
-      driver: json-file
-
   dbrepo-identity-service:
     restart: "no"
     container_name: dbrepo-identity-service
@@ -420,12 +406,13 @@ services:
     container_name: dbrepo-storage-service
     hostname: storage-service
     image: docker.io/chrislusf/seaweedfs:3.59
-    command: [ "server", "-dir=/data", "-s3", "-s3.port=9000", "-s3.config=/app/s3_config.json", "-metricsPort=9091" ]
+    command: [ "server", "-dir=/data", "-s3", "-s3.port=9000", "-s3.config=/app/s3_config.json", "-metricsPort=9090" ]
     volumes:
       - ./dbrepo-storage-service/s3_config.json:/app/s3_config.json
       - storage-service-data:/data
     ports:
       - "9000:9000"
+      - "8888:8888"
     healthcheck:
       test: echo "cluster.check" | weed shell | grep "checking master.*ok" || exit 1
       interval: 10s
@@ -434,6 +421,49 @@ services:
     logging:
       driver: json-file
 
+  dbrepo-metric-db:
+    restart: "no"
+    container_name: dbrepo-metric-db
+    hostname: metric-db
+    image: bitnami/prometheus:2.54.1-debian-12-r4
+    volumes:
+      - ./dbrepo-metric-db/prometheus.yml:/etc/prometheus/prometheus.yml
+    healthcheck:
+      test: promtool check healthy
+      interval: 10s
+      timeout: 5s
+      retries: 12
+    logging:
+      driver: json-file
+
+  dbrepo-dashboard-service:
+    restart: "no"
+    container_name: dbrepo-dashboard-service
+    hostname: dashboard-service
+    image: docker.io/bitnami/grafana:11.2.0-debian-12-r4
+    volumes:
+      - ./dbrepo-dashboard-service/dashboards:/app/dashboards
+      - ./dbrepo-dashboard-service/provisioning:/etc/grafana/provisioning
+      - ./dbrepo-dashboard-service/grafana.ini:/etc/grafana/grafana.ini
+      - ./dbrepo-dashboard-service/ldap.toml:/etc/grafana/ldap.toml
+    environment:
+      GF_SERVER_DOMAIN: "dashboard-service"
+      GF_SERVER_ROOT_URL: "${BASE_URL:-http://localhost}/dashboard/"
+      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 /opt/bitnami/grafana/tmp/grafana.pid
+      interval: 10s
+      timeout: 5s
+      retries: 12
+    depends_on:
+      dbrepo-metric-db:
+        condition: service_started
+    logging:
+      driver: json-file
+
   dbrepo-storage-service-init:
     restart: "no"
     container_name: dbrepo-storage-service-init

helm/dbrepo-mariadb-galera/templates/_names.tpl

+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts.
+*/}}
+{{- define "common.names.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
\ No newline at end of file

helm/dbrepo-mariadb-galera/values.schema.json

@@ -277,9 +277,6 @@
             },
             "type": "object"
         },
-        "namespace": {
-            "type": "string"
-        },
         "s3": {
             "properties": {
                 "auth": {

helm/dbrepo-mariadb-galera/values.yaml

 # Copyright the DBRepo developers
 # SPDX-License-Identifier: APACHE-2.0
 
-## @param namespace The namespace to install the chart
-namespace: dbrepo
+## @param namespaceOverride The namespace to install the chart
 
 s3:
   endpoint: http://storage-service-s3:8333

helm/dbrepo/Chart.lock

@@ -23,5 +23,11 @@ dependencies:
 - name: openldap-stack-ha
   repository: https://jp-gouin.github.io/helm-openldap/
   version: 4.2.5
-digest: sha256:b25413b979bd026412ed188968db993c958bc71175b379315d5e24d373f8065f
-generated: "2024-09-14T01:52:39.203839653+04:00"
+- name: grafana
+  repository: https://charts.bitnami.com/bitnami
+  version: 11.3.20
+- name: prometheus
+  repository: https://charts.bitnami.com/bitnami
+  version: 1.3.22
+digest: sha256:8f67589f08da255fba018e5a8eec1c0ae736a5ee775d958eee9b45a5bda57f0a
+generated: "2024-09-27T09:21:08.969905261+02:00"

helm/dbrepo/Chart.yaml

@@ -56,3 +56,13 @@ dependencies:
     version: 4.2.5
     repository: https://jp-gouin.github.io/helm-openldap/
     condition: identityservice.enabled
+  - name: grafana
+    alias: dashboardservice
+    version: 11.3.20
+    repository: https://charts.bitnami.com/bitnami
+    condition: dashboardservice.enabled
+  - name: prometheus
+    alias: metricdb
+    version: 1.3.22
+    repository: https://charts.bitnami.com/bitnami
+    condition: metricdb.enabled
\ No newline at end of file

helm/dbrepo/templates/_names.tpl

+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts.
+*/}}
+{{- define "common.names.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
\ No newline at end of file

helm/dbrepo/templates/analyse-deployment.yaml

@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: analyse-service
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     app: analyse-service
     service: analyse-service
@@ -45,15 +45,15 @@ spec:
                 - -ec
                 - "curl -sSL localhost:8080/health | grep 'UP' || exit 1"
             initialDelaySeconds: 120
-            periodSeconds: 30
+            periodSeconds: 10
           readinessProbe:
             exec:
               command:
                 - /bin/bash
                 - -ec
                 - "curl -sSL localhost:8080/health | grep 'UP' || exit 1"
-            initialDelaySeconds: 10
-            periodSeconds: 30
+            initialDelaySeconds: 30
+            periodSeconds: 10
           {{- if .Values.analyseservice.resources }}
           resources: {{- toYaml .Values.analyseservice.resources | nindent 12 }}
           {{- end }}

helm/dbrepo/templates/analyse-secret.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: analyse-service-secret
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 stringData:
   ADMIN_USERNAME: "{{ .Values.identityservice.users }}"
   ADMIN_PASSWORD: "{{ .Values.identityservice.userPasswords }}"

helm/dbrepo/templates/analyse-service.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: analyse-service
-  namespace: {{ $.Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     service: analyse-service
 spec:

helm/dbrepo/templates/auth-configmap.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: auth-service-config
-  namespace: {{ $.Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 data:
   KC_HOSTNAME_PATH: "/api/auth"
   KC_HOSTNAME_ADMIN_URL: "{{ .Values.gateway }}/api/auth"
@@ -2287,20 +2287,20 @@ data:
             "fullSyncPeriod" : [ "-1" ],
             "pagination" : [ "false" ],
             "startTls" : [ "false" ],
-            "usersDn" : [ "ou=users,dc=dbrepo,dc=at" ],
+            "usersDn" : [ "ou=users,{{ .Values.identityservice.global.ldapDomain }}" ],
             "connectionPooling" : [ "true" ],
             "cachePolicy" : [ "DEFAULT" ],
             "useKerberosForPasswordAuthentication" : [ "false" ],
             "importEnabled" : [ "true" ],
             "enabled" : [ "true" ],
-            "bindDn" : [ "cn=admin,dc=dbrepo,dc=at" ],
-            "bindCredential" : [ "admin" ],
+            "bindDn" : [ "cn={{ .Values.identityservice.global.adminUser }},{{ .Values.identityservice.global.ldapDomain }}" ],
+            "bindCredential" : [ "{{ .Values.identityservice.global.adminPassword }}" ],
             "usernameLDAPAttribute" : [ "uid" ],
             "changedSyncPeriod" : [ "-1" ],
             "lastSync" : [ "1719252666" ],
             "vendor" : [ "other" ],
             "uuidLDAPAttribute" : [ "entryUUID" ],
-            "connectionUrl" : [ "ldap://identity-service:1389" ],
+            "connectionUrl" : [ "ldap://identity-service:389" ],
             "allowKerberosAuthentication" : [ "false" ],
             "syncRegistrations" : [ "true" ],
             "authType" : [ "simple" ],

helm/dbrepo/templates/broker-secret.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: broker-service-secret
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 stringData:
   advanced.config: |
     [

helm/dbrepo/templates/dashboard-configmap.yaml

+{{- if .Values.dashboardservice.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: dashboard-service-config
+  namespace: {{ include "common.names.namespace" . | quote }}
+data:
+  {{ (.Files.Glob "files/system.json").AsConfig | nindent 2 }}
+  {{ (.Files.Glob "files/rabbitmq.json").AsConfig | nindent 2 }}
+  {{ (.Files.Glob "files/mariadb.json").AsConfig | nindent 2 }}
+{{- end }}
\ No newline at end of file

helm/dbrepo/templates/dashboard-secret.yaml

+{{- if .Values.dashboardservice.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: dashboard-service-secret
+  namespace: {{ include "common.names.namespace" . | quote }}
+stringData:
+  GF_SERVER_DOMAIN: "dashboard-service"
+  GF_SERVER_ROOT_URL: "http://dashboard-service:3000/dashboard/"
+  GF_SERVER_SERVE_FROM_SUB_PATH: "true"
+  GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION: "true"
+  LDAP_ADMIN_USERNAME: "{{ .Values.identityservice.global.adminUser }}"
+  LDAP_ADMIN_PASSWORD: "{{ .Values.identityservice.global.adminPassword }}"
+  LDAP_ROOT: "{{ .Values.identityservice.global.ldapDomain }}"
+  ldap.toml: |
+    [[servers]]
+    host = "identity-service"
+    port = 389
+    use_ssl = false
+
+    # Search user bind dn
+    bind_dn = "cn=${LDAP_ADMIN_USERNAME},${LDAP_ROOT}"
+    bind_password = "${LDAP_ADMIN_PASSWORD}"
+
+    # Timeout in seconds. Applies to each host specified in the 'host' entry (space separated).
+    timeout = 10
+
+    # User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"
+    # Allow login from email or username, example "(|(sAMAccountName=%s)(userPrincipalName=%s))"
+    search_filter = "(cn=%s)"
+
+    # An array of base dns to search through
+    search_base_dns = ["${LDAP_ROOT}"]
+
+    group_search_base_dns = ["ou=users,${LDAP_ROOT}"]
+    group_search_filter = "(&(objectClass=groupOfNames)(member=cn=%s,ou=users,${LDAP_ROOT}))"
+    group_search_filter_user_attribute = "uid"
+
+    [servers.attributes]
+    name = "givenName"
+    surname = "sn"
+    username = "cn"
+    member_of = "member"
+    email =  "email"
+
+    [[servers.group_mappings]]
+    group_dn = "cn=${LDAP_ADMIN_USERNAME},ou=users,${LDAP_ROOT}"
+    org_role = "Admin"
+    grafana_admin = true
+
+    [[servers.group_mappings]]
+    group_dn = "*"
+    org_role = "Viewer"
+{{- end }}