Merge branch 'main' into bc-8558

hpi-schul-cloud · Dec 20, 2024 · 316ee74 · 316ee74
2 parents 7476c8f + 628c832
commit 316ee74
Show file tree

Hide file tree

Showing 21 changed files with 160 additions and 121 deletions.
diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml
@@ -551,6 +551,11 @@ configuration_all:
     server: true
     client: false
     nuxtclient: false
+  FEATURE_COLUMN_BOARD_VIDEOCONFERENCE_ENABLED:
+    value: "false"
+    server: true
+    client: false
+    nuxtclient: false
   FEATURE_COLUMN_BOARD_SOCKET_ENABLED:
     value: "false"
     server: true
@@ -1016,6 +1021,21 @@ configuration_all:
     server: true
     client: false
     nuxtclient: false
+  SCHULCONNEX_CLIENT__PERSON_INFO_TIMEOUT_IN_MS:
+    value: "3000"
+    server: true
+    client: false
+    nuxtclient: false
+  SCHULCONNEX_CLIENT__PERSONEN_INFO_TIMEOUT_IN_MS:
+    value: "120000"
+    server: true
+    client: false
+    nuxtclient: false
+  SCHULCONNEX_CLIENT__POLICIES_INFO_TIMEOUT_IN_MS:
+    value: "4000"
+    server: true
+    client: false
+    nuxtclient: false
   FEATURE_SCHULCONNEX_COURSE_SYNC_ENABLED:
     server: true
     client: true
@@ -1059,6 +1079,11 @@ configuration_all:
     server: true
     client: false
     nuxtclient: false
+  PROVISIONING_SCHULCONNEX_GROUP_USERS_LIMIT:
+    value: "500"
+    server: true
+    client: false
+    nuxtclient: false
   BOARD_COLLABORATION_URI:
     value: "wss://{{ DOMAIN }}"
     server: true
@@ -1098,4 +1123,3 @@ configuration_all:
     server: true
     client: true
     nuxtclient: false
-
diff --git a/ansible/group_vars/all/x_ingress.yml b/ansible/group_vars/all/x_ingress.yml
@@ -7,6 +7,10 @@ default_ingress:
     serviceName: nuxtclient-svc
     servicePort: "{{ NUXTCLIENT_PORT }}"
     path: "/favicon.png"
+  bbb_presentation_pdf:
+    serviceName: nuxtclient-svc
+    servicePort: "{{ NUXTCLIENT_PORT }}"
+    path: "/bbb-presentation.pdf"
   runtime:
     path: /runtime.config.json
     serviceName: nuxtclient-svc

diff --git a/ansible/group_vars/brb/instance_cfg.yml b/ansible/group_vars/brb/instance_cfg.yml
@@ -115,4 +115,4 @@ group_ingress:
     servicePort: "{{ PORT_FWU_LEARNING_CONTENTS }}"
 
 # BigBlueButton
-VIDEOCONFERENCE_DEFAULT_PRESENTATION: https://s3.hidrive.strato.com/cloud-instances/brb/bbb/presentation.pdf
+VIDEOCONFERENCE_DEFAULT_PRESENTATION: https://{{ DOMAIN }}/bbb-presentation.pdf
diff --git a/ansible/group_vars/dbc/instance_cfg.yml b/ansible/group_vars/dbc/instance_cfg.yml
@@ -76,4 +76,4 @@ COLUMN_BOARD_FEEDBACK_LINK: https://easy-feedback.de/umfrage/1683495/cWgx4T
 group_ingress:
 
 # BigBlueButton
-VIDEOCONFERENCE_DEFAULT_PRESENTATION: https://s3.hidrive.strato.com/cloud-instances/default/bbb/presentation.pdf
+VIDEOCONFERENCE_DEFAULT_PRESENTATION: https://{{ DOMAIN }}/bbb-presentation.pdf
diff --git a/ansible/group_vars/develop/cfg.yml b/ansible/group_vars/develop/cfg.yml
@@ -17,6 +17,8 @@ FEATURE_COLUMN_BOARD_SUBMISSIONS_ENABLED: "true"
 
 FEATURE_COLUMN_BOARD_LINK_ELEMENT_ENABLED: "true"
 
+FEATURE_COLUMN_BOARD_VIDEOCONFERENCE_ENABLED: "true"
+
 FEATURE_ROOMS_ENABLED: "true"
 
 FEATURE_SCHOOL_POLICY_ENABLED_NEW: "true"

diff --git a/ansible/group_vars/nbc/instance_cfg.yml b/ansible/group_vars/nbc/instance_cfg.yml
@@ -47,7 +47,7 @@ FEATURE_SHOW_MIGRATION_WIZARD: "true"
 FEATURE_USER_MIGRATION_ENABLED: "true"
 FEATURE_SCHULCONNEX_COURSE_SYNC_ENABLED: "true"
 FEATURE_MIGRATION_WIZARD_WITH_USER_LOGIN_MIGRATION: "true"
-FEATURE_OTHER_GROUPUSERS_PROVISIONING_ENABLED: "false"
+FEATURE_OTHER_GROUPUSERS_PROVISIONING_ENABLED: "true"
 FEATURE_SCHULCONNEX_MEDIA_LICENSE_ENABLED: "true"
 FEATURE_PREFERRED_CTL_TOOLS_ENABLED: "true"
 FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "true"

diff --git a/ansible/group_vars/thr/instance_cfg.yml b/ansible/group_vars/thr/instance_cfg.yml
@@ -67,12 +67,12 @@ ACCESSIBILITY_REPORT_EMAIL: [email protected]
 ES_MERLIN_AUTH_URL: http://merlin.nibis.de/auth.php
 
 # BigBlueButton
-VIDEOCONFERENCE_DEFAULT_PRESENTATION: https://s3.hidrive.strato.com/cloud-instances/thr/bbb/presentation.pdf
+VIDEOCONFERENCE_DEFAULT_PRESENTATION: https://{{ DOMAIN }}/bbb-presentation.pdf
 
 # Nextcloud
 COLLABORATIVE_STORAGE_PROVIDER: Nextcloud
 NEXTCLOUD_SOCIALLOGIN_OIDC_INTERNAL_NAME: SchulcloudNextcloud
-FEATURE_NEXTCLOUD_TEAM_FILES_ENABLED: "true"
+FEATURE_NEXTCLOUD_TEAM_FILES_ENABLED: "false"
 NEXTCLOUD_SCOPES: "openid offline profile email groups"
 
 WITH_TSP: true
diff --git a/ansible/host_vars/dev-loadtest-01/version.yml b/ansible/host_vars/dev-loadtest-01/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/infra.dbildungscloud-01/version.yml b/ansible/host_vars/infra.dbildungscloud-01/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/prod-brb/version.yml b/ansible/host_vars/prod-brb/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/prod-dbc/version.yml b/ansible/host_vars/prod-dbc/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/prod-nbc/cfg.yml b/ansible/host_vars/prod-nbc/cfg.yml
@@ -20,6 +20,5 @@ SCHULCONNEX_CLIENT__TOKEN_ENDPOINT: "https://auth.moin.schule/realms/moins/proto
 
 PROVISIONING_SCHULCONNEX_POLICIES_INFO_URL: "https://api-dienste.moin.schule/v1/policies-info"
 
-FEATURE_PREFERRED_CTL_TOOLS_ENABLED: "false"
 JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAx3s+uLFUG4TSEvXvPu8Kb9UqX5VKIlBjFggoprxbtDShykL+O+lY\nZNG2XJoZ1OCwsGify617OOr/+3XmPChXbDTiuAZAZv945zhZ6ebtkAkKvAzf1jU+\n0ZoidcrpjebCn5oZyZqLJm1uNRxlFkKKJSactc7DTT99NB/AP7CPBum6k5QG+XcB\nsn9KMzPB4jx2PFoMwDU7vOUbHqPrj+0n3lW8/xMcgwVqoWFE11C8oDSSZNcByATf\n8AfX4lfREmtj0HAD6KSXEiT+OM53KWhq7Sz8icE+eiq8oLka2T6kI7gP1N2+9ycq\nh+CtS30ABvQi1Z6meCOjPk8HOFFa3Vj5o2pnrx6cXng4EQL59Y4NzhOclkxOUrUm\nAzWT51g1EdfjTh4PYNCQNJdbfcHL8/H3y8Khg6YCE/6qU7lFyt2aLOriy0d7fTCP\nCA0eQPE71PtYmncW/vk9SCHfQG3Xri3si3MkRQyshYwKBEBIc0Is5owsByAyqxwU\n0NIv1bo7aSHSTt5Q5WYu9wku7YPRpfYprJs5GjlZUMRD++CHSdQz83pi331EsAyd\nPEccVP7tT3+cHlyF/5+qV5QIZ1da4c+ODydbsyYwpjQh9SReAQtZDkW6l/OcT3cp\n9zXc7mK1dgHMlgkHMR1D8qCCOj0CmFNdjlCQSbV0hXOeowBY8EGPBkkCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'
 FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "false"
diff --git a/ansible/host_vars/prod-nbc/version.yml b/ansible/host_vars/prod-nbc/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/prod-thr/version.yml b/ansible/host_vars/prod-thr/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/ref-audit/version.yml b/ansible/host_vars/ref-audit/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/ref-brb/version.yml b/ansible/host_vars/ref-brb/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/ref-dbc/version.yml b/ansible/host_vars/ref-dbc/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/ref-nbc/cfg.yml b/ansible/host_vars/ref-nbc/cfg.yml
@@ -13,6 +13,5 @@ HYDRA_ISSUER_URL_SUFFIX: "/"
 # Migration wizard
 FEATURE_USER_MIGRATION_SYSTEM_ID: "62dab6401c473a01956a0d7d"
 
-FEATURE_PREFERRED_CTL_TOOLS_ENABLED: "false"
 JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAuOzRE8DED9QaLtlnMUSNsz6ulucjKBpHfyGr8RAfowP9NtEaOVCv\nnWL2guKUY1rbl1mJMa56bJ+ZYvCUgYdLbRERpDK5mZtaEQ5SoNZ2qYWTEB58Dvm7\nR8OQZ2m3Hv6BZuiBSqWexl7Ns869yBAeE3842Frkm7wjnVG5cc7kp4H0oXTgGQ3d\n8lDswj8VL7h1w1NEDxd2+6IHE0MNnrvo3vcyLG5r3PNYLQZIRGlU0d5xNCUx+ewn\nVBlBaOfJ3cTp+Kl5Q7NBqttya0+YdmpZmcwk20GT89UhCt5EC7G1YyOcwtBcRvBx\nu52A5Q2C2dUZdy48M4Brhtbw8WpFuk54YUbdq0LtO6GCg79XkhSaBAYMKPAYiwWT\np53B+cWiCEKPdX5X7UoE2GVA1ycMRxarpUjz386ckvOd+bMSWdf/41EeGBXhlaDQ\ndLfh/NVR2XJw7TVuxwgUP1qXNQHCG+oEM6LifhouVVESjyweL81w/ayBS0aiY85Q\nYnypmAxh44NrPRHRK56dnJjhqvVA9nSKi3r2EloHu61rQ1pFMy5G30w0xIa0I9Hy\n4DEGntdntEKwXZjtURdmfSZJdQh9pV6FO7UHioMTSbU3290/MaHeNm7SnmeSjodT\nVhSE9O8mXgpiofQAfj9ebv9VKLo55mDh+f/wVzSLRgxgsyKHMnKTBGMCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'
 FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: "false"
diff --git a/ansible/host_vars/ref-nbc/version.yml b/ansible/host_vars/ref-nbc/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/host_vars/ref-thr/version.yml b/ansible/host_vars/ref-thr/version.yml
@@ -1,11 +1,11 @@
-SCHULCLOUD_SERVER_IMAGE_TAG: 32.49.1
-SCHULCLOUD_CLIENT_IMAGE_TAG: 32.49.0
-NUXT_CLIENT_IMAGE_TAG: 32.49.0
-SUPERHERO_DASHBOARD_IMAGE_TAG: 32.49.0
-SHD_CLIENT_IMAGE_TAG: 1.0.1
-SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.49.0
-ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.49.0
-VERSION_AGGREGATOR_IMAGE_TAG: 1.0.17
+SCHULCLOUD_SERVER_IMAGE_TAG: 32.50.3
+SCHULCLOUD_CLIENT_IMAGE_TAG: 32.50.0
+NUXT_CLIENT_IMAGE_TAG: 32.50.0
+SUPERHERO_DASHBOARD_IMAGE_TAG: 32.50.0
+SHD_CLIENT_IMAGE_TAG: 32.50.0
+SCHULCLOUD_CALENDAR_IMAGE_TAG: 32.50.0
+ANTIVIRUS_CHECK_SERVICE_IMAGE_TAG: 32.50.0
+VERSION_AGGREGATOR_IMAGE_TAG: 32.50.0
 H5P_STATICFILES_SERVER_IMAGE_TAG: 1.0.11
-TLDRAW_CLIENT_IMAGE_TAG: 1.1.3
-TLDRAW_SERVER_IMAGE_TAG: 32.49.0
+TLDRAW_CLIENT_IMAGE_TAG: 32.50.0
+TLDRAW_SERVER_IMAGE_TAG: 32.50.0
diff --git a/ansible/roles/mongodb_query_exporter/templates/values.yml.j2 b/ansible/roles/mongodb_query_exporter/templates/values.yml.j2
@@ -927,14 +927,25 @@ aggregations:
       value: count
       overrideEmpty: true
       emptyValue: 0
-      labels: []
+      labels:
+        - type
       constLabels:
         mongodb_collection: news
         longterm: 'true'
-    mode: pull
     pipeline: |
       [
-        { "$count" : "count" }
+        {
+          "$group": {
+              "_id": "$targetModel",
+              "groupCount": { "$sum": 1 }
+          }
+        },
+        {
+          "$project": {
+            "type": "$_id",
+            "groupCount": 1
+          }
+        }
       ]
 
   - database: {{ mongodb_query_exporter_mongodb_sc_db_name }}