diff --git a/.docs/index.md b/.docs/index.md index aea045c43c69da1013fc7884ccaa967ea743a95a..164db61387f48eb916a4af1b2ca3835f146ea1ee 100644 --- a/.docs/index.md +++ b/.docs/index.md @@ -2,8 +2,8 @@ author: Martin Weise --- -[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } -[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } +[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } +[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } [](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } [](https://hub.docker.com/u/dbrepo){ tabindex=-1 } [](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4fe2c739a640b791a8d11019144a6db9df598048..1c14db2098f5d1f0dc946b69323bbe8d79afa49d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -441,6 +441,8 @@ release-docs: - "cp .docs/.swagger/custom.css ./final/${APP_VERSION}/rest/custom.css" # swagger - "cp -r ./site/* ./final/${APP_VERSION}" # mkdocs - "cp .docker/dist.tar.gz ./final/${APP_VERSION}/dist.tar.gz" # dist + - "wget -O ./final/${APP_VERSION}/images/pipeline.svg https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/badges/${CI_COMMIT_BRANCH}/pipeline.svg" + - "wget -O ./final/${APP_VERSION}/images/coverage.svg https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/badges/${CI_COMMIT_BRANCH}/coverage.svg" - eval $(ssh-agent -s) - "mkdir -p /root/.ssh" - echo "$CI_KEY_PRIVATE" > /root/.ssh/id_rsa && chmod 0600 /root/.ssh/id_rsa diff --git a/helm/dbrepo/Chart.lock b/helm/dbrepo/Chart.lock index 842d2c5ef663269a4574172661aba8d98d1b55f8..a7db225a0715d49501237bdba216941faed2d41c 100644 --- a/helm/dbrepo/Chart.lock +++ b/helm/dbrepo/Chart.lock @@ -29,5 +29,5 @@ dependencies: - name: prometheus repository: https://charts.bitnami.com/bitnami version: 1.3.22 -digest: sha256:8f67589f08da255fba018e5a8eec1c0ae736a5ee775d958eee9b45a5bda57f0a -generated: "2024-09-27T09:21:08.969905261+02:00" +digest: sha256:5d2c18d8f42cdade4d83cc8906d8b3f31104fb7bb46a6b682348fceaa09258b5 +generated: "2024-09-28T10:34:39.251599835+02:00" diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md index 53d920f47e1462e5203dc56222b25263bc928f8c..ac8eee7eaf8d51ba5028f227c45a84bc74796683 100644 --- a/helm/dbrepo/README.md +++ b/helm/dbrepo/README.md @@ -54,13 +54,12 @@ The command removes all the Kubernetes components associated with the chart and ### Common parameters -| Name | Description | Value | -| --------------- | ---------------------------------- | --------------------- | -| `namespace` | The namespace to install the chart | `dbrepo` | -| `hostname` | The hostname. | `example.com` | -| `gateway` | The gateway endpoint. | `https://example.com` | -| `strategyType` | The image pull | `RollingUpdate` | -| `clusterDomain` | The cluster domain. | `cluster.local` | +| Name | Description | Value | +| --------------- | --------------------- | --------------------- | +| `hostname` | The hostname. | `example.com` | +| `gateway` | The gateway endpoint. | `https://example.com` | +| `strategyType` | The image pull | `RollingUpdate` | +| `clusterDomain` | The cluster domain. | `cluster.local` | ### Metadata Database @@ -88,7 +87,6 @@ The command removes all the Kubernetes components associated with the chart and | `authservice.jwt.pubkey` | The JWT public key from the `dbrepo-client`. | `MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB` | | `authservice.tls.enabled` | Enable TLS/SSL communication. Required for HTTPS. | `true` | | `authservice.tls.existingSecret` | The secret containing the `tls.crt`, `tls.key` and `ca.crt`. | `ingress-cert` | -| `authservice.metrics.enabled` | Enable the Prometheus metrics export sidecar container. | `false` | | `authservice.client.id` | The client id for the microservices. | `dbrepo-client` | | `authservice.client.secret` | The client secret for the microservices. | `MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG` | @@ -97,7 +95,7 @@ The command removes all the Kubernetes components associated with the chart and | Name | Description | Value | | --------------------------------- | ----------------------------------------------------------- | ------------- | | `datadb.enabled` | Enable the Data Database. | `true` | -| `datadb.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` | +| `datadb.database.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` | | `datadb.auth.rootPassword` | The root user password. | `dbrepo` | | `datadb.auth.replicationUser` | The database replication user password | `replication` | | `datadb.auth.replicationPassword` | The database replication user password | `replication` | @@ -329,6 +327,19 @@ The command removes all the Kubernetes components associated with the chart and | `ui.public.doi.endpoint` | The DOI proxy. | `https://doi.org` | | `ui.replicaCount` | The number of replicas. | `2` | +### Dashboard Service + +| Name | Description | Value | +| --------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ------ | +| `dashboardservice.enabled` | Enable the Dashboard Service. | `true` | +| `dashboardservice.dashboardsProvider.enabled` | Enable the default dashboard provisioning provider to routinely import dashboards from /opt/bitnami/grafana/dashboards | `true` | + +### Metric Service + +| Name | Description | Value | +| ------------------ | -------------------------- | ------ | +| `metricdb.enabled` | Enable the Metric Service. | `true` | + ### Ingress | Name | Description | Value | diff --git a/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz b/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz index 986e13f7c5261495cfd9ea53ace6e263b0e3c2fa..e9b82510c31978ea91ceaea73ae677f3ac0bf206 100644 Binary files a/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz and b/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz differ diff --git a/helm/dbrepo/values.schema.json b/helm/dbrepo/values.schema.json index c988efbfbe6678651fca94cf33dc7b5fae30a3ee..776f8ac99e14833f9a5f9f07aa357d1e938f6e8e 100644 --- a/helm/dbrepo/values.schema.json +++ b/helm/dbrepo/values.schema.json @@ -356,6 +356,14 @@ }, "type": "object" }, + "metrics": { + "properties": { + "enabled": { + "type": "boolean" + } + }, + "type": "object" + }, "persistence": { "properties": { "enabled": { @@ -398,21 +406,87 @@ }, "dashboardservice": { "properties": { + "dashboardsProvider": { + "properties": { + "enabled": { + "type": "boolean" + } + }, + "type": "object" + }, + "datasources": { + "properties": { + "secretDefinition": { + "properties": { + "apiVersion": { + "type": "integer" + }, + "datasources": { + "items": { + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "url": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + } + }, + "type": "object" + } + }, + "type": "object" + }, "enabled": { "type": "boolean" }, - "envFromSecret": { - "type": "string" - }, "fullnameOverride": { "type": "string" }, + "grafana": { + "properties": { + "extraConfigmaps": { + "items": { + "properties": { + "mountPath": { + "type": "string" + }, + "name": { + "type": "string" + }, + "readOnly": { + "type": "boolean" + } + }, + "type": "object" + }, + "type": "array" + }, + "extraEnvVarsSecret": { + "type": "string" + } + }, + "type": "object" + }, "ldap": { "properties": { + "allowSignUp": { + "type": "boolean" + }, "enabled": { "type": "boolean" }, - "existingSecret": { + "secretName": { "type": "string" } }, @@ -437,35 +511,40 @@ }, "type": "object" }, - "enabled": { - "type": "boolean" - }, - "fullnameOverride": { - "type": "string" - }, - "image": { + "database": { "properties": { - "debug": { - "type": "boolean" + "image": { + "properties": { + "debug": { + "type": "boolean" + } + }, + "type": "object" + }, + "metrics": { + "properties": { + "enabled": { + "type": "boolean" + } + }, + "type": "object" + }, + "secondary": { + "properties": { + "replicaCount": { + "type": "integer" + } + }, + "type": "object" } }, "type": "object" }, - "metrics": { - "properties": { - "enabled": { - "type": "boolean" - } - }, - "type": "object" + "enabled": { + "type": "boolean" }, - "secondary": { - "properties": { - "replicaCount": { - "type": "integer" - } - }, - "type": "object" + "fullnameOverride": { + "type": "string" } }, "type": "object" @@ -1114,6 +1193,79 @@ }, "type": "object" }, + "metricdb": { + "properties": { + "alertmanager": { + "properties": { + "service": { + "properties": { + "type": { + "type": "string" + } + }, + "type": "object" + } + }, + "type": "object" + }, + "enabled": { + "type": "boolean" + }, + "fullnameOverride": { + "type": "string" + }, + "server": { + "properties": { + "extraScrapeConfigs": { + "items": { + "properties": { + "job_name": { + "type": "string" + }, + "metrics_path": { + "type": "string" + }, + "static_configs": { + "items": { + "properties": { + "targets": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "type": "object" + }, + "type": "array" + } + }, + "type": "object" + }, + "type": "array" + }, + "persistence": { + "properties": { + "enabled": { + "type": "boolean" + } + }, + "type": "object" + }, + "service": { + "properties": { + "type": { + "type": "string" + } + }, + "type": "object" + } + }, + "type": "object" + } + }, + "type": "object" + }, "searchdb": { "properties": { "clusterName": { @@ -1332,6 +1484,14 @@ "properties": { "enabled": { "type": "boolean" + }, + "metrics": { + "properties": { + "enabled": { + "type": "boolean" + } + }, + "type": "object" } }, "type": "object" diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml index 845465ac169763f9bb9edb2dd75fcf546fd304d0..82d75c66c7ccdac892c8f7a3e68df3af328e295e 100644 --- a/helm/dbrepo/values.yaml +++ b/helm/dbrepo/values.yaml @@ -812,11 +812,13 @@ dashboardservice: grafana: ## @skip dashboardservice.grafana.extraEnvVarsSecret extraEnvVarsSecret: dashboard-service-secret + ## @skip dashboardservice.grafana.extraConfigmaps extraConfigmaps: - name: dashboard-service-config mountPath: /opt/bitnami/grafana/dashboards readOnly: true datasources: + ## @skip dashboardservice.datasources.secretDefinition secretDefinition: apiVersion: 1 datasources: @@ -825,6 +827,7 @@ dashboardservice: type: "prometheus" url: "http://metric-db-server" dashboardsProvider: + ## @param dashboardservice.dashboardsProvider.enabled Enable the default dashboard provisioning provider to routinely import dashboards from /opt/bitnami/grafana/dashboards enabled: true ## @section Metric Service