From 16d881d047502cad1e0c48b428607ebdd81c4c0e Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Thu, 3 Jul 2025 12:41:00 +0200
Subject: [PATCH 01/21] Fix url

---
 .github/workflows/klass-forvaltning-build-and-deploy.yaml       | 1 +
 .../src/main/resources/application-remote-solr.properties       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/klass-forvaltning-build-and-deploy.yaml b/.github/workflows/klass-forvaltning-build-and-deploy.yaml
index 8f7fc217..6d309094 100644
--- a/.github/workflows/klass-forvaltning-build-and-deploy.yaml
+++ b/.github/workflows/klass-forvaltning-build-and-deploy.yaml
@@ -4,6 +4,7 @@ on:
   release:
     types: [ published ]
   push:
+    pull_request:
     branches:
       - nais-migration
     paths:
diff --git a/klass-forvaltning/src/main/resources/application-remote-solr.properties b/klass-forvaltning/src/main/resources/application-remote-solr.properties
index 2eb60c00..915a408f 100644
--- a/klass-forvaltning/src/main/resources/application-remote-solr.properties
+++ b/klass-forvaltning/src/main/resources/application-remote-solr.properties
@@ -1,4 +1,4 @@
-klass.env.search.solr.url=http://klass-solr/solr/Klass
+klass.env.search.solr.url=http://klass-solr/solr
 klass.env.search.solr.core=Klass
 
 

From 5c73b52b1a56c2ad5dd3042a3923470d4a71b437 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Thu, 3 Jul 2025 12:42:21 +0200
Subject: [PATCH 02/21] Deploy

---
 .github/workflows/klass-forvaltning-build-and-deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/klass-forvaltning-build-and-deploy.yaml b/.github/workflows/klass-forvaltning-build-and-deploy.yaml
index 6d309094..f96150c7 100644
--- a/.github/workflows/klass-forvaltning-build-and-deploy.yaml
+++ b/.github/workflows/klass-forvaltning-build-and-deploy.yaml
@@ -1,10 +1,10 @@
 name: Klass-forvaltning build and deploy
 
 on:
+  pull_request:
   release:
     types: [ published ]
   push:
-    pull_request:
     branches:
       - nais-migration
     paths:

From 46cae11a1738e4112455ed7bbf89cea17cc613d3 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Thu, 3 Jul 2025 13:05:21 +0200
Subject: [PATCH 03/21] Use spring data solr config

---
 .nais/test/klass-forvaltning.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index 9e776144..fe3bcf35 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -38,6 +38,8 @@ spec:
       value: klass-forvaltning.intern.test.ssb.no
     - name: KLASS_SECURITY_OAUTH2_LOGOUT_PATH
       value: /oauth2/logout
+    - name: SPRING_DATA_SOLR_HOST
+      value: http://klass-solr/solr
   envFrom:
     - secret: google-sql-klass
     - secret: klass-forvaltning-application-properties

From d8fe518b02cfd6750c90f4fe1ad661a81b0ecfd5 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Thu, 3 Jul 2025 13:30:16 +0200
Subject: [PATCH 04/21] Testing removing solr form host

---
 .nais/test/klass-api.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nais/test/klass-api.yaml b/.nais/test/klass-api.yaml
index 62cbba8e..a469999f 100644
--- a/.nais/test/klass-api.yaml
+++ b/.nais/test/klass-api.yaml
@@ -32,7 +32,7 @@ spec:
     - name: SPRING_PROFILES_ACTIVE
       value:  api, postgres, solr-remote, skip-indexing
     - name: SPRING_DATA_SOLR_HOST
-      value: http://klass-solr/solr
+      value: http://klass-solr
 
   accessPolicy:
     outbound:

From 7bc0fa7aff55f307243c3ee857a5382272980f67 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Thu, 3 Jul 2025 13:30:34 +0200
Subject: [PATCH 05/21] Testing removing solr form host

---
 .nais/test/klass-api.yaml         | 2 +-
 .nais/test/klass-forvaltning.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.nais/test/klass-api.yaml b/.nais/test/klass-api.yaml
index a469999f..62cbba8e 100644
--- a/.nais/test/klass-api.yaml
+++ b/.nais/test/klass-api.yaml
@@ -32,7 +32,7 @@ spec:
     - name: SPRING_PROFILES_ACTIVE
       value:  api, postgres, solr-remote, skip-indexing
     - name: SPRING_DATA_SOLR_HOST
-      value: http://klass-solr
+      value: http://klass-solr/solr
 
   accessPolicy:
     outbound:
diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index fe3bcf35..b34a4058 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -39,7 +39,7 @@ spec:
     - name: KLASS_SECURITY_OAUTH2_LOGOUT_PATH
       value: /oauth2/logout
     - name: SPRING_DATA_SOLR_HOST
-      value: http://klass-solr/solr
+      value: http://klass-solr
   envFrom:
     - secret: google-sql-klass
     - secret: klass-forvaltning-application-properties

From 08037e23571eab28cbf46e0bcf7f691a15738996 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Thu, 3 Jul 2025 13:43:23 +0200
Subject: [PATCH 06/21] Test more stuff

---
 .nais/test/klass-forvaltning.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index b34a4058..52a9462c 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -33,13 +33,13 @@ spec:
       memory: 2048Mi
   env:
     - name: SPRING_PROFILES_ACTIVE
-      value: frontend, postgres, small-import, skip-indexing, ad-offline, remote-solr
+      value: frontend, postgres, small-import, skip-indexing, ad-offline, solr-remote
     - name: KLASS_ENV_SERVER
       value: klass-forvaltning.intern.test.ssb.no
     - name: KLASS_SECURITY_OAUTH2_LOGOUT_PATH
       value: /oauth2/logout
     - name: SPRING_DATA_SOLR_HOST
-      value: http://klass-solr
+      value: http://klass-solr/solr
   envFrom:
     - secret: google-sql-klass
     - secret: klass-forvaltning-application-properties

From 324341f9ce348c8469673ce2e77403dc30861822 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Fri, 4 Jul 2025 10:12:37 +0200
Subject: [PATCH 07/21] Updated docker compose

---
 klass-shared/docker-compose.yaml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/klass-shared/docker-compose.yaml b/klass-shared/docker-compose.yaml
index da70a960..4fce9351 100644
--- a/klass-shared/docker-compose.yaml
+++ b/klass-shared/docker-compose.yaml
@@ -70,12 +70,12 @@ services:
     image: target-postgres-image:latest
     container_name: klass-api
     command: [ "java", "-Xms2g", "-Xmx4g", "-jar", "app.war" ]
-    profiles: [ search ]
+    profiles: [  ]
     depends_on:
       - solr
       - postgresql
     ports:
-      - "8083:8080"
+      - "8080:8080"
     mem_limit: 8g
     deploy:
       resources:
@@ -108,6 +108,27 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: klass
       POSTGRES_INSTANCE: postgresql
+  klass-forvaltning-search:
+    build:
+      context: ../klass-forvaltning
+      dockerfile: ../klass-forvaltning/Dockerfile
+    container_name: klass-forvaltning
+    profiles: [ search ]
+    ports:
+      - "8081:8081"
+    depends_on:
+      - postgresql
+    command: [ "java", "-XshowSettings:vm", "-Xms512m", "-Xmx2g", "-jar", "app.war" ]
+    deploy:
+      resources:
+        limits:
+          memory: 3G
+    environment:
+      SPRING_PROFILES_ACTIVE: frontend, hardcoded-user, postgres-local, ad-offline, small-import, skip-indexing
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_USER: klass
+      POSTGRES_INSTANCE: postgresql
+      SPRING_DATA_SOLR_HOST: http://solr:8983/solr/
   solr:
     image: klass-shared-solr:5.5.2
     container_name: solr

From f8649d5b6f7f963452dbb0a61b9d134a01d12084 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Fri, 4 Jul 2025 19:14:57 +0200
Subject: [PATCH 08/21] Updates for working search with forvaltning

---
 klass-forvaltning/pom.xml        |  2 +-
 klass-shared/docker-compose.yaml | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/klass-forvaltning/pom.xml b/klass-forvaltning/pom.xml
index 5f68c7da..2dd045e1 100644
--- a/klass-forvaltning/pom.xml
+++ b/klass-forvaltning/pom.xml
@@ -17,7 +17,7 @@
         <github.repository>statisticsnorway/klass</github.repository>
         <!-- Klass dependencies are built with support for Java 8 and Spring Boot 1.4.4.
              Newer versions are not supported -->
-        <klass-shared-version>2.2.3</klass-shared-version>
+        <klass-shared-version>2.2.4-SNAPSHOT</klass-shared-version>
         <klass-solr-version>2.1.7</klass-solr-version>
         <!-- Vaadin 7.7.17 was the last public open-source version of the Vaadin 7 framework.
              See https://vaadin.com/support/vaadin-7-extended-maintenance  -->
diff --git a/klass-shared/docker-compose.yaml b/klass-shared/docker-compose.yaml
index 4fce9351..876b32c4 100644
--- a/klass-shared/docker-compose.yaml
+++ b/klass-shared/docker-compose.yaml
@@ -70,7 +70,7 @@ services:
     image: target-postgres-image:latest
     container_name: klass-api
     command: [ "java", "-Xms2g", "-Xmx4g", "-jar", "app.war" ]
-    profiles: [  ]
+    profiles: [ search ]
     depends_on:
       - solr
       - postgresql
@@ -83,11 +83,13 @@ services:
           cpus: "1.0"
           memory: 8G
     environment:
-      SPRING_PROFILES_ACTIVE: "api,postgres-local,small-import"
+      SPRING_PROFILES_ACTIVE: "api,small-import, h2-inmemory"
       SPRING_DATA_SOLR_HOST: http://solr:8983/solr
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: "klass"
       POSTGRES_INSTANCE: postgresql
+      KLASS_ENV_SEARCH_SOLR_URL: http://solr:8983/solr/
+      KLASS_ENV_SEARCH_SOLR_CORE: Klass
   klass-forvaltning:
     build:
       context: ../klass-forvaltning
@@ -124,11 +126,13 @@ services:
         limits:
           memory: 3G
     environment:
-      SPRING_PROFILES_ACTIVE: frontend, hardcoded-user, postgres-local, ad-offline, small-import, skip-indexing
+      SPRING_PROFILES_ACTIVE: frontend, hardcoded-user, postgres-local, ad-offline, small-import, remote-solr, skip-indexing
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: klass
       POSTGRES_INSTANCE: postgresql
       SPRING_DATA_SOLR_HOST: http://solr:8983/solr/
+      KLASS_ENV_SEARCH_SOLR_URL: http://solr:8983/solr/
+      KLASS_ENV_SEARCH_SOLR_CORE: Klass
   solr:
     image: klass-shared-solr:5.5.2
     container_name: solr

From c0a5d89b8f53c216f93e2b08ded57e637fab9f79 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Mon, 7 Jul 2025 11:19:50 +0200
Subject: [PATCH 09/21] Update to newest version of klass shared

---
 klass-forvaltning/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/klass-forvaltning/pom.xml b/klass-forvaltning/pom.xml
index 2dd045e1..9876e3bb 100644
--- a/klass-forvaltning/pom.xml
+++ b/klass-forvaltning/pom.xml
@@ -17,7 +17,7 @@
         <github.repository>statisticsnorway/klass</github.repository>
         <!-- Klass dependencies are built with support for Java 8 and Spring Boot 1.4.4.
              Newer versions are not supported -->
-        <klass-shared-version>2.2.4-SNAPSHOT</klass-shared-version>
+        <klass-shared-version>2.2.4</klass-shared-version>
         <klass-solr-version>2.1.7</klass-solr-version>
         <!-- Vaadin 7.7.17 was the last public open-source version of the Vaadin 7 framework.
              See https://vaadin.com/support/vaadin-7-extended-maintenance  -->

From 208a884b1154f314586c8173adcc80b280a08117 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Mon, 7 Jul 2025 11:21:20 +0200
Subject: [PATCH 10/21] Remove unused profile

---
 .nais/test/klass-forvaltning.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index 52a9462c..0a9bec8a 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -33,7 +33,7 @@ spec:
       memory: 2048Mi
   env:
     - name: SPRING_PROFILES_ACTIVE
-      value: frontend, postgres, small-import, skip-indexing, ad-offline, solr-remote
+      value: frontend, postgres, small-import, skip-indexing, ad-offline
     - name: KLASS_ENV_SERVER
       value: klass-forvaltning.intern.test.ssb.no
     - name: KLASS_SECURITY_OAUTH2_LOGOUT_PATH

From d17332e5e3e7949fdba9324e6afd56f7959139de Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Mon, 7 Jul 2025 17:00:38 +0200
Subject: [PATCH 11/21] Test simple logback file

---
 .../src/main/resources/logback-spring.xml     | 32 ++-----------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/klass-forvaltning/src/main/resources/logback-spring.xml b/klass-forvaltning/src/main/resources/logback-spring.xml
index c9b49147..d0287e1d 100644
--- a/klass-forvaltning/src/main/resources/logback-spring.xml
+++ b/klass-forvaltning/src/main/resources/logback-spring.xml
@@ -1,38 +1,10 @@
 <configuration>
-
-    <contextName>klass-forvaltning</contextName>
-
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <providers>
-                <timestamp />
-                <contextName />
-                <loggerName />
-                <logLevel />
-                <message />
-                <arguments/>
-            </providers>
-        </encoder>
-    </appender>
-
-    <appender name="HTTP_ACCESS_LOGGER_STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>
-                {"@timestamp":"%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}","httpRequest":%message,"logger":"%logger","severity":"%level","thread":"%thread"}%n
-            </pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-
-    <logger name="HTTP_ACCESS_LOGGER" level="info" additivity="false">
-        <appender-ref ref="HTTP_ACCESS_LOGGER_STDOUT"/>
-    </logger>
-
-    <logger name="org.springframework.boot.actuate.endpoint.mvc.HealthMvcEndpoint" level="DEBUG">
-        <appender-ref ref="STDOUT"/>
-    </logger>
-
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
-
-</configuration>
+</configuration>
\ No newline at end of file

From 6d0628f5803116c022c2b741628e76466754898a Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Mon, 7 Jul 2025 17:14:43 +0200
Subject: [PATCH 12/21] New envs

---
 .nais/test/klass-forvaltning.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index 0a9bec8a..4ad4f958 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -40,6 +40,10 @@ spec:
       value: /oauth2/logout
     - name: SPRING_DATA_SOLR_HOST
       value: http://klass-solr/solr
+    - name: KLASS_ENV_SEARCH_SOLR_URL
+      value: http://solr:8983/solr/
+    - name: KLASS_ENV_SEARCH_SOLR_CORE
+      value: Klass
   envFrom:
     - secret: google-sql-klass
     - secret: klass-forvaltning-application-properties

From 9d68a2bc8240b6fb7482d7fe03d0c65b171a655f Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Mon, 7 Jul 2025 20:43:44 +0200
Subject: [PATCH 13/21] Test disable management

---
 .nais/test/klass-forvaltning.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index 4ad4f958..ebe96e29 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -44,6 +44,9 @@ spec:
       value: http://solr:8983/solr/
     - name: KLASS_ENV_SEARCH_SOLR_CORE
       value: Klass
+    - name: MANAGEMENT_HEALTH_SOLR_ENABLED
+      value: "false"
+
   envFrom:
     - secret: google-sql-klass
     - secret: klass-forvaltning-application-properties

From 22ede2143904c4183bdb3d4c504804a985b3c723 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Tue, 8 Jul 2025 09:57:54 +0200
Subject: [PATCH 14/21] Fix url

---
 .nais/test/klass-forvaltning.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index ebe96e29..43e414e2 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -41,7 +41,7 @@ spec:
     - name: SPRING_DATA_SOLR_HOST
       value: http://klass-solr/solr
     - name: KLASS_ENV_SEARCH_SOLR_URL
-      value: http://solr:8983/solr/
+      value: http://klass-solr/solr/
     - name: KLASS_ENV_SEARCH_SOLR_CORE
       value: Klass
     - name: MANAGEMENT_HEALTH_SOLR_ENABLED

From bfd6e1bc6159077b16d08864446af43b38b540d0 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Tue, 8 Jul 2025 10:59:20 +0200
Subject: [PATCH 15/21] Update shared version

---
 klass-forvaltning/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/klass-forvaltning/pom.xml b/klass-forvaltning/pom.xml
index 79aa34aa..930061ae 100644
--- a/klass-forvaltning/pom.xml
+++ b/klass-forvaltning/pom.xml
@@ -17,7 +17,7 @@
         <github.repository>statisticsnorway/klass</github.repository>
         <!-- Klass dependencies are built with support for Java 8 and Spring Boot 1.4.4.
              Newer versions are not supported -->
-        <klass-shared-version>2.2.4</klass-shared-version>
+        <klass-shared-version>2.2.5</klass-shared-version>
         <klass-solr-version>2.1.7</klass-solr-version>
         <!-- Vaadin 7.7.17 was the last public open-source version of the Vaadin 7 framework.
              See https://vaadin.com/support/vaadin-7-extended-maintenance  -->

From 773cbc3c06372666a5a6ffc6e74b675008de1206 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Tue, 8 Jul 2025 13:35:19 +0200
Subject: [PATCH 16/21] Update url

---
 .nais/test/klass-forvaltning.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index 43e414e2..b8d45570 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -39,7 +39,7 @@ spec:
     - name: KLASS_SECURITY_OAUTH2_LOGOUT_PATH
       value: /oauth2/logout
     - name: SPRING_DATA_SOLR_HOST
-      value: http://klass-solr/solr
+      value: http://klass-solr/solr/
     - name: KLASS_ENV_SEARCH_SOLR_URL
       value: http://klass-solr/solr/
     - name: KLASS_ENV_SEARCH_SOLR_CORE

From 427088b99e2d8dde975053bcc6fc5077fd29b31d Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Tue, 8 Jul 2025 13:47:09 +0200
Subject: [PATCH 17/21] Remove core

---
 .nais/test/klass-forvaltning.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index b8d45570..f11858d0 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -33,7 +33,7 @@ spec:
       memory: 2048Mi
   env:
     - name: SPRING_PROFILES_ACTIVE
-      value: frontend, postgres, small-import, skip-indexing, ad-offline
+      value: frontend, postgres, small-import, skip-indexing, ad-offline, remote-solr
     - name: KLASS_ENV_SERVER
       value: klass-forvaltning.intern.test.ssb.no
     - name: KLASS_SECURITY_OAUTH2_LOGOUT_PATH
@@ -42,8 +42,6 @@ spec:
       value: http://klass-solr/solr/
     - name: KLASS_ENV_SEARCH_SOLR_URL
       value: http://klass-solr/solr/
-    - name: KLASS_ENV_SEARCH_SOLR_CORE
-      value: Klass
     - name: MANAGEMENT_HEALTH_SOLR_ENABLED
       value: "false"
 

From f9fbf18ea75fec91c7132b0caf2a4a32529a1324 Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Tue, 8 Jul 2025 14:09:37 +0200
Subject: [PATCH 18/21] New logback file

---
 .../src/main/resources/logback-spring.xml     | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/klass-forvaltning/src/main/resources/logback-spring.xml b/klass-forvaltning/src/main/resources/logback-spring.xml
index d0287e1d..7f36795e 100644
--- a/klass-forvaltning/src/main/resources/logback-spring.xml
+++ b/klass-forvaltning/src/main/resources/logback-spring.xml
@@ -1,10 +1,26 @@
 <configuration>
+
+    <contextName>klass-forvaltning</contextName>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n</pattern>
+        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <timestamp />
+                <contextName />
+                <loggerName />
+                <logLevel />
+                <message />
+                <arguments/>
+            </providers>
         </encoder>
     </appender>
+
+    <logger name="org.springframework.boot.actuate.endpoint.mvc.HealthMvcEndpoint" level="DEBUG">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>
+
 </configuration>
\ No newline at end of file

From 70ae55dbe660656d486027c2a17697a8b52402aa Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Tue, 8 Jul 2025 14:22:28 +0200
Subject: [PATCH 19/21] Fix github actions

---
 .github/workflows/klass-forvaltning-build-and-deploy.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/klass-forvaltning-build-and-deploy.yaml b/.github/workflows/klass-forvaltning-build-and-deploy.yaml
index f96150c7..8f7fc217 100644
--- a/.github/workflows/klass-forvaltning-build-and-deploy.yaml
+++ b/.github/workflows/klass-forvaltning-build-and-deploy.yaml
@@ -1,7 +1,6 @@
 name: Klass-forvaltning build and deploy
 
 on:
-  pull_request:
   release:
     types: [ published ]
   push:

From 62ab8c461fcbf1d2c866165f0ff276e28942fb2c Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Tue, 8 Jul 2025 14:23:10 +0200
Subject: [PATCH 20/21] Update manifest

---
 .nais/test/klass-forvaltning.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml
index f11858d0..6ef8fce3 100644
--- a/.nais/test/klass-forvaltning.yaml
+++ b/.nais/test/klass-forvaltning.yaml
@@ -42,9 +42,6 @@ spec:
       value: http://klass-solr/solr/
     - name: KLASS_ENV_SEARCH_SOLR_URL
       value: http://klass-solr/solr/
-    - name: MANAGEMENT_HEALTH_SOLR_ENABLED
-      value: "false"
-
   envFrom:
     - secret: google-sql-klass
     - secret: klass-forvaltning-application-properties

From 84a057bc273ca6787acad1fb1eeeba86d7fb554b Mon Sep 17 00:00:00 2001
From: Jorgen-5 <rlj@ssb.no>
Date: Tue, 8 Jul 2025 14:34:03 +0200
Subject: [PATCH 21/21] Change database

---
 klass-shared/docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/klass-shared/docker-compose.yaml b/klass-shared/docker-compose.yaml
index 876b32c4..cbe29901 100644
--- a/klass-shared/docker-compose.yaml
+++ b/klass-shared/docker-compose.yaml
@@ -83,7 +83,7 @@ services:
           cpus: "1.0"
           memory: 8G
     environment:
-      SPRING_PROFILES_ACTIVE: "api,small-import, h2-inmemory"
+      SPRING_PROFILES_ACTIVE: "api,small-import,postgres-local"
       SPRING_DATA_SOLR_HOST: http://solr:8983/solr
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: "klass"