Skip to content
Snippets Groups Projects
Unverified Commit b4545c64 authored by Martin Weise's avatar Martin Weise
Browse files

Added dashboard

parent 168ba443
No related branches found
No related tags found
4 merge requests!231CI: Remove build for log-service,!228Better error message handling in the frontend,!223Release of version 1.4.0,!197Added security configuration with OIDC and Basic Auth for OpenSearch Dashboards
......@@ -23,6 +23,8 @@ build-analyse-service:
build-docker:
docker build -t dbrepo-metadata-service:build --target build dbrepo-metadata-service
docker build ./dbrepo-log-service -t dbrepo-log-service:latest
docker build ./dbrepo-log-dashboard -t dbrepo-log-dashboard:latest
docker compose build --parallel
build-frontend:
......@@ -32,7 +34,7 @@ build-frontend:
build-clients:
bash ./.gitlab/swagger/generate.sh
tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-broker-service tag-metadata-service tag-search-sync-agent
tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-broker-service tag-metadata-service tag-search-sync-agent tag-log-service tag-log-dashboard
tag-analyse-service:
docker tag dbrepo-analyse-service:latest "dbrepo/analyse-service:${TAG}"
......@@ -66,7 +68,15 @@ tag-search-db:
docker tag dbrepo-search-db:latest "dbrepo/search-db:${TAG}"
docker tag dbrepo-search-db:latest "${AZURE_REPO}/dbrepo/search-db:${TAG}"
release: build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-broker-service release-metadata-service release-search-sync-agent
tag-log-service:
docker tag dbrepo-log-service:latest "dbrepo/log-service:${TAG}"
docker tag dbrepo-log-service:latest "${AZURE_REPO}/dbrepo/log-service:${TAG}"
tag-log-dashboard:
docker tag dbrepo-log-dashboard:latest "dbrepo/log-dashboard:${TAG}"
docker tag dbrepo-log-dashboard:latest "${AZURE_REPO}/dbrepo/log-dashboard:${TAG}"
release: build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-broker-service release-metadata-service release-search-sync-agent release-log-service release-log-dashboard
release-analyse-service: tag-analyse-service
docker push "dbrepo/analyse-service:${TAG}"
......@@ -96,6 +106,14 @@ release-metadata-service: tag-metadata-service
docker push "dbrepo/metadata-service:${TAG}"
docker push "${AZURE_REPO}/dbrepo/metadata-service:${TAG}"
release-log-service: tag-log-service
docker push "dbrepo/log-service:${TAG}"
docker push "${AZURE_REPO}/dbrepo/log-service:${TAG}"
release-log-dashboard: tag-log-dashboard
docker push "dbrepo/log-dashboard:${TAG}"
docker push "${AZURE_REPO}/dbrepo/log-dashboard:${TAG}"
test-backend: test-metadata-service test-analyse-service test-search-sync-agent
test-search-sync-agent: build-search-sync-agent
......
......@@ -4,3 +4,7 @@ MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
RUN /usr/share/opensearch-dashboards/bin/opensearch-dashboards-plugin remove securityDashboards
COPY --chown=opensearch-dashboards:opensearch-dashboards ./opensearch_dashboards.yml /usr/share/opensearch-dashboards/config/
COPY ./config.yml /usr/share/opensearch-dashboards/config/opensearch-security/config.yml
EXPOSE 5601
\ No newline at end of file
# Log Dashboard
## Dashboard
Visit [http://localhost:5601](http://localhost:5601)
\ No newline at end of file
......@@ -6,3 +6,8 @@ RUN gem install fluent-plugin-opensearch
RUN fluent-gem install fluent-plugin-rewrite-tag-filter fluent-plugin-multi-format-parser
USER fluent
COPY ./fluent.conf /fluentd/etc/fluent.conf
EXPOSE 24224/tcp
EXPOSE 24224/udp
\ No newline at end of file
# Log Service
## Sink
`24224/tcp` and `24224/udp`
\ No newline at end of file
# Search Database
## How to run
## REST
Increase memory for Docker to at least 4GB:
```console
sudo sysctl -w vm.max_map_count=262144
```
\ No newline at end of file
View all indices [http://localhost:9200/_cat/indices](http://localhost:9200/_cat/indices)
\ No newline at end of file
......@@ -2,6 +2,16 @@
# MODIFIED: 2023-06-01
# MAINTAINER: Martin Weise <martin.weise@tuwien.ac.at>
# Log to the (commented) log service by changing the logging driver to fluentd, e.g.name:
#
# my-service:
# ...
# logging: fluentd
# driver: fluentd
# options:
# host: localhost: 24224
# tag: my-service
version: "3.6"
volumes:
......@@ -40,9 +50,6 @@ services:
volumes:
- metadata-db-data:/bitnami/mariadb
- ./dbrepo-metadata-db/setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
depends_on:
dbrepo-log-service:
condition: service_started
ports:
- "3306:3306"
- "9100:9100"
......@@ -54,11 +61,7 @@ services:
timeout: 5s
retries: 12
logging:
driver: fluentd
options:
fluentd-address: localhost:24224
tag: metadata-db
driver: json-file
dbrepo-data-db:
restart: "no"
container_name: dbrepo-data-db
......@@ -292,37 +295,37 @@ services:
logging:
driver: json-file
dbrepo-log-service:
restart: "no"
container_name: dbrepo-log-service
hostname: log-service
build: ./dbrepo-log-service
image: dbrepo-log-service:latest
networks:
core:
public:
volumes:
- ./dbrepo-log-service/fluent.conf:/fluentd/etc/fluent.conf
ports:
- "24224:24224"
- "24224:24224/udp"
depends_on:
dbrepo-search-db:
condition: service_healthy
dbrepo-log-dashboard:
restart: "no"
container_name: dbrepo-log-dashboard
hostname: log-dashboard
build: ./dbrepo-log-dashboard
image: dbrepo-log-dashboard:latest
networks:
core:
public:
volumes:
- ./dbrepo-log-dashboard/config.yml:/usr/share/opensearch-dashboards/config/opensearch-security/config.yml
ports:
- "5601:5601"
depends_on:
dbrepo-search-db:
condition: service_healthy
# dbrepo-log-service:
# restart: "no"
# container_name: dbrepo-log-service
# hostname: log-service
# build: ./dbrepo-log-service
# image: dbrepo-log-service:latest
# networks:
# core:
# public:
# volumes:
# - ./dbrepo-log-service/fluent.conf:/fluentd/etc/fluent.conf
# ports:
# - "24224:24224"
# - "24224:24224/udp"
# depends_on:
# dbrepo-search-db:
# condition: service_healthy
#
# dbrepo-log-dashboard:
# restart: "no"
# container_name: dbrepo-log-dashboard
# hostname: log-dashboard
# build: ./dbrepo-log-dashboard
# image: dbrepo-log-dashboard:latest
# networks:
# core:
# public:
# volumes:
# - ./dbrepo-log-dashboard/config.yml:/usr/share/opensearch-dashboards/config/opensearch-security/config.yml
# ports:
# - "5601:5601"
# depends_on:
# dbrepo-search-db:
# condition: service_healthy
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment