Merge branch 'develop'

ls1intum · Jan 11, 2024 · 48b71e2 · 48b71e2
2 parents 04c3874 + 4588b15
commit 48b71e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/de/tum/cit/ase/service/PrometheusService.java b/src/main/java/de/tum/cit/ase/service/PrometheusService.java
@@ -47,7 +47,7 @@ public PrometheusService(ArtemisConfiguration artemisConfiguration) {
      * @return A list of CPU usage values. An empty list if no Prometheus instance is configured for Artemis.
      */
     public List<MetricValue> getCpuUsageArtemis(SimulationRun run) {
-        log.info("Getting Artemis CPU usage for {}", run);
+        log.debug("Getting Artemis CPU usage for {}", run);
         var instance = artemisConfiguration.getPrometheusInstanceArtemis(run.getSimulation().getServer());
         if (instance == null || instance.isBlank()) {
             log.warn("No Prometheus instance configured for Artemis on {}", run.getSimulation().getServer());
@@ -62,7 +62,7 @@ public List<MetricValue> getCpuUsageArtemis(SimulationRun run) {
      * @return A list of CPU usage values. An empty list if no Prometheus instance is configured for the VCS.
      */
     public List<MetricValue> getCpuUsageVcs(SimulationRun run) {
-        log.info("Getting VCS CPU usage for {}", run);
+        log.debug("Getting VCS CPU usage for {}", run);
         var instance = artemisConfiguration.getPrometheusInstanceVcs(run.getSimulation().getServer());
         if (instance == null || instance.isBlank()) {
             log.warn("No Prometheus instance configured for VCS on {}", run.getSimulation().getServer());

diff --git a/src/main/java/de/tum/cit/ase/service/artemis/interaction/SimulatedArtemisAdmin.java b/src/main/java/de/tum/cit/ase/service/artemis/interaction/SimulatedArtemisAdmin.java
@@ -468,7 +468,7 @@ public void deleteExam(long courseId, long examId) {
     public List<DomainObject> getBuildQueue(long courseId) {
         return webClient
             .get()
-            .uri(uriBuilder -> uriBuilder.pathSegment("api", "build-job-queue", "queued", String.valueOf(courseId)).build())
+            .uri(uriBuilder -> uriBuilder.pathSegment("api", "courses", String.valueOf(courseId), "queued-jobs").build())
             .retrieve()
             .bodyToFlux(DomainObject.class)
             .collectList()

diff --git a/src/main/webapp/app/simulations/simulations-overview/simulations-overview.component.scss b/src/main/webapp/app/simulations/simulations-overview/simulations-overview.component.scss
@@ -1,5 +1,5 @@
 .accordion-wrapper {
-  @media (min-width: 1200px) {
+  @media (min-width: 1400px) {
     display: flex;
     .log-accordion {
       width: 75%;