Skip to content
Snippets Groups Projects
Verified Commit 558eee0d authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'release-1.4.6' into dev

parents b1591767 7909256c
No related branches found
No related tags found
6 merge requests!345Updated docs and endpoints:,!341Fixed mapping problem where UK and FK share columns they are inserted,!339Fixed mapping problem where UK and FK share columns they are inserted,!338Fixed mapping problem where UK and FK share columns they are inserted,!334Fixed mapping problem where UK and FK share columns they are inserted,!333Fixed mapping problem where UK and FK share columns they are inserted
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 684 additions and 720 deletions
.docker/docker-compose.yml
+ 11
− 16
View file @ 558eee0d
......@@ -75,7 +75,7 @@ services:
restart: "no"
container_name: dbrepo-auth-service
hostname: auth-service
image: registry.datalab.tuwien.ac.at/dbrepo/auth-service:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/auth-service:1.4.6
healthcheck:
test: curl -sSL 'http://0.0.0.0:8080/realms/dbrepo' | grep "dbrepo" || exit 1
interval: 15s
......@@ -99,7 +99,7 @@ services:
restart: "no"
container_name: dbrepo-metadata-service
hostname: metadata-service
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.6
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
......@@ -162,7 +162,7 @@ services:
restart: "no"
container_name: dbrepo-analyse-service
hostname: analyse-service
image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.6
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
......@@ -212,7 +212,7 @@ services:
restart: "no"
container_name: dbrepo-search-db
hostname: search-db
image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.4.6
healthcheck:
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
interval: 10s
......@@ -236,7 +236,7 @@ services:
restart: "no"
container_name: dbrepo-search-service
hostname: search-service
image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.6
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
......@@ -253,7 +253,7 @@ services:
restart: "no"
container_name: dbrepo-data-db-sidecar
hostname: data-db-sidecar
image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.6
environment:
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
......@@ -274,7 +274,7 @@ services:
restart: "no"
container_name: dbrepo-ui
hostname: ui
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.6
environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}"
......@@ -345,7 +345,7 @@ services:
restart: "no"
container_name: dbrepo-search-service-init
hostname: search-service-init
image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.6
environment:
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
......@@ -398,12 +398,7 @@ services:
restart: "no"
container_name: dbrepo-dashboard-service
hostname: dashboard-service
image: docker.io/bitnami/grafana:11.2.0-debian-12-r4
volumes:
- ./config/dashboards:/app/dashboards
- ./config/provisioning:/etc/grafana/provisioning
- ./config/grafana.ini:/etc/grafana/grafana.ini
- ./config/ldap.toml:/etc/grafana/ldap.toml
image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.4.6
environment:
GF_SERVER_DOMAIN: "dashboard-service"
GF_SERVER_ROOT_URL: "${BASE_URL:-http://localhost}/dashboard/"
......@@ -426,7 +421,7 @@ services:
restart: "no"
container_name: dbrepo-storage-service-init
hostname: storage-service-init
image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.6
environment:
WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
......@@ -466,7 +461,7 @@ services:
restart: "no"
container_name: dbrepo-data-service
hostname: data-service
image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.6
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
......
.docs/api/dashboard-service.md
+ 2
− 2
View file @ 558eee0d
......@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
Image: [`docker.io/bitnami/grafana:11.2.0-debian-12-r4`](https://hub.docker.com/r/bitnami/grafana)
Image: [`docker.io/bitnami/grafana:10.4.9-debian-12-r0`](https://hub.docker.com/r/bitnami/grafana)
* Ports: `http://<hostname>/dashboard`
* Prometheus: `http://<hostname>/dashboard/prometheus`
......@@ -24,7 +24,7 @@ seconds and makes the available in the Dashboard Service.
<figure markdown>
![MariaDB Galera Dashboard](../images/screenshots/grafana3.png)
<figcaption>Figure 2: Database Dashboard</figcaption>
<figcaption>Figure 2: Database Dashboard (Kubernetes deployment only)</figcaption>
</figure>
<figure markdown>
......
.docs/api/data-db.md
+ 1
− 1
View file @ 558eee0d
......@@ -4,7 +4,7 @@ author: Martin Weise
!!! debug "Debug Information"
Image: [`docker.io/bitnami/mariadb:11.1.3-debian-11-r6`](https://hub.docker.com/r/bitnami/mariadb)
Image: [`docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8`](https://hub.docker.com/r/bitnami/mariadb-galera)
* Ports: 3306/tcp
* JDBC: `jdbc://mariadb:<hostname>:3306`
......
.docs/api/metadata-db.md
+ 1
− 1
View file @ 558eee0d
......@@ -4,7 +4,7 @@ author: Martin Weise
!!! debug "Debug Information"
Image: [`docker.io/bitnami/mariadb:11.1.3-debian-11-r6`](https://hub.docker.com/r/bitnami/mariadb)
Image: [`docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8`](https://hub.docker.com/r/bitnami/mariadb-galera)
* Ports: 3306/tcp
* JDBC: `jdbc://mariadb:<hostname>:3306`
......
.docs/api/ui.md
+ 2
− 2
View file @ 558eee0d
......@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.5`](https://hub.docker.com/r/dbrepo/ui)
Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.6`](https://hub.docker.com/r/dbrepo/ui)
* Ports: 3000/tcp
......@@ -37,7 +37,7 @@ image as well, in this example we want to mount a custom logo `my_logo.png` into
```yaml title="docker-compose.yml"
services:
dbrepo-ui:
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.5
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.6
volumes:
- ./my_logo.png:/app/.output/public/my_logo.png
- ./favicon.ico:/app/.output/public/favicon.ico
......
.docs/help.md
+ 12
− 0
View file @ 558eee0d
......@@ -9,3 +9,15 @@ The [concepts documentation](../concepts/) is the most complete guide on how to
## API Documentation
The [API documentation](../api/) present reference docs for all APIs.
## Troubleshooting
**The Dashboard Service reloads recurrently**
: *Origin*: Your Ad-Blocker blocks client-side requests of Grafana to its endpoints, resulting in authorization
errors, causing full page reloads.
: *Solution*: Disable uBlock Origin, AdBlock Plus, etc. for `/dashboard/*`.
!!! info "Additional Help"
[Contact us](../contact) via e-mail.
\ No newline at end of file
.docs/images/screenshots/grafana4.png
+ 0
− 0
View replaced file @ b1591767 View file @ 558eee0d
.docs/images/screenshots/grafana4.png

150 KiB | W: | H:

.docs/images/screenshots/grafana4.png

563 KiB | W: | H:

.docs/images/screenshots/grafana4.png
.docs/images/screenshots/grafana4.png
.docs/images/screenshots/grafana4.png
.docs/images/screenshots/grafana4.png
  • 2-up
  • Swipe
  • Onion skin
.docs/index.md
+ 1
− 1
View file @ 558eee0d
......@@ -8,7 +8,7 @@ author: Martin Weise
[![Image Pulls](https://img.shields.io/docker/pulls/dbrepo/data-service?style=flat&cacheSeconds=3600)](https://hub.docker.com/u/dbrepo){ tabindex=-1 }
[![GitLab License](https://img.shields.io/gitlab/license/fair-data-austria-db-repository%2Ffda-services?gitlab_url=https%3A%2F%2Fgitlab.phaidra.org%2F&style=flat&cacheSeconds=3600)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
Documentation for version: [v1.4.5](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
Documentation for version: [v1.4.6](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
DBRepo is a repository for data in databases that are used from the beginning until the end of a research
project supporting data evolution, -citation and -versioning. It implements the query store of the
......
.docs/installation.md
+ 3
− 3
View file @ 558eee0d
......@@ -11,7 +11,7 @@ author: Martin Weise
If you have [Docker](https://docs.docker.com/engine/install/) already installed on your system, you can install DBRepo with:
```shell
curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/install.sh | bash
curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.6/install.sh | bash
```
!!! bug "Default installation security disclaimer"
......@@ -39,7 +39,7 @@ SSL/TLS certificate is recommended. Follow the [secure install](#secure-install)
Execute the install script to download only the environment and save it to `dist`.
```shell
curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/install.sh | DOWNLOAD_ONLY=1 bash
curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.6/install.sh | DOWNLOAD_ONLY=1 bash
```
### Static Configuration
......@@ -81,7 +81,7 @@ the variable `IDENTITY_SERVICE_ADMIN_PASSWORD` in `.env`.
Update the client secret of the `dbrepo-client`:
```bash
curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/.scripts/reg-client-secret.sh" | bash
curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.6/.scripts/reg-client-secret.sh" | bash
```
Also, update the JWT key according to the
......
.docs/kubernetes.md
+ 3
− 3
View file @ 558eee0d
......@@ -7,7 +7,7 @@ author: Martin Weise
## TL;DR
To install DBRepo in your existing cluster, download the
sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.5/helm/dbrepo/values.yaml)
sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.6/helm/dbrepo/values.yaml)
for your deployment and update the variables, especially `hostname`.
```shell
......@@ -15,7 +15,7 @@ helm upgrade --install dbrepo \
-n dbrepo \
"oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \
--values ./values.yaml \
--version "1.4.5" \
--version "1.4.6" \
--create-namespace \
--cleanup-on-fail
```
......@@ -36,7 +36,7 @@ brokerservice:
The `brokerservice.auth.passwordHash` field is the RabbitMQ SHA512-hash of the `brokerservice.auth.password` field and
can be obtained with
the [`generate-rabbitmq-pw.sh`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.5/helm/dbrepo/hack/generate-rabbitmq-pw.sh)
the [`generate-rabbitmq-pw.sh`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.6/helm/dbrepo/hack/generate-rabbitmq-pw.sh)
script:
```console
......
.docs/redirect.html
+ 3
− 3
View file @ 558eee0d
......@@ -5,16 +5,16 @@
<head>
<meta charset="UTF-8">
<title>Redirect Notice</title>
<meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.4.5/'" />
<meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.4.6/'" />
</head>
<body>
<h1>Redirect Notice</h1>
<p>
This page should automatically open the documentation for version <code>1.4.5</code>. In case this page does not load the site is
This page should automatically open the documentation for version <code>1.4.6</code>. In case this page does not load the site is
available at:
</p>
<p>
<a href="/infrastructures/dbrepo/1.4.5/">/infrastructures/dbrepo/1.4.5/</a>
<a href="/infrastructures/dbrepo/1.4.6/">/infrastructures/dbrepo/1.4.6/</a>
</p>
</body>
</html>
\ No newline at end of file
.gitlab-ci.yml
+ 3
− 3
View file @ 558eee0d
......@@ -3,8 +3,8 @@ variables:
DOCKER_HOST: "unix:///var/run/dind/docker.sock"
TESTCONTAINERS_RYUK_DISABLED: "false"
PYTHON_VERSION: "3.11"
APP_VERSION: "1.4.5"
CHART_VERSION: "1.4.5"
APP_VERSION: "1.4.6"
CHART_VERSION: "1.4.6"
CACHE_FALLBACK_KEY: ${CI_DEFAULT_BRANCH}
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
......@@ -145,7 +145,7 @@ lint-docker-compose:
- "bash .scripts/check-service.sh 'dbrepo-auth-db'"
- "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-auth-service'"
- "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-broker-service'"
- "IGNORE_VOLUMES=1 bash .scripts/check-service.sh 'dbrepo-dashboard-service'"
- "IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-dashboard-service'"
- "bash .scripts/check-service.sh 'dbrepo-data-db'"
- "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-data-db-sidecar'"
- "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-data-service'"
......
Makefile
+ 2
− 2
View file @ 558eee0d
.PHONY: all
APP_VERSION ?= 1.4.5
CHART_VERSION ?= 1.4.5
APP_VERSION ?= 1.4.6
CHART_VERSION ?= 1.4.6
REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo
.PHONY: all
......
README.md
+ 1
− 1
View file @ 558eee0d
......@@ -15,7 +15,7 @@ If you have [Docker](https://docs.docker.com/engine/install/) already installed
with:
```bash
curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/install.sh | bash
curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.6/install.sh | bash
```
## Documentation
......
dbrepo-analyse-service/Pipfile
+ 1
− 1
View file @ 558eee0d
......@@ -21,7 +21,7 @@ numpy = "*"
pandas = "*"
minio = "*"
pydantic = "*"
dbrepo = {path = "./lib/dbrepo-1.4.5.tar.gz"}
dbrepo = {path = "./lib/dbrepo-1.4.6.tar.gz"}
opensearch-py = "*"
[dev-packages]
......
dbrepo-analyse-service/Pipfile.lock
+ 432
− 411
View file @ 558eee0d
This diff is collapsed.
dbrepo-analyse-service/app.py
+ 2
− 2
View file @ 558eee0d
......@@ -188,7 +188,7 @@ template = {
"info": {
"title": "Database Repository Analyse Service API",
"description": "Service that analyses data structures",
"version": "1.4.5",
"version": "1.4.6",
"contact": {
"name": "Prof. Andreas Rauber",
"email": "andreas.rauber@tuwien.ac.at"
......@@ -200,7 +200,7 @@ template = {
},
"externalDocs": {
"description": "Sourcecode Documentation",
"url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/"
"url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/"
},
"servers": [
{
......
dbrepo-dashboard-service/Dockerfile
+ 5
− 5
View file @ 558eee0d
FROM docker.io/bitnami/grafana:11.2.0-debian-12-r4 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
COPY ./grafana.ini /etc/grafana/grafana.ini
COPY ldap.toml /etc/grafana/ldap.toml
COPY provisioning/datasources/prometheus.yaml /etc/grafana/provisioning/datasources/datasource.yaml
#COPY --chown=999:999 ./system.yaml /var/lib/grafana/dashboards/system.yaml
COPY --chown=grafana:grafana ./dashboards /app/dashboards
COPY --chown=grafana:grafana ./provisioning /etc/grafana/provisioning
COPY --chown=grafana:grafana ./grafana.ini /etc/grafana/grafana.ini
COPY --chown=grafana:grafana ./ldap.toml /etc/grafana/ldap.toml
dbrepo-dashboard-service/dashboards/system.json
+ 198
− 262
View file @ 558eee0d
......@@ -18,6 +18,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"id": 2,
"links": [
{
"asDropdown": false,
......@@ -29,7 +30,7 @@
"title": "Docs",
"tooltip": "",
"type": "link",
"url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/"
"url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/"
}
],
"panels": [
......@@ -41,9 +42,9 @@
"x": 0,
"y": 0
},
"id": 3,
"id": 15,
"panels": [],
"title": "Overview",
"title": "Data",
"type": "row"
},
{
......@@ -54,9 +55,10 @@
},
"fieldConfig": {
"defaults": {
"displayName": "QoS",
"mappings": [],
"thresholds": {
"mode": "percentage",
"mode": "absolute",
"steps": [
{
"color": "purple",
......@@ -80,13 +82,13 @@
}
]
},
"unit": "percentunit"
"unit": "percent"
},
"overrides": []
},
"gridPos": {
"h": 3,
"w": 3,
"w": 4,
"x": 0,
"y": 1
},
......@@ -108,7 +110,7 @@
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "11.2.0",
"pluginVersion": "",
"targets": [
{
"datasource": {
......@@ -117,7 +119,7 @@
},
"disableTextWrap": false,
"editorMode": "code",
"expr": "sum(up)/count(up)",
"expr": "sum(up)*100/count(up)",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
......@@ -130,17 +132,87 @@
"type": "stat"
},
{
"collapsed": false,
"datasource": {
"default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
"fieldConfig": {
"defaults": {
"displayName": "UI Response Time (Mean)",
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "purple",
"value": null
},
{
"color": "green",
"value": 0
},
{
"color": "yellow",
"value": 200
},
{
"color": "orange",
"value": 400
},
{
"color": "red",
"value": 600
}
]
},
"unit": "ms"
},
"overrides": []
},
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
"y": 4
"h": 3,
"w": 4,
"x": 4,
"y": 1
},
"id": 15,
"panels": [],
"title": "Data",
"type": "row"
"id": 17,
"options": {
"colorMode": "background",
"graphMode": "none",
"justifyMode": "auto",
"orientation": "auto",
"percentChangeColorMode": "standard",
"reduceOptions": {
"calcs": [
"lastNotNull"
],
"fields": "",
"values": false
},
"showPercentChange": false,
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
"editorMode": "code",
"expr": "avg(page_total_time)",
"format": "table",
"intervalFactor": 3,
"legendFormat": "__auto",
"range": true,
"refId": "B",
"step": 15,
"target": "dev.grafana.cb-office.alerting.active_alerts"
}
],
"type": "stat"
},
{
"datasource": {
......@@ -167,9 +239,9 @@
},
"gridPos": {
"h": 3,
"w": 5,
"x": 0,
"y": 5
"w": 4,
"x": 8,
"y": 1
},
"id": 4,
"options": {
......@@ -189,7 +261,7 @@
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "11.2.0",
"pluginVersion": "",
"targets": [
{
"datasource": {
......@@ -235,9 +307,9 @@
},
"gridPos": {
"h": 3,
"w": 5,
"x": 5,
"y": 5
"w": 4,
"x": 12,
"y": 1
},
"id": 5,
"options": {
......@@ -257,7 +329,7 @@
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "11.2.0",
"pluginVersion": "",
"targets": [
{
"datasource": {
......@@ -350,9 +422,9 @@
},
"gridPos": {
"h": 3,
"w": 5,
"x": 10,
"y": 5
"w": 4,
"x": 16,
"y": 1
},
"id": 8,
"options": {
......@@ -372,7 +444,7 @@
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "11.2.0",
"pluginVersion": "",
"targets": [
{
"datasource": {
......@@ -399,13 +471,101 @@
"h": 1,
"w": 24,
"x": 0,
"y": 8
"y": 4
},
"id": 2,
"panels": [],
"title": "Services",
"type": "row"
},
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "#EAB839",
"value": 200
},
{
"color": "orange",
"value": 400
},
{
"color": "red",
"value": 600
}
]
},
"unit": "ms"
},
"overrides": []
},
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 5
},
"id": 13,
"options": {
"displayMode": "gradient",
"maxVizHeight": 300,
"minVizHeight": 16,
"minVizWidth": 8,
"namePlacement": "auto",
"orientation": "horizontal",
"reduceOptions": {
"calcs": [
"mean"
],
"fields": "",
"values": false
},
"showUnfilled": true,
"sizing": "auto",
"valueMode": "color"
},
"pluginVersion": "",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
"disableTextWrap": false,
"editorMode": "builder",
"exemplar": false,
"expr": "page_total_time{path!=\"empty: empty\"}",
"format": "time_series",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
"intervalFactor": 3,
"legendFormat": "{{path}}",
"range": true,
"refId": "B",
"step": 15,
"target": "dev.grafana.cb-office.alerting.active_alerts",
"useBackend": false
}
],
"title": "UI Response Time",
"type": "bargauge"
},
{
"datasource": {
"default": true,
......@@ -424,7 +584,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
......@@ -607,7 +766,7 @@
"h": 6,
"w": 24,
"x": 0,
"y": 9
"y": 14
},
"id": 1,
"options": {
......@@ -663,7 +822,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
......@@ -771,7 +929,7 @@
"h": 6,
"w": 24,
"x": 0,
"y": 15
"y": 20
},
"id": 6,
"options": {
......@@ -828,7 +986,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
......@@ -933,7 +1090,7 @@
"h": 6,
"w": 24,
"x": 0,
"y": 21
"y": 26
},
"id": 7,
"options": {
......@@ -970,240 +1127,19 @@
],
"title": "JVM Memory Usage",
"type": "timeseries"
},
{
"datasource": {
"default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 10,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "smooth",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "never",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"links": [],
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
},
"unit": "short"
},
"overrides": [
{
"matcher": {
"id": "byName",
"options": "400"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "orange",
"mode": "fixed"
}
}
]
},
{
"matcher": {
"id": "byName",
"options": "500"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "#BF1B00",
"mode": "fixed"
}
}
]
},
{
"matcher": {
"id": "byName",
"options": "-1"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "purple",
"mode": "fixed"
}
}
]
},
{
"matcher": {
"id": "byName",
"options": "200"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "green",
"mode": "fixed"
}
}
]
},
{
"matcher": {
"id": "byName",
"options": "302"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "light-yellow",
"mode": "fixed"
}
}
]
},
{
"matcher": {
"id": "byName",
"options": "304"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "super-light-yellow",
"mode": "fixed"
}
}
]
},
{
"matcher": {
"id": "byName",
"options": "401"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "light-orange",
"mode": "fixed"
}
}
]
},
{
"matcher": {
"id": "byName",
"options": "499"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "red",
"mode": "fixed"
}
}
]
}
]
},
"gridPos": {
"h": 6,
"w": 24,
"x": 0,
"y": 27
},
"id": 13,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"pluginVersion": "8.1.0-pre",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
"editorMode": "code",
"expr": "sum by (status_code) (irate(grafana_http_request_duration_seconds_count[5m]))",
"format": "time_series",
"intervalFactor": 3,
"legendFormat": "{{status_code}}",
"range": true,
"refId": "B",
"step": 15,
"target": "dev.grafana.cb-office.alerting.active_alerts"
}
],
"title": "Dashboard Service HTTP Status Codes",
"type": "timeseries"
}
],
"refresh": "10s",
"schemaVersion": 39,
"tags": ["provisioned", "dbrepo"],
"tags": [
"provisioned",
"dbrepo"
],
"templating": {
"list": []
},
"time": {
"from": "now-15m",
"from": "now-1h",
"to": "now"
},
"timepicker": {},
......
dbrepo-data-service/pom.xml
+ 1
− 1
View file @ 558eee0d
......@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<name>dbrepo-data-service</name>
<version>1.4.5</version>
<version>1.4.6</version>
<description>Service that manages the data</description>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment