From 0edb94da94427f33163b7f09c2fefaf60bdeed7e Mon Sep 17 00:00:00 2001 From: Aditya Ujeniya Date: Tue, 28 Jan 2025 21:54:48 +0100 Subject: [PATCH] Update to mariad and openldap --- cc-metric-store/config.json | 2 +- config.json | 77 +++++++++++++++++++++++++++++++++++++ docker-compose.yml | 19 +++++---- setupDev.sh | 35 +++++++++++++++++ 4 files changed, 125 insertions(+), 8 deletions(-) create mode 100644 config.json diff --git a/cc-metric-store/config.json b/cc-metric-store/config.json index 902053b..2dc0b1b 100644 --- a/cc-metric-store/config.json +++ b/cc-metric-store/config.json @@ -175,7 +175,7 @@ "directory": "/data/archive" }, "http-api": { - "address": "localhost:8082", + "address": "0.0.0.0:8084", "https-cert-file": null, "https-key-file": null }, diff --git a/config.json b/config.json new file mode 100644 index 0000000..2977e72 --- /dev/null +++ b/config.json @@ -0,0 +1,77 @@ +{ + "addr": "127.0.0.1:8080", + "short-running-jobs-duration": 300, + "archive": { + "kind": "file", + "path": "./var/job-archive" + }, + "jwts": { + "max-age": "2000h" + }, + "db-driver": "mysql", + "db": "root:root@tcp(0.0.0.0:3306)/ccbackend", + "ldap": { + "url": "ldap://0.0.0.0", + "user_base": "ou=users,dc=example,dc=com", + "search_dn": "cn=admin,dc=example,dc=com", + "user_bind": "uid={username},ou=users,dc=example,dc=com", + "user_filter": "(&(objectclass=posixAccount))", + "syncUserOnLogin": true + }, + "enable-resampling": { + "trigger": 30, + "resolutions": [ + 600, + 300, + 120, + 60 + ] + }, + "emission-constant": 317, + "clusters": [ + { + "name": "fritz", + "metricDataRepository": { + "kind": "cc-metric-store", + "url": "http://0.0.0.0:8084", + "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJFZERTQSJ9.eyJ1c2VyIjoiYWRtaW4iLCJyb2xlcyI6WyJST0xFX0FETUlOIiwiUk9MRV9BTkFMWVNUIiwiUk9MRV9VU0VSIl19.d-3_3FZTsadPjDEdsWrrQ7nS0edMAR4zjl-eK7rJU3HziNBfI9PDHDIpJVHTNN5E5SlLGLFXctWyKAkwhXL-Dw" + }, + "filterRanges": { + "numNodes": { + "from": 1, + "to": 64 + }, + "duration": { + "from": 0, + "to": 86400 + }, + "startTime": { + "from": "2022-01-01T00:00:00Z", + "to": null + } + } + }, + { + "name": "alex", + "metricDataRepository": { + "kind": "cc-metric-store", + "url": "http://0.0.0.0:8084", + "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJFZERTQSJ9.eyJ1c2VyIjoiYWRtaW4iLCJyb2xlcyI6WyJST0xFX0FETUlOIiwiUk9MRV9BTkFMWVNUIiwiUk9MRV9VU0VSIl19.d-3_3FZTsadPjDEdsWrrQ7nS0edMAR4zjl-eK7rJU3HziNBfI9PDHDIpJVHTNN5E5SlLGLFXctWyKAkwhXL-Dw" + }, + "filterRanges": { + "numNodes": { + "from": 1, + "to": 64 + }, + "duration": { + "from": 0, + "to": 86400 + }, + "startTime": { + "from": "2022-01-01T00:00:00Z", + "to": null + } + } + } + ] +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index f10d9ed..7227dda 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,9 +40,15 @@ services: image: osixia/openldap:1.5.0 command: --copy-service --loglevel debug environment: - - LDAP_ADMIN_PASSWORD=${LDAP_ADMIN_PASSWORD} - - LDAP_ORGANISATION=${LDAP_ORGANISATION} - - LDAP_DOMAIN=${LDAP_DOMAIN} + - LDAP_ADMIN_PASSWORD=mashup + - LDAP_ORGANISATION=Example Organization + - LDAP_DOMAIN=example.com + - LDAP_LOGGING=true + - LDAP_CONNECTION=default + - LDAP_CONNECTIONS=default + - LDAP_DEFAULT_HOSTS=0.0.0.0 + ports: + - "0.0.0.0:389:389" volumes: - ${DATADIR}/ldap:/container/service/slapd/assets/config/bootstrap/ldif/custom @@ -51,15 +57,14 @@ services: image: mariadb:latest command: ["--default-authentication-plugin=mysql_native_password"] environment: - MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD} + MARIADB_ROOT_PASSWORD: root MARIADB_DATABASE: slurm_acct_db MARIADB_USER: slurm MARIADB_PASSWORD: demo ports: - - "127.0.0.1:${MARIADB_PORT}:3306" + - "0.0.0.0:${MARIADB_PORT}:3306" volumes: - - ${DATADIR}/mariadb:/etc/mysql/conf.d - # - ${DATADIR}/sql-init:/docker-entrypoint-initdb.d + - ${DATADIR}/mariadb:/docker-entrypoint-initdb.d cap_add: - SYS_NICE diff --git a/setupDev.sh b/setupDev.sh index 3616787..616ba89 100755 --- a/setupDev.sh +++ b/setupDev.sh @@ -73,6 +73,39 @@ fi # rm -r ./data/job-archive-source # rm -r ./data/cc-metric-store-source +if [ ! -d data/mariadb ]; then + mkdir -p data/mariadb + cat > data/mariadb/01.databases.sql < data/ldap/add_users.ldif <