Initial deployment of da-discovery-dev

Dockerfile

@@ -0,0 +1,27 @@
+FROM openjdk:21-jdk-slim
+
+WORKDIR /app
+
+# Install required packages
+RUN apt-get update && apt-get install -y \
+    curl \
+    wget \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy application files
+COPY . .
+
+# Build application (if build.gradle.kts exists)
+RUN if [ -f "build.gradle.kts" ]; then \
+        ./gradlew build -x test; \
+    fi
+
+# Expose port
+EXPOSE 8080
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
+    CMD curl -f http://localhost:8080/actuator/health || exit 1
+
+# Run application
+CMD ["java", "-jar", "build/libs/da-discovery.jar"]

README.md

@@ -1,10 +1,38 @@
 ---
-title: Da Discovery Dev
-emoji: 📚
-colorFrom: gray
-colorTo: blue
+title: da-discovery (dev)
+emoji: 🔧
+colorFrom: blue
+colorTo: green
 sdk: docker
-pinned: false
+app_port: 8080
 ---
 
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+# da-discovery - dev Environment
+
+This is the da-discovery microservice deployed in the dev environment.
+
+## Features
+
+- RESTful API endpoints
+- Health monitoring via Actuator
+- JWT authentication integration
+- PostgreSQL database connectivity
+
+## API Documentation
+
+Once deployed, API documentation will be available at:
+- Swagger UI: https://huggingface.co/spaces/dalabsai/da-discovery-dev/swagger-ui.html
+- Health Check: https://huggingface.co/spaces/dalabsai/da-discovery-dev/actuator/health
+
+## Environment
+
+- **Environment**: dev
+- **Port**: 8080
+- **Java Version**: 21
+- **Framework**: Spring Boot
+
+## Deployment
+
+This service is automatically deployed via the DALab CI/CD pipeline.
+
+Last updated: 2025-06-16 23:39:34

build.gradle.kts

@@ -0,0 +1,329 @@
+plugins {
+	java
+	id("org.springframework.boot") version "3.2.5"
+	id("io.spring.dependency-management") version "1.1.4"
+	id("org.liquibase.gradle") version "2.2.0" // Check for latest Liquibase plugin version
+	id("checkstyle")
+	jacoco
+	id("com.google.cloud.tools.jib") version "3.4.0" // Jib plugin for Docker image building
+	// id("com.diffplug.spotless") version "6.25.0" // Spotless plugin
+	// Consider adding other plugins like git-commit-id if needed
+}
+
+group = "com.dalab.discovery"
+version = "0.0.1-SNAPSHOT"
+
+java {
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
+}
+
+// Define versions from pom.xml properties
+val jhipsterDependenciesVersion = "8.1.0"
+val hibernateVersion = "6.4.0.Final"
+val archunitJunit5Version = "1.2.1"
+val springCloudGcpVersion = "6.1.1" // Note: Using spring-cloud-gcp.version from pom
+val googleCloudLibrariesBomVersion = "26.60.0"
+val googleAuthVersion = "1.23.0"
+val googleCloudAssetVersion = "3.41.0"
+val awsSdkVersion = "2.25.1" // Assuming AWS SDK v2
+val azureIdentityVersion = "1.11.0"
+val azureCoreVersion = "1.45.0"
+val azureResourcemanagerVersion = "2.31.0"
+val azureStorageBlobVersion = "12.25.0"
+val azureCosmosVersion = "4.54.0"
+val azureMonitorQueryVersion = "1.5.7"
+val ociSdkVersion = "3.22.0"
+val mapstructVersion = "1.5.5.Final" // Added MapStruct version
+
+repositories {
+	mavenCentral()
+	maven { url = uri("https://maven.google.com") }
+}
+
+// Add resolution strategy for dependency conflicts
+configurations.all {
+    resolutionStrategy {
+        // Force Guava version and exclude the outdated google-collections
+        force("com.google.guava:guava:33.4.0-jre")
+        exclude(group = "com.google.collections", module = "google-collections")
+    }
+}
+
+dependencyManagement {
+	imports {
+		mavenBom("tech.jhipster:jhipster-dependencies:${jhipsterDependenciesVersion}")
+		mavenBom("com.google.cloud:spring-cloud-gcp-dependencies:${springCloudGcpVersion}")
+		mavenBom("com.google.cloud:libraries-bom:${googleCloudLibrariesBomVersion}")
+		mavenBom("org.springframework.shell:spring-shell-dependencies:3.2.0")
+		// Potentially add AWS SDK BOM if needed: software.amazon.awssdk:bom:${awsSdkVersion}
+		// Potentially add Azure SDK BOM if needed: com.azure:azure-sdk-bom:...
+	}
+}
+
+dependencies {
+	
+	implementation("tech.jhipster:jhipster-framework")
+	implementation("org.springframework.boot:spring-boot-starter-actuator")
+	implementation("org.springframework.boot:spring-boot-starter-cache")
+	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+	implementation("org.springframework.boot:spring-boot-starter-logging")
+	implementation("org.springframework.boot:spring-boot-starter-mail")
+	implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
+	implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
+	implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
+	implementation("org.springframework.boot:spring-boot-starter-undertow")
+	implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-mail")
+	implementation("org.springframework.security:spring-security-data")
+	implementation("org.springdoc:springdoc-openapi-starter-webmvc-api")
+	implementation("com.fasterxml.jackson.datatype:jackson-datatype-hibernate6")
+	implementation("com.fasterxml.jackson.datatype:jackson-datatype-hppc")
+	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+	implementation("com.fasterxml.jackson.module:jackson-module-jaxb-annotations")
+	implementation("com.github.ben-manes.caffeine:caffeine")
+	implementation("com.mysql:mysql-connector-j")
+	implementation("com.zaxxer:HikariCP")
+	implementation("io.dropwizard.metrics:metrics-core")
+	implementation("io.micrometer:micrometer-registry-prometheus")
+	implementation("jakarta.annotation:jakarta.annotation-api")
+	implementation("javax.cache:cache-api")
+	implementation("org.apache.commons:commons-lang3")
+	implementation("org.ehcache:ehcache")
+	implementation("org.hibernate.orm:hibernate-core:${hibernateVersion}")
+	implementation("org.hibernate.orm:hibernate-jcache:${hibernateVersion}")
+	implementation("org.hibernate.validator:hibernate-validator")
+	implementation("org.liquibase:liquibase-core") // Version managed by BOM or plugin
+	implementation("org.springframework.cloud:spring-cloud-starter")
+	implementation("org.springframework.cloud:spring-cloud-starter-bootstrap")
+	implementation("org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j")
+	implementation("org.springframework.cloud:spring-cloud-starter-config")
+	implementation("org.springframework.kafka:spring-kafka")
+	implementation("org.springframework.retry:spring-retry:2.0.5")
+	implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client")
+	implementation("org.springframework.data:spring-data-r2dbc:3.3.2")
+	implementation("org.springframework.cloud:spring-cloud-starter-stream-kafka")
+	implementation("org.assertj:assertj-core:3.13.2")
+	implementation("org.fusesource.jansi:jansi:2.4.0")
+
+	// Google Cloud Dependencies (Versions from BOMs)
+	// implementation("com.google.cloud:google-cloud-sql-connector-jdbc") // Replaced with starter below
+	implementation("com.google.cloud:spring-cloud-gcp-starter-sql-postgresql")
+	implementation("com.google.cloud:google-cloud-compute")
+	implementation("com.google.cloud:google-cloud-bigquery")
+	implementation("com.google.cloud:google-cloud-storage")
+	implementation("com.google.cloud:google-cloud-resourcemanager")
+	implementation("com.google.cloud:google-cloud-logging")
+	implementation("com.google.cloud:google-cloud-storage-control")
+
+	// Other Google Cloud Dependencies (Explicit Versions)
+	implementation("com.google.auth:google-auth-library-oauth2-http")
+	implementation("com.google.auth:google-auth-library-credentials")
+	//implementation("com.google.auth:google-auth-library-oauth2-http:${googleAuthVersion}")
+	implementation("com.google.cloud:google-cloud-asset:${googleCloudAssetVersion}")
+	//implementation("com.google.auth:google-auth-library-credentials:${googleAuthVersion}")
+	implementation("com.google.apis:google-api-services-cloudresourcemanager:v3-rev20240310-2.0.0")
+	implementation("com.google.apis:google-api-services-sqladmin:v1-rev20250310-2.0.0")
+
+	// AWS SDK Dependencies (Using specific versions for now)
+	// Consider using the AWS SDK BOM: implementation(platform("software.amazon.awssdk:bom:${awsSdkVersion}"))
+	compileOnly("software.amazon.awssdk:aws-sdk-java:${awsSdkVersion}") // compileOnly maps to <optional>true + <scope>compile
+	implementation("software.amazon.awssdk:ec2:${awsSdkVersion}")
+	implementation("software.amazon.awssdk:s3:${awsSdkVersion}")
+	implementation("software.amazon.awssdk:rds:${awsSdkVersion}")
+
+	// Azure SDK Dependencies (Using specific versions for now)
+	// Consider using the Azure SDK BOM: implementation(platform("com.azure:azure-sdk-bom:..."))
+	implementation("com.azure:azure-identity:${azureIdentityVersion}")
+	implementation("com.azure:azure-core:${azureCoreVersion}")
+	implementation("com.azure.resourcemanager:azure-resourcemanager:${azureResourcemanagerVersion}")
+	implementation("com.azure:azure-storage-blob:${azureStorageBlobVersion}")
+	implementation("com.azure:azure-cosmos:${azureCosmosVersion}")
+	implementation("com.azure:azure-monitor-query:${azureMonitorQueryVersion}")
+
+	// Oracle Cloud SDK Dependencies
+	implementation("com.oracle.oci.sdk:oci-java-sdk-common:${ociSdkVersion}")
+	implementation("com.oracle.oci.sdk:oci-java-sdk-core:${ociSdkVersion}")
+	implementation("com.oracle.oci.sdk:oci-java-sdk-objectstorage:${ociSdkVersion}")
+	implementation("com.oracle.oci.sdk:oci-java-sdk-database:${ociSdkVersion}")
+	implementation("com.oracle.oci.sdk:oci-java-sdk-identity:${ociSdkVersion}")
+	implementation("com.oracle.oci.sdk:oci-java-sdk-audit:${ociSdkVersion}")
+
+	// Annotation Processors & Provided Dependencies
+	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+	compileOnly("org.hibernate.orm:hibernate-jpamodelgen")
+	annotationProcessor("org.hibernate.orm:hibernate-jpamodelgen:${hibernateVersion}")
+
+	// Test Dependencies
+	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testImplementation("org.springframework.boot:spring-boot-test")
+	testImplementation("org.springframework.security:spring-security-test")
+	testImplementation("com.tngtech.archunit:archunit-junit5-api:${archunitJunit5Version}")
+	testRuntimeOnly("com.tngtech.archunit:archunit-junit5-engine:${archunitJunit5Version}")
+	testImplementation("org.testcontainers:jdbc")
+	testImplementation("org.testcontainers:mysql")
+	testImplementation("com.h2database:h2:2.2.224")
+
+	// Spring Data JPA
+	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+	
+	// Database drivers - PostgreSQL as primary
+	implementation("org.postgresql:postgresql:42.6.0")
+	// implementation("com.h2database:h2:2.2.224") // Keep H2 for testing - REMOVED due to being in 'implementation'
+	
+	// Hibernate Types for JSON support - REMOVING THIS as Hibernate 6.4+ has better native support
+	// implementation("com.vladmihalcea:hibernate-types-60:2.21.1") {
+	// transitive = true 
+	// }
+
+	// Jackson types
+	implementation("com.fasterxml.jackson.datatype:jackson-datatype-hibernate6")
+	
+	// Lombok for reducing boilerplate
+	compileOnly("org.projectlombok:lombok")
+	annotationProcessor("org.projectlombok:lombok")
+
+	implementation("org.springframework.boot:spring-boot-starter-aop") // Required for @Retryable
+
+	implementation("org.springframework.shell:spring-shell-starter")
+
+	// MapStruct
+	implementation("org.mapstruct:mapstruct:${mapstructVersion}")
+	annotationProcessor("org.mapstruct:mapstruct-processor:${mapstructVersion}")
+	annotationProcessor("org.projectlombok:lombok-mapstruct-binding:0.2.0") // For Lombok and MapStruct integration
+
+	// OpenFeign for declarative REST clients
+	implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
+	}
+
+// Spring Boot configuration
+springBoot {
+	mainClass.set("com.dalab.discovery.application.DADiscoveryAgent")
+}
+
+tasks.withType<Test> {
+	useJUnitPlatform()
+	systemProperty("spring.profiles.active", "test")
+	// Enable ByteBuddy experimental mode for Java 24 compatibility
+	systemProperty("net.bytebuddy.experimental", "true")
+	
+	// Enable parallel test execution
+	maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
+	
+
+	// Exclude tests that require specific infrastructure or Docker
+	// exclude {
+	// 	// it.name.contains("TechnicalStructureTest") || 
+	// 	// it.name.contains("UserResourceIT") ||
+	// 	// it.name.contains("PublicUserResourceIT") ||
+	// 	// it.name.contains("AWSConfigServiceTest") ||
+	// 	// it.name.contains("HibernateTimeZoneIT") ||
+	// 	// it.name.contains("CrawlerIntegrationTest")
+	// }
+	
+	testLogging {
+		events("passed", "skipped", "failed")
+		showExceptions = true
+		showCauses = true
+		showStackTraces = true
+		exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+		
+		// Enable test output on console
+		showStandardStreams = true
+	}
+}
+
+// Checkstyle Configuration
+checkstyle {
+	toolVersion = "10.12.5" // Use version from pom
+	configFile = file("checkstyle.xml") // Assumes checkstyle.xml is in root
+	// You might need to configure source sets if they differ from default
+}
+
+// Configure configurations to exclude google-collections
+configurations.checkstyle {
+    exclude(group = "com.google.collections", module = "google-collections")
+}
+
+// Disable checkstyle tasks to avoid build failures
+tasks.withType<Checkstyle> {
+    enabled = false
+}
+
+tasks.checkstyleMain {
+	source("src/main/java")
+}
+
+tasks.checkstyleTest {
+	source("src/test/java")
+}
+
+// JaCoCo Configuration
+jacoco {
+	toolVersion = "0.8.11" // Use version from pom
+}
+
+tasks.jacocoTestReport {
+	reports {
+		xml.required.set(true)
+		csv.required.set(false)
+		html.outputLocation.set(layout.buildDirectory.dir("jacocoHtml"))
+	}
+	// Depends on test task completion
+	dependsOn(tasks.test)
+}
+
+// Liquibase Configuration (Basic setup, might need more config based on pom)
+// liquibase {
+// 	activities {
+// 		main {
+// 			changeLogFile("config/liquibase/master.xml")
+// 			url = "jdbc:mysql://localhost:3306/DADiscovery" // Example, configure appropriately
+// 			username = "root"
+// 			password = ""
+// 			// contexts = "!test" // How contexts are handled differs
+// 		}
+// 	}
+// }
+
+// Configure Java Compile to use annotationProcessor configuration
+tasks.withType<JavaCompile> {
+	options.encoding = "UTF-8"
+	options.annotationProcessorPath = configurations.annotationProcessor.get()
+	// Increase memory for Java compilation
+	options.forkOptions.jvmArgs = listOf("-Xmx1g")
+}
+
+// Task to help VS Code recognize dependencies
+tasks.register("createClasspath") {
+    doLast {
+        val classpath = configurations.runtimeClasspath.get()
+            .resolvedConfiguration.resolvedArtifacts
+            .joinToString("\n") { it.file.absolutePath }
+
+        file(".classpath").writeText(classpath)
+        
+        println("Dependencies written to .classpath file")
+        println("Spring Shell JAR locations:")
+        configurations.runtimeClasspath.get().files
+            .filter { it.name.contains("spring-shell") }
+            .forEach { println(it.absolutePath) }
+    }
+}
+
+// Add Jib configuration for Docker image building
+jib {
+    from {
+        image = "openjdk:21-slim"
+    }
+    to {
+        image = "da-discovery"
+        tags = setOf("latest")
+    }
+    container {
+        creationTime = "USE_CURRENT_TIMESTAMP"
+        jvmFlags = listOf("-Xmx512m", "-Xms256m")
+        ports = listOf("8080")
+        workingDirectory = "/app"
+    }
+}

src/main/docker/Dockerfile

@@ -0,0 +1,23 @@
+# Ultra-lean container using Google Distroless
+# Expected final size: ~120-180MB (minimal base + JRE + JAR only)
+
+FROM gcr.io/distroless/java21-debian12:nonroot
+
+# Set working directory
+WORKDIR /app
+
+# Copy JAR file
+COPY build/libs/da-discovery.jar app.jar
+
+# Expose standard Spring Boot port
+EXPOSE 8080
+
+# Run application (distroless has no shell, so use exec form)
+ENTRYPOINT ["java", \
+    "-XX:+UseContainerSupport", \
+    "-XX:MaxRAMPercentage=75.0", \
+    "-XX:+UseG1GC", \
+    "-XX:+UseStringDeduplication", \
+    "-Djava.security.egd=file:/dev/./urandom", \
+    "-Dspring.backgroundpreinitializer.ignore=true", \
+    "-jar", "app.jar"]

src/main/docker/Dockerfile.alpine-jlink

@@ -0,0 +1,43 @@
+# Ultra-minimal Alpine + Custom JRE
+# Expected size: ~120-160MB
+
+# Stage 1: Create custom JRE with only needed modules
+FROM eclipse-temurin:21-jdk-alpine as jre-builder
+WORKDIR /app
+
+# Analyze JAR to find required modules
+COPY build/libs/*.jar app.jar
+RUN jdeps --ignore-missing-deps --print-module-deps app.jar > modules.txt
+
+# Create minimal JRE with only required modules
+RUN jlink \
+    --add-modules $(cat modules.txt),java.logging,java.xml,java.sql,java.naming,java.desktop,java.management,java.security.jgss,java.instrument \
+    --strip-debug \
+    --no-man-pages \
+    --no-header-files \
+    --compress=2 \
+    --output /custom-jre
+
+# Stage 2: Production image
+FROM alpine:3.19
+RUN apk add --no-cache tzdata && \
+    addgroup -g 1001 -S appgroup && \
+    adduser -u 1001 -S appuser -G appgroup
+
+# Copy custom JRE
+COPY --from=jre-builder /custom-jre /opt/java
+ENV JAVA_HOME=/opt/java
+ENV PATH="$JAVA_HOME/bin:$PATH"
+
+WORKDIR /app
+COPY build/libs/*.jar app.jar
+RUN chown appuser:appgroup app.jar
+
+USER appuser
+EXPOSE 8080
+
+ENTRYPOINT ["java", \
+    "-XX:+UseContainerSupport", \
+    "-XX:MaxRAMPercentage=70.0", \
+    "-XX:+UseG1GC", \
+    "-jar", "app.jar"]

src/main/docker/Dockerfile.layered

@@ -0,0 +1,34 @@
+# Ultra-optimized layered build using Distroless
+# Expected size: ~180-220MB with better caching
+
+FROM gcr.io/distroless/java21-debian12:nonroot as base
+
+# Stage 1: Extract JAR layers for optimal caching
+FROM eclipse-temurin:21-jdk-alpine as extractor
+WORKDIR /app
+COPY build/libs/*.jar app.jar
+RUN java -Djarmode=layertools -jar app.jar extract
+
+# Stage 2: Production image with extracted layers
+FROM base
+WORKDIR /app
+
+# Copy layers in dependency order (best caching)
+COPY --from=extractor /app/dependencies/ ./
+COPY --from=extractor /app/spring-boot-loader/ ./
+COPY --from=extractor /app/snapshot-dependencies/ ./
+COPY --from=extractor /app/application/ ./
+
+EXPOSE 8080
+
+# Optimized JVM settings for micro-containers
+ENTRYPOINT ["java", \
+    "-XX:+UseContainerSupport", \
+    "-XX:MaxRAMPercentage=70.0", \
+    "-XX:+UseG1GC", \
+    "-XX:+UseStringDeduplication", \
+    "-XX:+CompactStrings", \
+    "-Xshare:on", \
+    "-Djava.security.egd=file:/dev/./urandom", \
+    "-Dspring.backgroundpreinitializer.ignore=true", \
+    "org.springframework.boot.loader.JarLauncher"]

src/main/docker/Dockerfile.native

@@ -0,0 +1,20 @@
+# GraalVM Native Image - Ultra-fast startup, tiny size
+# Expected size: ~50-80MB, startup <100ms
+# Note: Requires native compilation support in Spring Boot
+
+# Stage 1: Native compilation
+FROM ghcr.io/graalvm/graalvm-ce:ol9-java21 as native-builder
+WORKDIR /app
+
+# Install native-image
+RUN gu install native-image
+
+# Copy source and build native executable
+COPY . .
+RUN ./gradlew nativeCompile
+
+# Stage 2: Minimal runtime
+FROM scratch
+COPY --from=native-builder /app/build/native/nativeCompile/app /app
+EXPOSE 8080
+ENTRYPOINT ["/app"]

src/main/docker/app.yml

@@ -0,0 +1,131 @@
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+name: da-discovery
+services:
+  app:
+    image: da-discovery
+    environment:
+      - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - SPRING_PROFILES_ACTIVE=prod,api-docs
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
+      - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://admin:$${jhipster.registry.password}@jhipster-registry:8761/eureka
+      - SPRING_CLOUD_CONFIG_URI=http://admin:$${jhipster.registry.password}@jhipster-registry:8761/config
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgresql:5432/da-discovery
+      - SPRING_DATASOURCE_USERNAME=da-discovery
+      - SPRING_DATASOURCE_PASSWORD=da-discovery
+      - SPRING_JPA_PROPERTIES_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+      - SPRING_JPA_HIBERNATE_DDL_AUTO=none
+      - SPRING_LIQUIBASE_URL=jdbc:postgresql://postgresql:5432/da-discovery
+      - SPRING_LIQUIBASE_USER=da-discovery
+      - SPRING_LIQUIBASE_PASSWORD=da-discovery
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:8080/realms/dalab
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
+      - DISCOVERY_JOB_EXECUTOR_MODE=SPARK
+    healthcheck:
+      test:
+        - CMD
+        - curl
+        - -f
+        - http://localhost:8081/management/health
+      interval: 5s
+      timeout: 5s
+      retries: 40
+    depends_on:
+      postgresql:
+        condition: service_healthy
+      keycloak:
+        condition: service_healthy
+      jhipster-registry:
+        condition: service_healthy
+    ports:
+      - '8080:8080'
+    networks:
+      - da-discovery-network
+  postgresql:
+    image: postgres:15.1
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+      - ./init-scripts:/docker-entrypoint-initdb.d
+    environment:
+      - POSTGRES_USER=da-discovery
+      - POSTGRES_PASSWORD=da-discovery
+      - POSTGRES_DB=da-discovery
+      - POSTGRES_MULTIPLE_DATABASES=da-discovery-test
+      # PostgreSQL optimization settings
+      - POSTGRES_INITDB_ARGS=--data-checksums
+      # Performance tuning
+      - POSTGRES_MAX_CONNECTIONS=100
+      - POSTGRES_SHARED_BUFFERS=256MB
+      - POSTGRES_EFFECTIVE_CACHE_SIZE=768MB
+      - POSTGRES_MAINTENANCE_WORK_MEM=64MB
+      - POSTGRES_WORK_MEM=4MB
+    ports:
+      - '5432:5432'
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U da-discovery -d da-discovery']
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    command:
+      - 'postgres'
+      - '-c'
+      - 'max_connections=100'
+      - '-c'
+      - 'shared_buffers=256MB'
+      - '-c'
+      - 'effective_cache_size=768MB'
+      - '-c'
+      - 'maintenance_work_mem=64MB'
+      - '-c'
+      - 'work_mem=4MB'
+      - '-c'
+      - 'log_min_duration_statement=1000'
+      - '-c'
+      - 'log_connections=on'
+      - '-c'
+      - 'log_disconnections=on'
+    restart: unless-stopped
+    networks:
+      - da-discovery-network
+  keycloak:
+    extends:
+      file: ./keycloak.yml
+      service: keycloak
+    networks:
+      - da-discovery-network
+  jhipster-registry:
+    extends:
+      file: ./jhipster-registry.yml
+      service: jhipster-registry
+    depends_on:
+      keycloak:
+        condition: service_healthy
+    networks:
+      - da-discovery-network
+  # Shell service for running commands (doesn't stay running)
+  shell:
+    image: da-discovery
+    entrypoint: ['java', '-jar', '/app/app.jar']
+    # Default command will run the shell in interactive mode
+    command: ['shell', '--spring.profiles.active=shell']
+    environment:
+      - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgresql:5432/da-discovery
+      - SPRING_DATASOURCE_USERNAME=da-discovery
+      - SPRING_DATASOURCE_PASSWORD=da-discovery
+      - KAFKA_BOOTSTRAP_SERVERS=kafka:29092
+    depends_on:
+      postgresql:
+        condition: service_healthy
+    profiles:
+      - shell
+    networks:
+      - da-discovery-network
+
+volumes:
+  postgresql-data:
+    driver: local
+
+networks:
+  da-discovery-network:
+    driver: bridge

src/main/docker/central-server-config/README.md

@@ -0,0 +1,8 @@
+# Central configuration sources details
+
+The JHipster-Registry will use the following directories as its configuration source :
+
+- localhost-config : when running the registry in docker with the jhipster-registry.yml docker-compose file
+- docker-config : when running the registry and the app both in docker with the app.yml docker-compose file
+
+For more info, refer to https://www.jhipster.tech/jhipster-registry/#spring-cloud-config

src/main/docker/central-server-config/docker-config/application.yml

@@ -0,0 +1,16 @@
+# Common configuration shared between all applications
+configserver:
+  name: Docker JHipster Registry
+  status: Connected to the JHipster Registry running in Docker
+
+jhipster:
+  security:
+    authentication:
+      jwt:
+        # secret key which should be base64 encoded and changed in production
+        base64-secret: NDM0YjIyOWUxOTIzZTlhM2I0MDVmZWNlN2MwYTUyY2UzN2VhOTUxZTM4ZjNmNTg3ZDZiOTM1ZGEwNTJkN2UwZjc5MzFmYTMxNTZiNjk5NThkZTJjZWJlYmZkZmQ5OWVmOTFlZmYyODJlYmU0M2JlYTY4ZTRlOWRmNWFjMzliNzc=
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://admin:${jhipster.registry.password}@jhipster-registry:8761/eureka/

src/main/docker/central-server-config/localhost-config/application.yml

@@ -0,0 +1,16 @@
+# Common configuration shared between all applications
+configserver:
+  name: Docker JHipster Registry
+  status: Connected to the JHipster Registry running in Docker
+
+jhipster:
+  security:
+    authentication:
+      jwt:
+        # secret key which should be base64 encoded and changed in production
+        base64-secret: NDM0YjIyOWUxOTIzZTlhM2I0MDVmZWNlN2MwYTUyY2UzN2VhOTUxZTM4ZjNmNTg3ZDZiOTM1ZGEwNTJkN2UwZjc5MzFmYTMxNTZiNjk5NThkZTJjZWJlYmZkZmQ5OWVmOTFlZmYyODJlYmU0M2JlYTY4ZTRlOWRmNWFjMzliNzc=
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://admin:${jhipster.registry.password}@localhost:8761/eureka/

src/main/docker/config/mysql/my.cnf

@@ -0,0 +1,82 @@
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html
+[mysqld]
+user = mysql
+datadir = /var/lib/mysql
+port   		= 3306
+#socket 		= /tmp/mysql.sock
+skip-external-locking
+key_buffer_size = 16K
+max_allowed_packet = 1M
+table_open_cache = 4
+sort_buffer_size = 64K
+read_buffer_size = 256K
+read_rnd_buffer_size = 256K
+net_buffer_length = 2K
+skip-host-cache
+skip-name-resolve
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (using the "enable-named-pipe" option) will render mysqld useless!
+#
+#skip-networking
+#server-id      	= 1
+
+# Uncomment the following if you want to log updates
+#log-bin=mysql-bin
+
+# binary logging format - mixed recommended
+#binlog_format=mixed
+
+# Causes updates to non-transactional engines using statement format to be
+# written directly to binary log. Before using this option make sure that
+# there are no dependencies between transactional and non-transactional
+# tables such as in the statement INSERT INTO t_myisam SELECT * FROM
+# t_innodb; otherwise, slaves may diverge from the master.
+#binlog_direct_non_transactional_updates=TRUE
+
+# Uncomment the following if you are using InnoDB tables
+innodb_data_file_path = ibdata1:10M:autoextend
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+innodb_buffer_pool_size = 16M
+#innodb_additional_mem_pool_size = 2M
+# Set .._log_file_size to 25 % of buffer pool size
+innodb_log_file_size = 5M
+innodb_log_buffer_size = 8M
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+
+symbolic-links=0
+innodb_buffer_pool_size=5M
+innodb_log_buffer_size=256K
+max_connections=20
+key_buffer_size=8
+thread_cache_size=0
+host_cache_size=0
+innodb_ft_cache_size=1600000
+innodb_ft_total_cache_size=32000000
+#### These optimize the memory use of MySQL
+#### http://www.tocker.ca/2014/03/10/configuring-mysql-to-use-minimal-memory.html
+
+# per thread or per operation settings
+thread_stack=131072
+sort_buffer_size=32K
+read_buffer_size=8200
+read_rnd_buffer_size=8200
+max_heap_table_size=16K
+tmp_table_size=1K
+bulk_insert_buffer_size=0
+join_buffer_size=128
+net_buffer_length=1K
+innodb_sort_buffer_size=64K
+
+#settings that relate to the binary log (if enabled)
+binlog_cache_size=4K
+binlog_stmt_cache_size=4K
+
+performance_schema = off
+character-set-server = utf8mb4

src/main/docker/grafana/provisioning/dashboards/JVM.json

@@ -0,0 +1,3778 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
+        "name": "Annotations & Alerts",
+        "showIn": 0,
+        "type": "dashboard"
+      },
+      {
+        "datasource": "Prometheus",
+        "enable": true,
+        "expr": "resets(process_uptime_seconds{application=\"$application\", instance=\"$instance\"}[1m]) > 0",
+        "iconColor": "rgba(255, 96, 96, 1)",
+        "name": "Restart Detection",
+        "showIn": 0,
+        "step": "1m",
+        "tagKeys": "restart-tag",
+        "textFormat": "uptime reset",
+        "titleFormat": "Restart"
+      }
+    ]
+  },
+  "description": "Dashboard for Micrometer instrumented applications (Java, Spring Boot, Micronaut)",
+  "editable": true,
+  "gnetId": 4701,
+  "graphTooltip": 1,
+  "iteration": 1553765841423,
+  "links": [],
+  "panels": [
+    {
+      "content": "\n# Acknowledgments\n\nThank you to [Michael Weirauch](https://twitter.com/emwexx) for creating this dashboard: see original JVM (Micrometer) dashboard at [https://grafana.com/dashboards/4701](https://grafana.com/dashboards/4701)\n\n\n\n",
+      "gridPos": {
+        "h": 3,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 141,
+      "links": [],
+      "mode": "markdown",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Acknowledgments",
+      "type": "text"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 125,
+      "panels": [],
+      "repeat": null,
+      "title": "Quick Facts",
+      "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+      "datasource": "Prometheus",
+      "decimals": 1,
+      "editable": true,
+      "error": false,
+      "format": "s",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 6,
+        "x": 0,
+        "y": 4
+      },
+      "height": "",
+      "id": 63,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "70%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "process_uptime_seconds{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "metric": "",
+          "refId": "A",
+          "step": 14400
+        }
+      ],
+      "thresholds": "",
+      "title": "Uptime",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+      "datasource": "Prometheus",
+      "decimals": null,
+      "editable": true,
+      "error": false,
+      "format": "dateTimeAsIso",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 6,
+        "x": 6,
+        "y": 4
+      },
+      "height": "",
+      "id": 92,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "70%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "process_start_time_seconds{application=\"$application\", instance=\"$instance\"}*1000",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "metric": "",
+          "refId": "A",
+          "step": 14400
+        }
+      ],
+      "thresholds": "",
+      "title": "Start time",
+      "type": "singlestat",
+      "valueFontSize": "70%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": ["rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)"],
+      "datasource": "Prometheus",
+      "decimals": 2,
+      "editable": true,
+      "error": false,
+      "format": "percent",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 6,
+        "x": 12,
+        "y": 4
+      },
+      "id": 65,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "70%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"heap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "refId": "A",
+          "step": 14400
+        }
+      ],
+      "thresholds": "70,90",
+      "title": "Heap used",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": ["rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)"],
+      "datasource": "Prometheus",
+      "decimals": 2,
+      "editable": true,
+      "error": false,
+      "format": "percent",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 6,
+        "x": 18,
+        "y": 4
+      },
+      "id": 75,
+      "interval": null,
+      "links": [],
+      "mappingType": 2,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "70%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        },
+        {
+          "from": "-99999999999999999999999999999999",
+          "text": "N/A",
+          "to": "0"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"nonheap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "refId": "A",
+          "step": 14400
+        }
+      ],
+      "thresholds": "70,90",
+      "title": "Non-Heap used",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        },
+        {
+          "op": "=",
+          "text": "x",
+          "value": ""
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 7
+      },
+      "id": 126,
+      "panels": [],
+      "repeat": null,
+      "title": "I/O Overview",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 8
+      },
+      "id": 111,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\"}[1m]))",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "HTTP",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Rate",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": null,
+          "format": "ops",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {
+        "HTTP": "#890f02",
+        "HTTP - 5xx": "#bf1b00"
+      },
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 8
+      },
+      "id": 112,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\", status=~\"5..\"}[1m]))",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "HTTP - 5xx",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Errors",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": null,
+          "format": "ops",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 8
+      },
+      "id": 113,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(http_server_requests_seconds_sum{application=\"$application\", instance=\"$instance\", status!~\"5..\"}[1m]))/sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\", status!~\"5..\"}[1m]))",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "HTTP - AVG",
+          "refId": "A"
+        },
+        {
+          "expr": "max(http_server_requests_seconds_max{application=\"$application\", instance=\"$instance\", status!~\"5..\"})",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "HTTP - MAX",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Duration",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "s",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 15
+      },
+      "id": 127,
+      "panels": [],
+      "repeat": null,
+      "title": "JVM Memory",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 16
+      },
+      "id": 24,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "committed",
+          "refId": "B",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "refId": "C",
+          "step": 2400
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "JVM Heap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["mbytes", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 16
+      },
+      "id": 25,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "committed",
+          "refId": "B",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "refId": "C",
+          "step": 2400
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "JVM Non-Heap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["mbytes", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 16
+      },
+      "id": 26,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "committed",
+          "refId": "B",
+          "step": 2400
+        },
+        {
+          "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\"})",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "refId": "C",
+          "step": 2400
+        },
+        {
+          "expr": "process_memory_vss_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": true,
+          "intervalFactor": 2,
+          "legendFormat": "vss",
+          "metric": "",
+          "refId": "D",
+          "step": 2400
+        },
+        {
+          "expr": "process_memory_rss_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "rss",
+          "refId": "E",
+          "step": 2400
+        },
+        {
+          "expr": "process_memory_pss_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "pss",
+          "refId": "F",
+          "step": 2400
+        },
+        {
+          "expr": "process_memory_swap_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "swap",
+          "refId": "G",
+          "step": 2400
+        },
+        {
+          "expr": "process_memory_swappss_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "swappss",
+          "refId": "H",
+          "step": 2400
+        },
+        {
+          "expr": "process_memory_pss_bytes{application=\"$application\", instance=\"$instance\"} + process_memory_swap_bytes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "phys (pss+swap)",
+          "refId": "I",
+          "step": 2400
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "JVM Total",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["mbytes", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 23
+      },
+      "id": 128,
+      "panels": [],
+      "repeat": null,
+      "title": "JVM Misc",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 0,
+        "y": 24
+      },
+      "id": 106,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "system_cpu_usage{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "system",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "process_cpu_usage{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "process",
+          "refId": "B"
+        },
+        {
+          "expr": "avg_over_time(process_cpu_usage{application=\"$application\", instance=\"$instance\"}[1h])",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 1,
+          "legendFormat": "process-1h",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "CPU",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "decimals": 1,
+          "format": "percentunit",
+          "label": "",
+          "logBase": 1,
+          "max": "1",
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 6,
+        "y": 24
+      },
+      "id": 93,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "system_load_average_1m{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "system-1m",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "refId": "B"
+        },
+        {
+          "expr": "system_cpu_count{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "cpu",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Load",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "decimals": 1,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 12,
+        "y": 24
+      },
+      "id": 32,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_threads_live{application=\"$application\", instance=\"$instance\"} or jvm_threads_live_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "live",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "jvm_threads_daemon{application=\"$application\", instance=\"$instance\"} or jvm_threads_daemon_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "daemon",
+          "metric": "",
+          "refId": "B",
+          "step": 2400
+        },
+        {
+          "expr": "jvm_threads_peak{application=\"$application\", instance=\"$instance\"} or jvm_threads_peak_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "peak",
+          "refId": "C",
+          "step": 2400
+        },
+        {
+          "expr": "process_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "process",
+          "refId": "D",
+          "step": 2400
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Threads",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {
+        "blocked": "#bf1b00",
+        "new": "#fce2de",
+        "runnable": "#7eb26d",
+        "terminated": "#511749",
+        "timed-waiting": "#c15c17",
+        "waiting": "#eab839"
+      },
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 24
+      },
+      "id": 124,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_threads_states_threads{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "{{state}}",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Thread States",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {
+        "debug": "#1F78C1",
+        "error": "#BF1B00",
+        "info": "#508642",
+        "trace": "#6ED0E0",
+        "warn": "#EAB839"
+      },
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 18,
+        "x": 0,
+        "y": 31
+      },
+      "height": "",
+      "id": 91,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "hideEmpty": false,
+        "hideZero": false,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": true,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [
+        {
+          "alias": "error",
+          "yaxis": 1
+        },
+        {
+          "alias": "warn",
+          "yaxis": 1
+        }
+      ],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "increase(logback_events_total{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "{{level}}",
+          "metric": "",
+          "refId": "A",
+          "step": 1200
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Log Events (1m)",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 31
+      },
+      "id": 61,
+      "legend": {
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "process_open_fds{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "open",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "process_max_fds{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "B",
+          "step": 2400
+        },
+        {
+          "expr": "process_files_open{application=\"$application\", instance=\"$instance\"} or process_files_open_files{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "open",
+          "refId": "C"
+        },
+        {
+          "expr": "process_files_max{application=\"$application\", instance=\"$instance\"} or process_files_max_files{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "refId": "D"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "File Descriptors",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 10,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 38
+      },
+      "id": 129,
+      "panels": [],
+      "repeat": "persistence_counts",
+      "title": "JVM Memory Pools (Heap)",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 39
+      },
+      "id": 3,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": "jvm_memory_pool_heap",
+      "scopedVars": {
+        "jvm_memory_pool_heap": {
+          "selected": false,
+          "text": "PS Eden Space",
+          "value": "PS Eden Space"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "$jvm_memory_pool_heap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["mbytes", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 39
+      },
+      "id": 134,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1553765841423,
+      "repeatPanelId": 3,
+      "scopedVars": {
+        "jvm_memory_pool_heap": {
+          "selected": false,
+          "text": "PS Old Gen",
+          "value": "PS Old Gen"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "$jvm_memory_pool_heap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["mbytes", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 39
+      },
+      "id": 135,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1553765841423,
+      "repeatPanelId": 3,
+      "scopedVars": {
+        "jvm_memory_pool_heap": {
+          "selected": false,
+          "text": "PS Survivor Space",
+          "value": "PS Survivor Space"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "$jvm_memory_pool_heap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["mbytes", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 46
+      },
+      "id": 130,
+      "panels": [],
+      "repeat": null,
+      "title": "JVM Memory Pools (Non-Heap)",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 47
+      },
+      "id": 78,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": "jvm_memory_pool_nonheap",
+      "scopedVars": {
+        "jvm_memory_pool_nonheap": {
+          "selected": false,
+          "text": "Metaspace",
+          "value": "Metaspace"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "$jvm_memory_pool_nonheap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["mbytes", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 47
+      },
+      "id": 136,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1553765841423,
+      "repeatPanelId": 78,
+      "scopedVars": {
+        "jvm_memory_pool_nonheap": {
+          "selected": false,
+          "text": "Compressed Class Space",
+          "value": "Compressed Class Space"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "$jvm_memory_pool_nonheap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["mbytes", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 47
+      },
+      "id": 137,
+      "legend": {
+        "alignAsTable": false,
+        "avg": false,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "maxPerRow": 3,
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatIteration": 1553765841423,
+      "repeatPanelId": 78,
+      "scopedVars": {
+        "jvm_memory_pool_nonheap": {
+          "selected": false,
+          "text": "Code Cache",
+          "value": "Code Cache"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "commited",
+          "metric": "",
+          "refId": "B",
+          "step": 1800
+        },
+        {
+          "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "max",
+          "metric": "",
+          "refId": "C",
+          "step": 1800
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "$jvm_memory_pool_nonheap",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["mbytes", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 54
+      },
+      "id": 131,
+      "panels": [],
+      "repeat": null,
+      "title": "Garbage Collection",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 55
+      },
+      "id": 98,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(jvm_gc_pause_seconds_count{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "{{action}} ({{cause}})",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Collections",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "ops",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 55
+      },
+      "id": 101,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(jvm_gc_pause_seconds_sum{application=\"$application\", instance=\"$instance\"}[1m])/rate(jvm_gc_pause_seconds_count{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "intervalFactor": 1,
+          "legendFormat": "avg {{action}} ({{cause}})",
+          "refId": "A"
+        },
+        {
+          "expr": "jvm_gc_pause_seconds_max{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "intervalFactor": 1,
+          "legendFormat": "max {{action}} ({{cause}})",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Pause Durations",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "s",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 55
+      },
+      "id": 99,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(jvm_gc_memory_allocated_bytes_total{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "allocated",
+          "refId": "A"
+        },
+        {
+          "expr": "rate(jvm_gc_memory_promoted_bytes_total{application=\"$application\", instance=\"$instance\"}[1m])",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "promoted",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Allocated/Promoted",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 62
+      },
+      "id": 132,
+      "panels": [],
+      "repeat": null,
+      "title": "Classloading",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 0,
+        "y": 63
+      },
+      "id": 37,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_classes_loaded{application=\"$application\", instance=\"$instance\"} or jvm_classes_loaded_classes{application=\"$application\", instance=\"$instance\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "loaded",
+          "metric": "",
+          "refId": "A",
+          "step": 1200
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Classes loaded",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 12,
+        "y": 63
+      },
+      "id": 38,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "delta(jvm_classes_loaded{application=\"$application\",instance=\"$instance\"}[5m]) or delta(jvm_classes_loaded_classes{application=\"$application\",instance=\"$instance\"}[5m])",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "delta",
+          "metric": "",
+          "refId": "A",
+          "step": 1200
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Class delta (5m)",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["ops", "short"],
+      "yaxes": [
+        {
+          "decimals": null,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 70
+      },
+      "id": 133,
+      "panels": [],
+      "repeat": null,
+      "title": "Buffer Pools",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 0,
+        "y": 71
+      },
+      "id": 33,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_buffer_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "jvm_buffer_total_capacity_bytes{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "capacity",
+          "metric": "",
+          "refId": "B",
+          "step": 2400
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Direct Buffers",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 6,
+        "y": 71
+      },
+      "id": 83,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_buffer_count{application=\"$application\", instance=\"$instance\", id=\"direct\"} or jvm_buffer_count_buffers{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "count",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Direct Buffers",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 12,
+        "y": 71
+      },
+      "id": 85,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_buffer_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "used",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        },
+        {
+          "expr": "jvm_buffer_total_capacity_bytes{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "capacity",
+          "metric": "",
+          "refId": "B",
+          "step": 2400
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Mapped Buffers",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMax": null,
+        "leftMin": null,
+        "rightLogBase": 1,
+        "rightMax": null,
+        "rightMin": null
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 71
+      },
+      "id": 84,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "paceLength": 10,
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "jvm_buffer_count{application=\"$application\", instance=\"$instance\", id=\"mapped\"} or jvm_buffer_count_buffers{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
+          "format": "time_series",
+          "intervalFactor": 2,
+          "legendFormat": "count",
+          "metric": "",
+          "refId": "A",
+          "step": 2400
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Mapped Buffers",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": ["short", "short"],
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 18,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "allValue": null,
+        "current": {
+          "text": "test",
+          "value": "test"
+        },
+        "datasource": "Prometheus",
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Application",
+        "multi": false,
+        "name": "application",
+        "options": [],
+        "query": "label_values(application)",
+        "refresh": 2,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allFormat": "glob",
+        "allValue": null,
+        "current": {
+          "text": "localhost:8080",
+          "value": "localhost:8080"
+        },
+        "datasource": "Prometheus",
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Instance",
+        "multi": false,
+        "multiFormat": "glob",
+        "name": "instance",
+        "options": [],
+        "query": "label_values(jvm_memory_used_bytes{application=\"$application\"}, instance)",
+        "refresh": 2,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allFormat": "glob",
+        "allValue": null,
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "Prometheus",
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "JVM Memory Pools Heap",
+        "multi": false,
+        "multiFormat": "glob",
+        "name": "jvm_memory_pool_heap",
+        "options": [],
+        "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"},id)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 1,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allFormat": "glob",
+        "allValue": null,
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "Prometheus",
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "JVM Memory Pools Non-Heap",
+        "multi": false,
+        "multiFormat": "glob",
+        "name": "jvm_memory_pool_nonheap",
+        "options": [],
+        "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"},id)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 2,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      }
+    ]
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {
+    "now": true,
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+  },
+  "timezone": "browser",
+  "title": "JVM (Micrometer)",
+  "uid": "Ud1CFe3iz",
+  "version": 1
+}

src/main/docker/grafana/provisioning/dashboards/dashboard.yml

@@ -0,0 +1,11 @@
+apiVersion: 1
+
+providers:
+  - name: 'Prometheus'
+    orgId: 1
+    folder: ''
+    type: file
+    disableDeletion: false
+    editable: true
+    options:
+      path: /etc/grafana/provisioning/dashboards

src/main/docker/grafana/provisioning/datasources/datasource.yml

@@ -0,0 +1,50 @@
+apiVersion: 1
+
+# list of datasources that should be deleted from the database
+deleteDatasources:
+  - name: Prometheus
+    orgId: 1
+
+# list of datasources to insert/update depending
+# whats available in the database
+datasources:
+  # <string, required> name of the datasource. Required
+  - name: Prometheus
+    # <string, required> datasource type. Required
+    type: prometheus
+    # <string, required> access mode. direct or proxy. Required
+    access: proxy
+    # <int> org id. will default to orgId 1 if not specified
+    orgId: 1
+    # <string> url
+    # On MacOS, replace localhost by host.docker.internal
+    url: http://localhost:9090
+    # <string> database password, if used
+    password:
+    # <string> database user, if used
+    user:
+    # <string> database name, if used
+    database:
+    # <bool> enable/disable basic auth
+    basicAuth: false
+    # <string> basic auth username
+    basicAuthUser: admin
+    # <string> basic auth password
+    basicAuthPassword: admin
+    # <bool> enable/disable with credentials headers
+    withCredentials:
+    # <bool> mark as default datasource. Max one per org
+    isDefault: true
+    # <map> fields that will be converted to json and stored in json_data
+    jsonData:
+      graphiteVersion: '1.1'
+      tlsAuth: false
+      tlsAuthWithCACert: false
+    # <string> json object of data that will be encrypted.
+    secureJsonData:
+      tlsCACert: '...'
+      tlsClientCert: '...'
+      tlsClientKey: '...'
+    version: 1
+    # <bool> allow users to edit datasources from the UI.
+    editable: true

src/main/docker/init-scripts/00-create-multiple-databases.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+set -u
+
+function create_user_and_database() {
+	local database=$1
+	echo "  Creating user and database '$database'"
+	psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
+	    CREATE DATABASE "$database";
+	    GRANT ALL PRIVILEGES ON DATABASE "$database" TO "$POSTGRES_USER";
+EOSQL
+}
+
+if [ -n "$POSTGRES_MULTIPLE_DATABASES" ]; then
+	echo "Multiple database creation requested: $POSTGRES_MULTIPLE_DATABASES"
+	for db in $(echo $POSTGRES_MULTIPLE_DATABASES | tr ',' ' '); do
+		create_user_and_database $db
+		echo "Initializing extensions for $db"
+		# Apply same extensions to test database
+		psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$db" -f /docker-entrypoint-initdb.d/01-init-extensions.sql
+	done
+	echo "Multiple databases created and initialized"
+fi 

src/main/docker/init-scripts/01-init-extensions.sql

@@ -0,0 +1,42 @@
+-- Enable required extensions
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+CREATE EXTENSION IF NOT EXISTS "pg_stat_statements";
+CREATE EXTENSION IF NOT EXISTS "pgcrypto";
+
+-- Create schema if not exists
+CREATE SCHEMA IF NOT EXISTS public;
+
+-- Set search path
+SET search_path TO public;
+
+-- Create custom functions
+CREATE OR REPLACE FUNCTION update_updated_at_column()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.updated_at = CURRENT_TIMESTAMP;
+    RETURN NEW;
+END;
+$$ language 'plpgsql';
+
+-- Grant necessary permissions
+GRANT ALL PRIVILEGES ON DATABASE "da-discovery" TO "da-discovery";
+GRANT ALL PRIVILEGES ON SCHEMA public TO "da-discovery";
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO "da-discovery";
+GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO "da-discovery";
+
+-- Set default privileges for future objects
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON TABLES TO "da-discovery";
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON SEQUENCES TO "da-discovery";
+
+-- Configure PostgreSQL settings
+ALTER SYSTEM SET log_min_duration_statement = '1000';
+ALTER SYSTEM SET log_connections = on;
+ALTER SYSTEM SET log_disconnections = on;
+ALTER SYSTEM SET log_statement = 'ddl';
+ALTER SYSTEM SET log_temp_files = '0';
+ALTER SYSTEM SET track_activities = on;
+ALTER SYSTEM SET track_counts = on;
+ALTER SYSTEM SET track_io_timing = on;
+ALTER SYSTEM SET track_functions = 'all';
+ALTER SYSTEM SET shared_preload_libraries = 'pg_stat_statements';
+ALTER SYSTEM SET pg_stat_statements.track = 'all'; 

src/main/docker/init-scripts/02-create-database-users.sql

@@ -0,0 +1,32 @@
+-- Create application user if not exists
+DO
+$$
+BEGIN
+  IF NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = 'app_user') THEN
+    CREATE USER app_user WITH PASSWORD 'app_password';
+  END IF;
+END
+$$;
+
+-- Grant permissions to the main database
+GRANT CONNECT ON DATABASE "da-discovery" TO app_user;
+GRANT USAGE ON SCHEMA public TO app_user;
+GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO app_user;
+GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO app_user;
+
+-- Set default privileges for future objects in main database
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO app_user;
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT USAGE ON SEQUENCES TO app_user;
+
+-- Connect to test database and set up the same permissions
+\c da-discovery-test
+
+-- Grant permissions to the test database
+GRANT CONNECT ON DATABASE "da-discovery-test" TO app_user;
+GRANT USAGE ON SCHEMA public TO app_user;
+GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO app_user;
+GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO app_user;
+
+-- Set default privileges for future objects in test database
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO app_user;
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT USAGE ON SEQUENCES TO app_user; 

src/main/docker/init-scripts/README.md

@@ -0,0 +1,40 @@
+# PostgreSQL Initialization Scripts
+
+This directory contains initialization scripts that are automatically executed when the PostgreSQL container starts.
+
+## Script Execution Order
+
+Scripts are executed in alphabetical order:
+
+1. `00-create-multiple-databases.sh` - Creates both development and test databases
+2. `01-init-extensions.sql` - Initializes required PostgreSQL extensions (UUID, pgcrypto, etc.)
+3. `02-create-database-users.sql` - Creates application users and grants permissions
+
+## How It Works
+
+When the PostgreSQL Docker container starts, it mounts this directory at `/docker-entrypoint-initdb.d/` inside the container. 
+The PostgreSQL Docker image is configured to automatically execute scripts found in this directory:
+
+- `.sh` files are executed as shell scripts
+- `.sql` files are executed as SQL commands
+- `.sql.gz` files are decompressed and executed as SQL commands
+
+## Adding New Initialization Scripts
+
+To add new initialization scripts:
+
+1. Create your script file with either `.sh` or `.sql` extension
+2. Use a numerical prefix to ensure proper execution order (e.g., `03-your-script.sql`)
+3. Make sure `.sh` scripts have execute permissions (`chmod +x your-script.sh`)
+4. Update the README.md file to document the purpose of your script
+
+## Important Notes
+
+- Scripts in this directory are only executed when the database is first initialized
+- To apply changes to an existing database, you'll need to use migrations (Liquibase)
+- If you rebuild the container from scratch with new scripts, you'll lose all existing data
+
+## References
+
+- [Postgres Docker entrypoint documentation](https://github.com/docker-library/postgres/blob/master/docker-entrypoint.sh)
+- [Liquibase documentation](https://docs.liquibase.com/) 

src/main/docker/init-scripts/run-postgresql.cmd

@@ -0,0 +1,52 @@
+@echo off
+echo Starting PostgreSQL for all environments (dev, test)...
+
+REM Check if Docker is running
+docker info > nul 2>&1
+if %ERRORLEVEL% neq 0 (
+  echo Docker is not running! Please start Docker Desktop and try again.
+  exit /b 1
+)
+
+REM Create network if it doesn't exist
+docker network inspect da-discovery-network > nul 2>&1
+if %ERRORLEVEL% neq 0 (
+  echo Creating Docker network: da-discovery-network
+  docker network create da-discovery-network
+)
+
+REM Start PostgreSQL container
+echo Starting PostgreSQL container...
+pushd ..\
+docker-compose -f postgresql.yml up -d
+popd
+
+REM Wait for PostgreSQL to be ready
+echo Waiting for PostgreSQL to start up...
+timeout /t 5 /nobreak > nul
+
+REM Check if PostgreSQL is running
+docker ps | find "postgresql"
+if %ERRORLEVEL% neq 0 (
+  echo PostgreSQL failed to start!
+  exit /b 1
+)
+
+echo PostgreSQL is up and running with the following databases:
+echo - da-discovery (Development)
+echo - da-discovery-test (Testing)
+echo.
+echo Connection details:
+echo   Host: localhost
+echo   Port: 5432
+echo   Username: da-discovery
+echo   Password: da-discovery
+echo.
+echo You can now start the application with:
+echo   ./gradlew bootRun --args='--spring.profiles.active=dev'
+echo.
+echo To view initialization logs:
+echo   docker logs postgresql
+echo.
+
+exit /b 0 

src/main/docker/init-scripts/run-postgresql.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# Exit on error
+set -e
+
+echo "Starting PostgreSQL for all environments (dev, test)..."
+
+# Check if Docker is running
+if ! docker info > /dev/null 2>&1; then
+  echo "Docker is not running! Please start Docker and try again."
+  exit 1
+fi
+
+# Create network if it doesn't exist
+if ! docker network inspect da-discovery-network > /dev/null 2>&1; then
+  echo "Creating Docker network: da-discovery-network"
+  docker network create da-discovery-network
+fi
+
+# Start PostgreSQL container
+echo "Starting PostgreSQL container..."
+# Get the absolute path to the docker directory
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DOCKER_DIR="$(dirname "$SCRIPT_DIR")"
+POSTGRESQL_YML="$DOCKER_DIR/postgresql.yml"
+
+echo "Using PostgreSQL configuration from: $POSTGRESQL_YML"
+docker-compose -f "$POSTGRESQL_YML" up -d
+
+# Wait for PostgreSQL to be ready
+echo "Waiting for PostgreSQL to start up..."
+sleep 5
+
+# Check if PostgreSQL is running
+if ! docker ps | grep -q postgresql; then
+  echo "PostgreSQL failed to start!"
+  exit 1
+fi
+
+echo "PostgreSQL is up and running with the following databases:"
+echo "- da-discovery (Development)"
+echo "- da-discovery-test (Testing)"
+echo ""
+echo "Connection details:"
+echo "  Host: localhost"
+echo "  Port: 5432"
+echo "  Username: da-discovery"
+echo "  Password: da-discovery"
+echo ""
+echo "You can now start the application with:"
+echo "  ./gradlew bootRun --args='--spring.profiles.active=dev'"
+echo ""
+echo "To view initialization logs:"
+echo "  docker logs postgresql"
+echo ""
+
+exit 0 

src/main/docker/jhipster-control-center.yml

@@ -0,0 +1,52 @@
+## How to use JHCC docker compose
+# To allow JHCC to reach JHipster application from a docker container note that we set the host as host.docker.internal
+# To reach the application from a browser, you need to add '127.0.0.1 host.docker.internal' to your hosts file.
+### Discovery mode
+# JHCC support 3 kinds of discovery mode: Consul, Eureka and static
+# In order to use one, please set SPRING_PROFILES_ACTIVE to one (and only one) of this values: consul,eureka,static
+### Discovery properties
+# According to the discovery mode choose as Spring profile, you have to set the right properties
+# please note that current properties are set to run JHCC with default values, personalize them if needed
+# and remove those from other modes. You can only have one mode active.
+#### Eureka
+#       - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://admin:admin@host.docker.internal:8761/eureka/
+#### Consul
+#       - SPRING_CLOUD_CONSUL_HOST=host.docker.internal
+#       - SPRING_CLOUD_CONSUL_PORT=8500
+#### Static
+# Add instances to "MyApp"
+#       - SPRING_CLOUD_DISCOVERY_CLIENT_SIMPLE_INSTANCES_MYAPP_0_URI=http://host.docker.internal:8081
+#       - SPRING_CLOUD_DISCOVERY_CLIENT_SIMPLE_INSTANCES_MYAPP_1_URI=http://host.docker.internal:8082
+# Or add a new application named MyNewApp
+#       - SPRING_CLOUD_DISCOVERY_CLIENT_SIMPLE_INSTANCES_MYNEWAPP_0_URI=http://host.docker.internal:8080
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+
+#### IMPORTANT
+# If you choose Consul or Eureka mode:
+# Do not forget to remove the prefix "127.0.0.1" in front of their port in order to expose them.
+# This is required because JHCC need to communicate with Consul or Eureka.
+# - In Consul mode, the ports are in the consul.yml file.
+# - In Eureka mode, the ports are in the jhipster-registry.yml file.
+
+name: dgcrawler
+services:
+  jhipster-control-center:
+    image: 'jhipster/jhipster-control-center:v0.5.0'
+    command:
+      - /bin/sh
+      - -c
+      # Patch /etc/hosts to support resolving host.docker.internal to the internal IP address used by the host in all OSes
+      - echo "`ip route | grep default | cut -d ' ' -f3` host.docker.internal" | tee -a /etc/hosts > /dev/null && java -jar /jhipster-control-center.jar
+    environment:
+      - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - SPRING_PROFILES_ACTIVE=prod,api-docs,none,oauth2
+      # For keycloak to work, you need to add '127.0.0.1 keycloak' to your hosts file
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:8080/realms/dalab
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=jhipster-control-center
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=jhipster-control-center
+      - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://admin:admin@host.docker.internal:8761/eureka/
+      - LOGGING_FILE_NAME=/tmp/jhipster-control-center.log
+    # If you want to expose these ports outside your dev PC,
+    # remove the "127.0.0.1:" prefix
+    ports:
+      - 127.0.0.1:7419:7419

src/main/docker/jhipster-registry.yml

@@ -0,0 +1,34 @@
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+name: dgcrawler
+services:
+  jhipster-registry:
+    image: jhipster/jhipster-registry:v7.4.0
+    volumes:
+      - ./central-server-config:/central-config
+    # When run with the "dev" Spring profile, the JHipster Registry will
+    # read the config from the local filesystem (central-server-config directory)
+    # When run with the "prod" Spring profile, it will read the configuration from a Git repository
+    # See https://www.jhipster.tech/jhipster-registry/#spring-cloud-config
+    environment:
+      - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - SPRING_PROFILES_ACTIVE=dev,api-docs,oauth2
+      - SPRING_SECURITY_USER_PASSWORD=admin
+      - JHIPSTER_REGISTRY_PASSWORD=admin
+      - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=native
+      - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_SEARCH_LOCATIONS=file:./central-config/localhost-config/
+      # - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=git
+      # - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI=https://github.com/jhipster/jhipster-registry/
+      # - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_SEARCH_PATHS=central-config
+      # For keycloak to work, you need to add '127.0.0.1 keycloak' to your hosts file
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:8080/realms/dalab
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=jhipster-registry
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=jhipster-registry
+    # If you want to expose these ports outside your dev PC,
+    # remove the "127.0.0.1:" prefix
+    ports:
+      - 127.0.0.1:8761:8761
+    healthcheck:
+      test: ['CMD', 'curl', '-f', 'http://localhost:8761/management/health']
+      interval: 5s
+      timeout: 5s
+      retries: 20

src/main/docker/jib/entrypoint.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+echo "The application will start in ${JHIPSTER_SLEEP}s..." && sleep ${JHIPSTER_SLEEP}
+
+# usage: file_env VAR [DEFAULT]
+#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
+# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
+#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
+file_env() {
+    local var="$1"
+    local fileVar="${var}_FILE"
+    local def="${2:-}"
+    if [[ ${!var:-} && ${!fileVar:-} ]]; then
+        echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+        exit 1
+    fi
+    local val="$def"
+    if [[ ${!var:-} ]]; then
+        val="${!var}"
+    elif [[ ${!fileVar:-} ]]; then
+        val="$(< "${!fileVar}")"
+    fi
+
+    if [[ -n $val ]]; then
+        export "$var"="$val"
+    fi
+
+    unset "$fileVar"
+}
+
+file_env 'SPRING_DATASOURCE_URL'
+file_env 'SPRING_DATASOURCE_USERNAME'
+file_env 'SPRING_DATASOURCE_PASSWORD'
+file_env 'SPRING_LIQUIBASE_URL'
+file_env 'SPRING_LIQUIBASE_USER'
+file_env 'SPRING_LIQUIBASE_PASSWORD'
+file_env 'JHIPSTER_REGISTRY_PASSWORD'
+
+exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "com.dalab.discovery.application.DADiscoveryAgent"  "$@"

src/main/docker/kafka.yml

@@ -0,0 +1,60 @@
+version: '3.8'
+
+services:
+  # Single Kafka container with KRaft mode (no Zookeeper needed)
+  kafka:
+    image: confluentinc/cp-kafka:7.5.3
+    container_name: kafka
+    ports:
+      - '9092:9092'
+    environment:
+      # KRaft mode configuration
+      KAFKA_NODE_ID: 1
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+
+      # Cluster settings for KRaft
+      KAFKA_CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
+
+      # Topic and replication settings (single node)
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+      KAFKA_NUM_PARTITIONS: 3
+      KAFKA_DEFAULT_REPLICATION_FACTOR: 1
+      KAFKA_MIN_INSYNC_REPLICAS: 1
+
+      # Performance and retention settings
+      KAFKA_LOG_RETENTION_HOURS: 168
+      KAFKA_LOG_SEGMENT_BYTES: 1073741824
+      KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE: 'false'
+
+      # Memory settings
+      KAFKA_HEAP_OPTS: '-Xmx512M -Xms512M'
+
+      # Log directories for KRaft
+      KAFKA_LOG_DIRS: '/var/lib/kafka/data'
+    volumes:
+      - kafka-kraft-data:/var/lib/kafka/data
+    networks:
+      - da-discovery-network
+    healthcheck:
+      test: ['CMD', 'kafka-topics', '--bootstrap-server', 'localhost:9092', '--list']
+      interval: 30s
+      timeout: 10s
+      retries: 5
+
+networks:
+  da-discovery-network:
+    name: da-discovery-network
+
+volumes:
+  kafka-kraft-data:
+    driver: local

src/main/docker/keycloak.yml

@@ -0,0 +1,28 @@
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+name: dgcrawler
+services:
+  keycloak:
+    image: quay.io/keycloak/keycloak:23.0.1
+    command: 'start-dev --import-realm'
+    volumes:
+      - ./realm-config:/opt/keycloak/data/import
+      - ./realm-config/keycloak-health-check.sh:/opt/keycloak/health-check.sh
+    environment:
+      - KC_DB=dev-file
+      - KEYCLOAK_ADMIN=admin
+      - KEYCLOAK_ADMIN_PASSWORD=admin
+      - KC_FEATURES=scripts
+      - KC_HTTP_PORT=9080
+      - KC_HTTPS_PORT=9443
+      - KC_HEALTH_ENABLED=true
+    # If you want to expose these ports outside your dev PC,
+    # remove the "127.0.0.1:" prefix
+    ports:
+      - 127.0.0.1:9080:9080
+      - 127.0.0.1:9443:9443
+    healthcheck:
+      test: 'bash /opt/keycloak/health-check.sh'
+      interval: 5s
+      timeout: 5s
+      retries: 20
+      start_period: 10s

src/main/docker/monitoring.yml

@@ -0,0 +1,31 @@
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+name: dgcrawler
+services:
+  prometheus:
+    image: prom/prometheus:v2.48.0
+    volumes:
+      - ./prometheus/:/etc/prometheus/
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+    # If you want to expose these ports outside your dev PC,
+    # remove the "127.0.0.1:" prefix
+    ports:
+      - 127.0.0.1:9090:9090
+    # On MacOS, remove next line and replace localhost by host.docker.internal in prometheus/prometheus.yml and
+    # grafana/provisioning/datasources/datasource.yml
+    network_mode: 'host' # to test locally running service
+  grafana:
+    image: grafana/grafana:10.2.2
+    volumes:
+      - ./grafana/provisioning/:/etc/grafana/provisioning/
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=admin
+      - GF_USERS_ALLOW_SIGN_UP=false
+      - GF_INSTALL_PLUGINS=grafana-piechart-panel
+    # If you want to expose these ports outside your dev PC,
+    # remove the "127.0.0.1:" prefix
+    ports:
+      - 127.0.0.1:3000:3000
+    # On MacOS, remove next line and replace localhost by host.docker.internal in prometheus/prometheus.yml and
+    # grafana/provisioning/datasources/datasource.yml
+    network_mode: 'host' # to test locally running service

src/main/docker/postgresql.yml

@@ -0,0 +1,56 @@
+version: '3.8'
+services:
+  postgresql:
+    image: postgres:15.1
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+      - ./init-scripts:/docker-entrypoint-initdb.d
+    environment:
+      - POSTGRES_USER=da-discovery
+      - POSTGRES_PASSWORD=da-discovery
+      - POSTGRES_DB=da-discovery
+      - POSTGRES_MULTIPLE_DATABASES=da-discovery-test
+      # PostgreSQL optimization settings
+      - POSTGRES_INITDB_ARGS=--data-checksums
+      # Performance tuning
+      - POSTGRES_MAX_CONNECTIONS=100
+      - POSTGRES_SHARED_BUFFERS=256MB
+      - POSTGRES_EFFECTIVE_CACHE_SIZE=768MB
+      - POSTGRES_MAINTENANCE_WORK_MEM=64MB
+      - POSTGRES_WORK_MEM=4MB
+    ports:
+      - "5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U da-discovery -d da-discovery"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    command: 
+      - "postgres"
+      - "-c"
+      - "max_connections=100"
+      - "-c"
+      - "shared_buffers=256MB"
+      - "-c"
+      - "effective_cache_size=768MB"
+      - "-c"
+      - "maintenance_work_mem=64MB"
+      - "-c"
+      - "work_mem=4MB"
+      - "-c"
+      - "log_min_duration_statement=1000"
+      - "-c"
+      - "log_connections=on"
+      - "-c"
+      - "log_disconnections=on"
+    restart: unless-stopped
+    networks:
+      - da-discovery-network
+
+volumes:
+  postgresql-data:
+    driver: local
+
+networks:
+  da-discovery-network:
+    external: true 

src/main/docker/prometheus/prometheus.yml

@@ -0,0 +1,31 @@
+# Sample global config for monitoring JHipster applications
+global:
+  scrape_interval: 15s # By default, scrape targets every 15 seconds.
+  evaluation_interval: 15s # By default, scrape targets every 15 seconds.
+  # scrape_timeout is set to the global default (10s).
+
+  # Attach these labels to any time series or alerts when communicating with
+  # external systems (federation, remote storage, Alertmanager).
+  external_labels:
+    monitor: 'jhipster'
+
+# A scrape configuration containing exactly one endpoint to scrape:
+# Here it's Prometheus itself.
+scrape_configs:
+  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
+  - job_name: 'prometheus'
+
+    # Override the global default and scrape targets from this job every 5 seconds.
+    scrape_interval: 5s
+
+    # scheme defaults to 'http' enable https in case your application is server via https
+    #scheme: https
+    # basic auth is not needed by default. See https://www.jhipster.tech/monitoring/#configuring-metrics-forwarding for details
+    #basic_auth:
+    # username: admin
+    # password: admin
+    metrics_path: /management/prometheus
+    static_configs:
+      - targets:
+          # On MacOS, replace localhost by host.docker.internal
+          - localhost:8081

src/main/docker/realm-config/jhipster-realm.json

@@ -0,0 +1,2351 @@
+{
+  "id": "jhipster",
+  "realm": "jhipster",
+  "displayName": "JHipster",
+  "displayNameHtml": "<div class=\"kc-logo-text\"><span>JHipster</span></div>",
+  "notBefore": 0,
+  "defaultSignatureAlgorithm": "RS256",
+  "revokeRefreshToken": false,
+  "refreshTokenMaxReuse": 0,
+  "accessTokenLifespan": 300,
+  "accessTokenLifespanForImplicitFlow": 900,
+  "ssoSessionIdleTimeout": 1800,
+  "ssoSessionMaxLifespan": 36000,
+  "ssoSessionIdleTimeoutRememberMe": 0,
+  "ssoSessionMaxLifespanRememberMe": 0,
+  "offlineSessionIdleTimeout": 2592000,
+  "offlineSessionMaxLifespanEnabled": false,
+  "offlineSessionMaxLifespan": 5184000,
+  "clientSessionIdleTimeout": 0,
+  "clientSessionMaxLifespan": 0,
+  "clientOfflineSessionIdleTimeout": 0,
+  "clientOfflineSessionMaxLifespan": 0,
+  "accessCodeLifespan": 60,
+  "accessCodeLifespanUserAction": 300,
+  "accessCodeLifespanLogin": 1800,
+  "actionTokenGeneratedByAdminLifespan": 43200,
+  "actionTokenGeneratedByUserLifespan": 300,
+  "oauth2DeviceCodeLifespan": 600,
+  "oauth2DevicePollingInterval": 5,
+  "enabled": true,
+  "sslRequired": "external",
+  "registrationAllowed": false,
+  "registrationEmailAsUsername": false,
+  "rememberMe": false,
+  "verifyEmail": false,
+  "loginWithEmailAllowed": true,
+  "duplicateEmailsAllowed": false,
+  "resetPasswordAllowed": false,
+  "editUsernameAllowed": false,
+  "bruteForceProtected": false,
+  "permanentLockout": false,
+  "maxFailureWaitSeconds": 900,
+  "minimumQuickLoginWaitSeconds": 60,
+  "waitIncrementSeconds": 60,
+  "quickLoginCheckMilliSeconds": 1000,
+  "maxDeltaTimeSeconds": 43200,
+  "failureFactor": 30,
+  "roles": {
+    "realm": [
+      {
+        "id": "8e986fb5-dafb-43bf-a7c2-7e57572d3d80",
+        "name": "ROLE_ADMIN",
+        "description": "Jhipster administrator role",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "jhipster",
+        "attributes": {}
+      },
+      {
+        "id": "e1b19afd-f612-4a79-bdf8-26a99b89b10b",
+        "name": "offline_access",
+        "description": "${role_offline-access}",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "jhipster",
+        "attributes": {}
+      },
+      {
+        "id": "ec5705e1-fc1d-4d21-8364-abd3bd4efcd0",
+        "name": "ROLE_USER",
+        "description": "Jhipster user role",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "jhipster",
+        "attributes": {}
+      },
+      {
+        "id": "d2b73e7b-a2d7-40e9-8ebc-2af00454e8aa",
+        "name": "default-roles-jhipster",
+        "description": "${role_default-roles}",
+        "composite": true,
+        "composites": {
+          "realm": ["offline_access", "uma_authorization"],
+          "client": {
+            "account": ["view-profile", "manage-account"]
+          }
+        },
+        "clientRole": false,
+        "containerId": "jhipster",
+        "attributes": {}
+      },
+      {
+        "id": "2eec61d0-9581-4dbf-8c7b-f32dc5fac3ce",
+        "name": "uma_authorization",
+        "description": "${role_uma_authorization}",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "jhipster",
+        "attributes": {}
+      }
+    ],
+    "client": {
+      "realm-management": [
+        {
+          "id": "a6249a12-d76c-4514-b137-e3018b243e25",
+          "name": "manage-authorization",
+          "description": "${role_manage-authorization}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "a28bc401-c5ad-4fab-aef4-42629988c10b",
+          "name": "view-realm",
+          "description": "${role_view-realm}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "464bca1f-136f-45de-a7fc-b976a185ce7e",
+          "name": "view-users",
+          "description": "${role_view-users}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": ["query-users", "query-groups"]
+            }
+          },
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "98c2fa77-d3c8-4f68-b9f4-b79f87efd4a9",
+          "name": "query-users",
+          "description": "${role_query-users}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "6b82bfdb-c8de-4274-95b4-a683eb4ead50",
+          "name": "view-identity-providers",
+          "description": "${role_view-identity-providers}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "3c6b9cfe-80c4-41d5-a5ac-0cadebacfc8d",
+          "name": "manage-identity-providers",
+          "description": "${role_manage-identity-providers}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "23676fb8-235a-4e54-a0d0-9bed1ccbe2f8",
+          "name": "query-groups",
+          "description": "${role_query-groups}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "b71fe952-bb06-4e4a-91ef-2d2714f770e1",
+          "name": "impersonation",
+          "description": "${role_impersonation}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "0813cbd0-c73d-469d-a54d-84a865c302af",
+          "name": "manage-events",
+          "description": "${role_manage-events}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "c7a4f4c1-9089-458c-a765-f6d22ea94690",
+          "name": "view-authorization",
+          "description": "${role_view-authorization}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "2e1bc884-e9d3-45d2-909c-2777a78ca8ae",
+          "name": "manage-realm",
+          "description": "${role_manage-realm}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "0a05451e-7d64-4e87-b585-f1143ce5752e",
+          "name": "query-clients",
+          "description": "${role_query-clients}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "dfad4d08-6d75-42b6-8699-4886e47bc464",
+          "name": "view-events",
+          "description": "${role_view-events}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "392ed0a3-f6ad-48a1-b201-648037d2b4bd",
+          "name": "realm-admin",
+          "description": "${role_realm-admin}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "manage-authorization",
+                "view-realm",
+                "view-users",
+                "query-users",
+                "manage-identity-providers",
+                "view-identity-providers",
+                "query-groups",
+                "impersonation",
+                "manage-events",
+                "query-clients",
+                "manage-realm",
+                "view-authorization",
+                "view-events",
+                "view-clients",
+                "create-client",
+                "manage-clients",
+                "manage-users",
+                "query-realms"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "d7efdf61-affb-42a1-bcb0-b2c30d87a39e",
+          "name": "view-clients",
+          "description": "${role_view-clients}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": ["query-clients"]
+            }
+          },
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "14da8e56-5c8b-4764-96da-250449a32fd4",
+          "name": "create-client",
+          "description": "${role_create-client}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "88e6a9f5-259c-487d-af35-2a98da066816",
+          "name": "manage-clients",
+          "description": "${role_manage-clients}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "932273a7-c02b-43db-81c5-96a0dc45e454",
+          "name": "manage-users",
+          "description": "${role_manage-users}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        },
+        {
+          "id": "e3edf335-cec5-4012-a00d-fcac045052e1",
+          "name": "query-realms",
+          "description": "${role_query-realms}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "898488c8-e260-41c5-a463-7ceea14d587a",
+          "attributes": {}
+        }
+      ],
+      "jhipster-control-center": [],
+      "security-admin-console": [],
+      "web_app": [],
+      "admin-cli": [],
+      "account-console": [],
+      "jhipster-registry": [],
+      "broker": [
+        {
+          "id": "5b08a930-9f1d-4030-ae75-92c1e4c9352c",
+          "name": "read-token",
+          "description": "${role_read-token}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "88e1225b-f0b9-46ba-8efd-f2c10ce23058",
+          "attributes": {}
+        }
+      ],
+      "account": [
+        {
+          "id": "a88c56b8-6bc9-418a-92bc-7a17e7707f60",
+          "name": "view-profile",
+          "description": "${role_view-profile}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "6cc5a716-0880-47dc-b714-9a4967246b2f",
+          "attributes": {}
+        },
+        {
+          "id": "0cb954ab-987f-482a-b2d7-0d481ba1d532",
+          "name": "view-applications",
+          "description": "${role_view-applications}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "6cc5a716-0880-47dc-b714-9a4967246b2f",
+          "attributes": {}
+        },
+        {
+          "id": "6450156d-7526-48f2-8ea0-bb1e51f9eefa",
+          "name": "manage-account",
+          "description": "${role_manage-account}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": ["manage-account-links"]
+            }
+          },
+          "clientRole": true,
+          "containerId": "6cc5a716-0880-47dc-b714-9a4967246b2f",
+          "attributes": {}
+        },
+        {
+          "id": "e5b2ba76-4c36-4ba1-b210-89a1ac3c6bbe",
+          "name": "view-consent",
+          "description": "${role_view-consent}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "6cc5a716-0880-47dc-b714-9a4967246b2f",
+          "attributes": {}
+        },
+        {
+          "id": "35537940-67a6-4217-881b-1ff98109b374",
+          "name": "manage-consent",
+          "description": "${role_manage-consent}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": ["view-consent"]
+            }
+          },
+          "clientRole": true,
+          "containerId": "6cc5a716-0880-47dc-b714-9a4967246b2f",
+          "attributes": {}
+        },
+        {
+          "id": "5ebf404b-7805-4da2-abb4-9db7d3b36120",
+          "name": "delete-account",
+          "description": "${role_delete-account}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "6cc5a716-0880-47dc-b714-9a4967246b2f",
+          "attributes": {}
+        },
+        {
+          "id": "16925eed-a410-4241-9af8-cc7992c42f7a",
+          "name": "view-groups",
+          "description": "${role_view-groups}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "6cc5a716-0880-47dc-b714-9a4967246b2f",
+          "attributes": {}
+        },
+        {
+          "id": "a7f45fab-19c3-4c48-aca3-85f828ca0fed",
+          "name": "manage-account-links",
+          "description": "${role_manage-account-links}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "6cc5a716-0880-47dc-b714-9a4967246b2f",
+          "attributes": {}
+        }
+      ]
+    }
+  },
+  "groups": [
+    {
+      "id": "afb0c768-ab0f-454c-a8ea-bc9e70b50248",
+      "name": "Admins",
+      "path": "/Admins",
+      "attributes": {},
+      "realmRoles": ["ROLE_ADMIN"],
+      "clientRoles": {},
+      "subGroups": []
+    },
+    {
+      "id": "672767bb-4ab0-4d37-93a1-9b6c2416b6b2",
+      "name": "Users",
+      "path": "/Users",
+      "attributes": {},
+      "realmRoles": ["ROLE_USER"],
+      "clientRoles": {},
+      "subGroups": []
+    }
+  ],
+  "defaultRole": {
+    "id": "d2b73e7b-a2d7-40e9-8ebc-2af00454e8aa",
+    "name": "default-roles-jhipster",
+    "description": "${role_default-roles}",
+    "composite": true,
+    "clientRole": false,
+    "containerId": "jhipster"
+  },
+  "requiredCredentials": ["password"],
+  "otpPolicyType": "totp",
+  "otpPolicyAlgorithm": "HmacSHA1",
+  "otpPolicyInitialCounter": 0,
+  "otpPolicyDigits": 6,
+  "otpPolicyLookAheadWindow": 1,
+  "otpPolicyPeriod": 30,
+  "otpPolicyCodeReusable": false,
+  "otpSupportedApplications": ["totpAppGoogleName", "totpAppFreeOTPName", "totpAppMicrosoftAuthenticatorName"],
+  "localizationTexts": {},
+  "webAuthnPolicyRpEntityName": "keycloak",
+  "webAuthnPolicySignatureAlgorithms": ["ES256"],
+  "webAuthnPolicyRpId": "",
+  "webAuthnPolicyAttestationConveyancePreference": "not specified",
+  "webAuthnPolicyAuthenticatorAttachment": "not specified",
+  "webAuthnPolicyRequireResidentKey": "not specified",
+  "webAuthnPolicyUserVerificationRequirement": "not specified",
+  "webAuthnPolicyCreateTimeout": 0,
+  "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
+  "webAuthnPolicyAcceptableAaguids": [],
+  "webAuthnPolicyExtraOrigins": [],
+  "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
+  "webAuthnPolicyPasswordlessSignatureAlgorithms": ["ES256"],
+  "webAuthnPolicyPasswordlessRpId": "",
+  "webAuthnPolicyPasswordlessAttestationConveyancePreference": "not specified",
+  "webAuthnPolicyPasswordlessAuthenticatorAttachment": "not specified",
+  "webAuthnPolicyPasswordlessRequireResidentKey": "not specified",
+  "webAuthnPolicyPasswordlessUserVerificationRequirement": "not specified",
+  "webAuthnPolicyPasswordlessCreateTimeout": 0,
+  "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
+  "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+  "webAuthnPolicyPasswordlessExtraOrigins": [],
+  "users": [
+    {
+      "id": "f742ba6f-1d8a-4dec-bf15-e02dab508283",
+      "createdTimestamp": 1598681172054,
+      "username": "service-account-internal",
+      "enabled": true,
+      "totp": false,
+      "emailVerified": false,
+      "serviceAccountClientId": "internal",
+      "disableableCredentialTypes": [],
+      "requiredActions": [],
+      "realmRoles": ["default-roles-jhipster"],
+      "notBefore": 0,
+      "groups": []
+    }
+  ],
+  "scopeMappings": [
+    {
+      "clientScope": "offline_access",
+      "roles": ["offline_access"]
+    }
+  ],
+  "clientScopeMappings": {
+    "account": [
+      {
+        "client": "account-console",
+        "roles": ["manage-account", "view-groups"]
+      }
+    ]
+  },
+  "clients": [
+    {
+      "id": "6cc5a716-0880-47dc-b714-9a4967246b2f",
+      "clientId": "account",
+      "name": "${client_account}",
+      "rootUrl": "${authBaseUrl}",
+      "baseUrl": "/realms/jhipster/account/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "a2260b9e-5a23-41a0-a777-7e69891109e2",
+      "redirectUris": ["/realms/jhipster/account/*"],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"],
+      "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"]
+    },
+    {
+      "id": "fb0a4870-06db-4f9d-9d44-baf51a00cc34",
+      "clientId": "account-console",
+      "name": "${client_account-console}",
+      "rootUrl": "${authBaseUrl}",
+      "baseUrl": "/realms/jhipster/account/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "b7c957d3-590f-49fb-aacb-65d20269c558",
+      "redirectUris": ["/realms/jhipster/account/*"],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+",
+        "pkce.code.challenge.method": "S256"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "c5c4ebe5-d009-4f96-b143-1b36d770eafb",
+          "name": "audience resolve",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-audience-resolve-mapper",
+          "consentRequired": false,
+          "config": {}
+        }
+      ],
+      "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"],
+      "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"]
+    },
+    {
+      "id": "bb166356-838d-445e-94e3-9330ad7ab51b",
+      "clientId": "admin-cli",
+      "name": "${client_admin-cli}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "1e154a7c-bc67-4106-b960-e1299fe649eb",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": false,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"],
+      "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"]
+    },
+    {
+      "id": "88e1225b-f0b9-46ba-8efd-f2c10ce23058",
+      "clientId": "broker",
+      "name": "${client_broker}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "ab0f4144-c0da-4ccf-ba71-8b29761f8918",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"],
+      "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"]
+    },
+    {
+      "id": "1acf7ad0-68cb-46a6-a3e4-8b2f2abecb85",
+      "clientId": "jhipster-control-center",
+      "rootUrl": "http://localhost:7419",
+      "adminUrl": "http://localhost:7419",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "jhipster-control-center",
+      "redirectUris": ["dev.localhost.ionic:*", "http://127.0.0.1:*", "http://localhost:*", "https://127.0.0.1:*", "https://localhost:*"],
+      "webOrigins": ["*"],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": true,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "post.logout.redirect.uris": "+",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "exclude.session.state.from.auth.response": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "tls.client.certificate.bound.access.tokens": "false",
+        "saml.authnstatement": "false",
+        "display.on.consent.screen": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "defaultClientScopes": ["web-origins", "acr", "jhipster", "roles", "profile", "email"],
+      "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"]
+    },
+    {
+      "id": "9057870f-8775-448d-a194-1d4e122f44d5",
+      "clientId": "jhipster-registry",
+      "rootUrl": "http://localhost:8761",
+      "adminUrl": "http://localhost:8761",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "jhipster-registry",
+      "redirectUris": ["http://127.0.0.1:8761/*", "http://localhost:8761/*"],
+      "webOrigins": ["http://127.0.0.1:8761", "http://localhost:8761"],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "post.logout.redirect.uris": "+",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "exclude.session.state.from.auth.response": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "tls.client.certificate.bound.access.tokens": "false",
+        "saml.authnstatement": "false",
+        "display.on.consent.screen": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "defaultClientScopes": ["web-origins", "acr", "jhipster", "roles", "profile", "email"],
+      "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"]
+    },
+    {
+      "id": "898488c8-e260-41c5-a463-7ceea14d587a",
+      "clientId": "realm-management",
+      "name": "${client_realm-management}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "fcc154e4-c747-4ea8-8433-7a34017c14a8",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": true,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"],
+      "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"]
+    },
+    {
+      "id": "989d2b96-b820-4f9b-aa17-55e6488b08c8",
+      "clientId": "security-admin-console",
+      "name": "${client_security-admin-console}",
+      "rootUrl": "${authAdminUrl}",
+      "baseUrl": "/admin/jhipster/console/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "cf29935c-25d7-4029-bb7e-f6ebfa52f599",
+      "redirectUris": ["/admin/jhipster/console/*"],
+      "webOrigins": ["+"],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+",
+        "pkce.code.challenge.method": "S256"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "5fd34289-c644-411a-874c-849475d9d102",
+          "name": "locale",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "locale",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "locale",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"],
+      "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"]
+    },
+    {
+      "id": "6e8deddb-b4d6-4e2e-b389-b397d3f74fcd",
+      "clientId": "web_app",
+      "rootUrl": "http://localhost:8081",
+      "adminUrl": "http://localhost:8081",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "web_app",
+      "redirectUris": [
+        "dev.localhost.ionic:*",
+        "http://127.0.0.1:*",
+        "http://localhost:*",
+        "https://127.0.0.1:*",
+        "https://localhost:*",
+        "https://oauth.pstmn.io/v1/callback"
+      ],
+      "webOrigins": ["*"],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": true,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "saml.assertion.signature": "false",
+        "saml.force.post.binding": "false",
+        "saml.multivalued.roles": "false",
+        "saml.encrypt": "false",
+        "post.logout.redirect.uris": "+",
+        "saml.server.signature": "false",
+        "saml.server.signature.keyinfo.ext": "false",
+        "exclude.session.state.from.auth.response": "false",
+        "saml_force_name_id_format": "false",
+        "saml.client.signature": "false",
+        "tls.client.certificate.bound.access.tokens": "false",
+        "saml.authnstatement": "false",
+        "display.on.consent.screen": "false",
+        "saml.onetimeuse.condition": "false"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "defaultClientScopes": ["web-origins", "acr", "jhipster", "roles", "profile", "email"],
+      "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"]
+    }
+  ],
+  "clientScopes": [
+    {
+      "id": "52d73c82-423c-44a8-b2ec-1e13f4cd6065",
+      "name": "address",
+      "description": "OpenID Connect built-in scope: address",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${addressScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "98230752-36b9-4755-8661-a7de1926d0d4",
+          "name": "address",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-address-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute.formatted": "formatted",
+            "user.attribute.country": "country",
+            "user.attribute.postal_code": "postal_code",
+            "userinfo.token.claim": "true",
+            "user.attribute.street": "street",
+            "id.token.claim": "true",
+            "user.attribute.region": "region",
+            "access.token.claim": "true",
+            "user.attribute.locality": "locality"
+          }
+        }
+      ]
+    },
+    {
+      "id": "44d24405-87bf-4b37-a627-e3fdabb93f50",
+      "name": "email",
+      "description": "OpenID Connect built-in scope: email",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${emailScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "36800088-6d17-4c18-93e8-2bc93901d8b7",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "3ea34afd-30b5-4e5d-a836-dbda439dce6f",
+          "name": "email verified",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "emailVerified",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email_verified",
+            "jsonType.label": "boolean"
+          }
+        }
+      ]
+    },
+    {
+      "id": "9816de82-24b7-42fe-a85a-1264868ec293",
+      "name": "jhipster",
+      "description": "Jhipster specific claims",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "0f9c9347-aad6-4bff-94f4-e11937f2ad33",
+          "name": "langKey",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "langKey",
+            "id.token.claim": "false",
+            "access.token.claim": "false",
+            "claim.name": "langKey",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "69729907-8d1c-4961-81c0-91766f548cc9",
+          "name": "roles",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-realm-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "multivalued": "true",
+            "userinfo.token.claim": "true",
+            "id.token.claim": "false",
+            "access.token.claim": "true",
+            "claim.name": "roles",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "336acfe2-a717-492a-9055-5b70e808f42f",
+          "name": "login",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "preferred_username",
+            "id.token.claim": "false",
+            "access.token.claim": "false",
+            "claim.name": "login",
+            "jsonType.label": "String"
+          }
+        }
+      ]
+    },
+    {
+      "id": "87d299f2-434f-4abd-8cb0-a16231acd713",
+      "name": "microprofile-jwt",
+      "description": "Microprofile - JWT built-in scope",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "fce09d51-cb85-4ccd-b83d-865a4d4bf650",
+          "name": "groups",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-realm-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "multivalued": "true",
+            "userinfo.token.claim": "true",
+            "user.attribute": "foo",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "groups",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "3d1ee7e2-b7e1-4504-bd52-b47a2cb10eec",
+          "name": "upn",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "upn",
+            "jsonType.label": "String"
+          }
+        }
+      ]
+    },
+    {
+      "id": "0399b625-22d7-4d68-b4db-fd1dc2effacc",
+      "name": "offline_access",
+      "description": "OpenID Connect built-in scope: offline_access",
+      "protocol": "openid-connect",
+      "attributes": {
+        "consent.screen.text": "${offlineAccessScopeConsentText}",
+        "display.on.consent.screen": "true"
+      }
+    },
+    {
+      "id": "2b867b2d-3373-43ff-b50f-ea37a5e1c390",
+      "name": "phone",
+      "description": "OpenID Connect built-in scope: phone",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${phoneScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "daa0191b-20d1-4f71-b191-6c48a37e3677",
+          "name": "phone number",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "phoneNumber",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "phone_number",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "32213de7-12f7-4864-b696-c8e6c5e0c26e",
+          "name": "phone number verified",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "phoneNumberVerified",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "phone_number_verified",
+            "jsonType.label": "boolean"
+          }
+        }
+      ]
+    },
+    {
+      "id": "60a44832-9776-449f-94cd-fa8c24a75f35",
+      "name": "profile",
+      "description": "OpenID Connect built-in scope: profile",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${profileScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "a59584ab-7a7c-4b23-95b5-be8dbbfadc6f",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "d382c1dc-d5d8-479e-8809-f0a618113a07",
+          "name": "website",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "website",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "website",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "559f86c1-1187-498d-8354-723f4ea5721c",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": false,
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "0925e106-a8e2-4ad1-b75e-4147d185894a",
+          "name": "updated at",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "updatedAt",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "updated_at",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "eb8e2c73-5c65-4b53-8d55-46edef61315b",
+          "name": "locale",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "locale",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "locale",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "4c109376-01bc-4b69-a3c0-4b830ecad674",
+          "name": "middle name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "middleName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "middle_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "b3813956-e556-4b57-a06b-f71b0d6f3d47",
+          "name": "nickname",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "nickname",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "nickname",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "28beb4c0-029b-4aa5-ad5f-6d824ca67e15",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "53d681bc-ec29-4f57-924b-ff5bd22d4093",
+          "name": "profile",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "profile",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "profile",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "12ba8e12-157d-4729-918b-0d74fa444fba",
+          "name": "picture",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "picture",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "picture",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "ddb818fe-8e4a-4b26-9c5d-2467a26af6dc",
+          "name": "gender",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "gender",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "gender",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "f78b1746-2be1-45f4-9c1e-1f6141ccdb65",
+          "name": "birthdate",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "birthdate",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "birthdate",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "7723245c-4952-4822-86ae-084048b1f2f2",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "b192fe9f-aa82-4d7d-b8c7-eb7d1ba888d4",
+          "name": "zoneinfo",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "zoneinfo",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "zoneinfo",
+            "jsonType.label": "String"
+          }
+        }
+      ]
+    },
+    {
+      "id": "d181691e-b4a6-4063-9eba-6b984402a9a7",
+      "name": "role_list",
+      "description": "SAML role list",
+      "protocol": "saml",
+      "attributes": {
+        "consent.screen.text": "${samlRoleListScopeConsentText}",
+        "display.on.consent.screen": "true"
+      },
+      "protocolMappers": [
+        {
+          "id": "724b16d4-8a9b-42d8-850f-99ca1ab3c958",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        }
+      ]
+    },
+    {
+      "id": "915fcb95-81da-4e4c-86ee-73f3b52c83e9",
+      "name": "roles",
+      "description": "OpenID Connect scope for add user roles to the access token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${rolesScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "12f0b32d-8911-4028-809b-fc1c0e5e9207",
+          "name": "audience resolve",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-audience-resolve-mapper",
+          "consentRequired": false,
+          "config": {}
+        },
+        {
+          "id": "5b997b66-937f-46d3-9e8b-70dca949f682",
+          "name": "realm roles",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-realm-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "foo",
+            "access.token.claim": "true",
+            "claim.name": "realm_access.roles",
+            "jsonType.label": "String",
+            "multivalued": "true"
+          }
+        },
+        {
+          "id": "cdcd6969-a9aa-4de5-adbe-dc83da4184c5",
+          "name": "client roles",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-client-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "foo",
+            "access.token.claim": "true",
+            "claim.name": "resource_access.${client_id}.roles",
+            "jsonType.label": "String",
+            "multivalued": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "49177925-3cb4-4fe1-9ced-d9a331dee5c6",
+      "name": "acr",
+      "description": "OpenID Connect scope for add acr (authentication context class reference) to the token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "df11a217-a90d-4d01-9aab-84fbaa3a0ad6",
+          "name": "acr loa level",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-acr-mapper",
+          "consentRequired": false,
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "2daaac74-636f-4074-87a9-d1aba9dffb96",
+      "name": "web-origins",
+      "description": "OpenID Connect scope for add allowed web origins to the access token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "false",
+        "consent.screen.text": ""
+      },
+      "protocolMappers": [
+        {
+          "id": "752e035f-038d-46ac-b65d-91f863fdd986",
+          "name": "allowed web origins",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-allowed-origins-mapper",
+          "consentRequired": false,
+          "config": {}
+        }
+      ]
+    }
+  ],
+  "defaultDefaultClientScopes": ["web-origins", "acr", "email", "profile", "roles", "role_list"],
+  "defaultOptionalClientScopes": ["offline_access", "phone", "address", "microprofile-jwt"],
+  "browserSecurityHeaders": {
+    "contentSecurityPolicyReportOnly": "",
+    "xContentTypeOptions": "nosniff",
+    "xRobotsTag": "none",
+    "xFrameOptions": "SAMEORIGIN",
+    "contentSecurityPolicy": "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
+    "xXSSProtection": "1; mode=block",
+    "strictTransportSecurity": "max-age=31536000; includeSubDomains"
+  },
+  "smtpServer": {},
+  "eventsEnabled": false,
+  "eventsListeners": ["jboss-logging"],
+  "enabledEventTypes": [],
+  "adminEventsEnabled": false,
+  "adminEventsDetailsEnabled": false,
+  "identityProviders": [],
+  "identityProviderMappers": [],
+  "components": {
+    "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy": [
+      {
+        "id": "827fde01-dc1b-4c1f-a529-9ef833ca3432",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "oidc-usermodel-property-mapper",
+            "oidc-sha256-pairwise-sub-mapper",
+            "saml-user-attribute-mapper",
+            "saml-user-property-mapper",
+            "oidc-address-mapper",
+            "oidc-full-name-mapper",
+            "saml-role-list-mapper",
+            "oidc-usermodel-attribute-mapper"
+          ]
+        }
+      },
+      {
+        "id": "0a429e7e-be7a-46b4-b42a-d1f8b265ff16",
+        "name": "Allowed Client Scopes",
+        "providerId": "allowed-client-templates",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {
+          "allow-default-scopes": ["true"]
+        }
+      },
+      {
+        "id": "5a1ff0b4-250f-48ee-8169-abff30cf7534",
+        "name": "Allowed Client Scopes",
+        "providerId": "allowed-client-templates",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "allow-default-scopes": ["true"]
+        }
+      },
+      {
+        "id": "c79f6629-84a9-467c-81d0-63e20b19f916",
+        "name": "Full Scope Disabled",
+        "providerId": "scope",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "b6b23ef8-96e8-4e2e-8efe-8003057a8d42",
+        "name": "Max Clients Limit",
+        "providerId": "max-clients",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "max-clients": ["200"]
+        }
+      },
+      {
+        "id": "36dfaa02-0252-4448-9cdf-a17abf239f78",
+        "name": "Trusted Hosts",
+        "providerId": "trusted-hosts",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "host-sending-registration-request-must-match": ["true"],
+          "client-uris-must-match": ["true"]
+        }
+      },
+      {
+        "id": "8216421d-34fb-4726-8331-137217657bdb",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "oidc-address-mapper",
+            "oidc-usermodel-attribute-mapper",
+            "saml-user-property-mapper",
+            "saml-user-attribute-mapper",
+            "saml-role-list-mapper",
+            "oidc-full-name-mapper",
+            "oidc-usermodel-property-mapper",
+            "oidc-sha256-pairwise-sub-mapper"
+          ]
+        }
+      },
+      {
+        "id": "d045f3f9-15e6-4e69-a419-0e7ff8a635ef",
+        "name": "Consent Required",
+        "providerId": "consent-required",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      }
+    ],
+    "org.keycloak.userprofile.UserProfileProvider": [
+      {
+        "id": "b05ccf0d-d8ac-4695-bd60-37018f8f94b4",
+        "providerId": "declarative-user-profile",
+        "subComponents": {},
+        "config": {}
+      }
+    ],
+    "org.keycloak.keys.KeyProvider": [
+      {
+        "id": "62707fae-58f9-4fc2-89fb-0c5d212dc3dc",
+        "name": "rsa-generated",
+        "providerId": "rsa-generated",
+        "subComponents": {},
+        "config": {
+          "priority": ["100"]
+        }
+      },
+      {
+        "id": "4a8480bc-96fd-4906-a907-f948a73bab38",
+        "name": "hmac-generated",
+        "providerId": "hmac-generated",
+        "subComponents": {},
+        "config": {
+          "priority": ["100"],
+          "algorithm": ["HS256"]
+        }
+      },
+      {
+        "id": "40c01a32-0c0b-4dbb-9595-e5a5c8d26bc4",
+        "name": "aes-generated",
+        "providerId": "aes-generated",
+        "subComponents": {},
+        "config": {
+          "priority": ["100"]
+        }
+      }
+    ]
+  },
+  "internationalizationEnabled": false,
+  "supportedLocales": [],
+  "authenticationFlows": [
+    {
+      "id": "491fbbc9-b70b-45bd-8243-2039ae3f115d",
+      "alias": "Account verification options",
+      "description": "Method with which to verity the existing account",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-email-verification",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "flowAlias": "Verify Existing Account by Re-authentication",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "2c63ad60-76ab-4350-9def-74328bab70d0",
+      "alias": "Authentication Options",
+      "description": "Authentication options.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "basic-auth",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "basic-auth-otp",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-spnego",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 30,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "82b9b584-2243-4893-b58c-4567f34434a6",
+      "alias": "Browser - Conditional OTP",
+      "description": "Flow to determine if the OTP is required for the authentication",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "e70e7c74-8ab5-411c-b06c-d478a452bee3",
+      "alias": "Direct Grant - Conditional OTP",
+      "description": "Flow to determine if the OTP is required for the authentication",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-otp",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "4f3e6fdd-9b4d-4dc0-946a-1e1ccae7af71",
+      "alias": "First broker login - Conditional OTP",
+      "description": "Flow to determine if the OTP is required for the authentication",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "aa66c794-f21b-4663-9de1-9e27a7e425ab",
+      "alias": "Handle Existing Account",
+      "description": "Handle what to do if there is existing account with same email/username like authenticated identity provider",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-confirm-link",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "flowAlias": "Account verification options",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "2d4499a0-399c-4b6c-970c-7b441498f7b9",
+      "alias": "Reset - Conditional OTP",
+      "description": "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-otp",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "710f4172-56a5-466e-bc75-ad7405ff62b5",
+      "alias": "User creation or linking",
+      "description": "Flow for the existing/non-existing user alternatives",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticatorConfig": "create unique user config",
+          "authenticator": "idp-create-user-if-unique",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "flowAlias": "Handle Existing Account",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "da7d3a39-7077-4354-9ffc-5b9f79fbaf0d",
+      "alias": "Verify Existing Account by Re-authentication",
+      "description": "Reauthentication of existing account",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-username-password-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 20,
+          "flowAlias": "First broker login - Conditional OTP",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "6285968e-6200-463a-a329-8c60bc8fe9fc",
+      "alias": "browser",
+      "description": "browser based authentication",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-cookie",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "auth-spnego",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "identity-provider-redirector",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 25,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "flowAlias": "forms",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "10393f04-3922-40db-a622-2655dfcae45d",
+      "alias": "clients",
+      "description": "Base authentication for clients",
+      "providerId": "client-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "client-secret",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "client-jwt",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "client-secret-jwt",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "client-x509",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 40,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "4e5e164e-3c7e-4ca5-a10c-d7b817a7d468",
+      "alias": "direct grant",
+      "description": "OpenID Connect Resource Owner Grant",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "direct-grant-validate-username",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "direct-grant-validate-password",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 30,
+          "flowAlias": "Direct Grant - Conditional OTP",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "80f88b0b-70de-4e4c-ae56-0293558301c5",
+      "alias": "docker auth",
+      "description": "Used by Docker clients to authenticate against the IDP",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "docker-http-basic-authenticator",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "821af41a-6e77-4e8c-85a6-0280d5268909",
+      "alias": "first broker login",
+      "description": "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticatorConfig": "review profile config",
+          "authenticator": "idp-review-profile",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "flowAlias": "User creation or linking",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "c4058fb0-ad93-4595-96ef-7d4bc5cbef4d",
+      "alias": "forms",
+      "description": "Username, password, otp and other auth forms.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-username-password-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 20,
+          "flowAlias": "Browser - Conditional OTP",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "a2a1d056-2521-498f-b345-b7db56f9342c",
+      "alias": "http challenge",
+      "description": "An authentication flow based on challenge-response HTTP Authentication Schemes",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "no-cookie-redirect",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "flowAlias": "Authentication Options",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "13e68e1b-4b44-4f21-a253-5b2dea24404b",
+      "alias": "registration",
+      "description": "registration flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-page-form",
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "flowAlias": "registration form",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "e7588789-22d4-459b-96d6-1b480520f487",
+      "alias": "registration form",
+      "description": "registration form",
+      "providerId": "form-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-user-creation",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "registration-profile-action",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 40,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "registration-password-action",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 50,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "registration-recaptcha-action",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 60,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    },
+    {
+      "id": "8dc399ef-cf7d-46d5-9688-678c146ea8c4",
+      "alias": "reset credentials",
+      "description": "Reset credentials for a user if they forgot their password or something",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "reset-credentials-choose-user",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-credential-email",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticator": "reset-password",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 30,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 40,
+          "flowAlias": "Reset - Conditional OTP",
+          "userSetupAllowed": false,
+          "autheticatorFlow": true
+        }
+      ]
+    },
+    {
+      "id": "47ab5a7a-f67a-4a66-bdac-932ee230000d",
+      "alias": "saml ecp",
+      "description": "SAML ECP Profile Authentication Flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "http-basic-authenticator",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "userSetupAllowed": false,
+          "autheticatorFlow": false
+        }
+      ]
+    }
+  ],
+  "authenticatorConfig": [
+    {
+      "id": "b12be521-4e2b-42f0-a1a2-f1ba47ab4854",
+      "alias": "create unique user config",
+      "config": {
+        "require.password.update.after.registration": "false"
+      }
+    },
+    {
+      "id": "58bf2d56-1c45-4acc-9005-23b978d961d7",
+      "alias": "review profile config",
+      "config": {
+        "update.profile.on.first.login": "missing"
+      }
+    }
+  ],
+  "requiredActions": [
+    {
+      "alias": "CONFIGURE_TOTP",
+      "name": "Configure OTP",
+      "providerId": "CONFIGURE_TOTP",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 10,
+      "config": {}
+    },
+    {
+      "alias": "terms_and_conditions",
+      "name": "Terms and Conditions",
+      "providerId": "terms_and_conditions",
+      "enabled": false,
+      "defaultAction": false,
+      "priority": 20,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PASSWORD",
+      "name": "Update Password",
+      "providerId": "UPDATE_PASSWORD",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 30,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PROFILE",
+      "name": "Update Profile",
+      "providerId": "UPDATE_PROFILE",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 40,
+      "config": {}
+    },
+    {
+      "alias": "VERIFY_EMAIL",
+      "name": "Verify Email",
+      "providerId": "VERIFY_EMAIL",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 50,
+      "config": {}
+    },
+    {
+      "alias": "delete_account",
+      "name": "Delete Account",
+      "providerId": "delete_account",
+      "enabled": false,
+      "defaultAction": false,
+      "priority": 60,
+      "config": {}
+    },
+    {
+      "alias": "update_user_locale",
+      "name": "Update User Locale",
+      "providerId": "update_user_locale",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 1000,
+      "config": {}
+    },
+    {
+      "alias": "webauthn-register",
+      "name": "Webauthn Register",
+      "providerId": "webauthn-register",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 70,
+      "config": {}
+    },
+    {
+      "alias": "webauthn-register-passwordless",
+      "name": "Webauthn Register Passwordless",
+      "providerId": "webauthn-register-passwordless",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 80,
+      "config": {}
+    }
+  ],
+  "browserFlow": "browser",
+  "registrationFlow": "registration",
+  "directGrantFlow": "direct grant",
+  "resetCredentialsFlow": "reset credentials",
+  "clientAuthenticationFlow": "clients",
+  "dockerAuthenticationFlow": "docker auth",
+  "attributes": {
+    "cibaBackchannelTokenDeliveryMode": "poll",
+    "cibaExpiresIn": "120",
+    "cibaAuthRequestedUserHint": "login_hint",
+    "oauth2DeviceCodeLifespan": "600",
+    "clientOfflineSessionMaxLifespan": "0",
+    "oauth2DevicePollingInterval": "5",
+    "clientSessionIdleTimeout": "0",
+    "clientSessionMaxLifespan": "0",
+    "parRequestUriLifespan": "60",
+    "clientOfflineSessionIdleTimeout": "0",
+    "cibaInterval": "5",
+    "realmReusableOtpCode": "false",
+    "frontendUrl": "",
+    "acr.loa.map": "[]"
+  },
+  "keycloakVersion": "23.0.1",
+  "userManagedAccessAllowed": false,
+  "clientProfiles": {
+    "profiles": []
+  },
+  "clientPolicies": {
+    "policies": []
+  },
+  "users": [
+    {
+      "id": "4c973896-5761-41fc-8217-07c5d13a004b",
+      "createdTimestamp": 1505479415590,
+      "username": "admin",
+      "enabled": true,
+      "totp": false,
+      "emailVerified": true,
+      "firstName": "Admin",
+      "lastName": "Administrator",
+      "email": "admin@localhost",
+      "credentials": [
+        {
+          "id": "b860462b-9b02-48ba-9523-d3a8926a917b",
+          "type": "password",
+          "createdDate": 1505479429154,
+          "secretData": "{\"value\":\"4pf9K2jWSCcHC+CwsZP/qidN5pSmDUe6AX6wBerSGdBVKkExay8MWKx+EKmaaObZW6FVsD8vdW/ZsyUFD9gJ1Q==\",\"salt\":\"1/qNkZ5kr77jOMOBPBogGw==\"}",
+          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
+        }
+      ],
+      "disableableCredentialTypes": [],
+      "requiredActions": [],
+      "realmRoles": ["offline_access", "uma_authorization"],
+      "clientRoles": {
+        "account": ["view-profile", "manage-account"]
+      },
+      "notBefore": 0,
+      "groups": ["/Admins", "/Users"]
+    },
+    {
+      "id": "c4af4e2f-b432-4c3b-8405-cca86cd5b97b",
+      "createdTimestamp": 1505479373742,
+      "username": "user",
+      "enabled": true,
+      "totp": false,
+      "emailVerified": true,
+      "firstName": "",
+      "lastName": "User",
+      "email": "user@localhost",
+      "credentials": [
+        {
+          "id": "7821832b-1e82-45a2-b8d3-f1a6ad909e64",
+          "type": "password",
+          "createdDate": 1505479392766,
+          "secretData": "{\"value\":\"MbKsMgWPnZyImih8s4SaoCSCq+XIY/c6S9F93sXEidHF1TjPWxCqMkec0+o3860CMLXHt3az61cIJOWI0FW9aw==\",\"salt\":\"fmpBI1r8R1u75hDLMUlwBw==\"}",
+          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
+        }
+      ],
+      "disableableCredentialTypes": [],
+      "requiredActions": [],
+      "realmRoles": ["offline_access", "uma_authorization"],
+      "clientRoles": {
+        "account": ["view-profile", "manage-account"]
+      },
+      "notBefore": 0,
+      "groups": ["/Users"]
+    }
+  ]
+}

src/main/docker/realm-config/keycloak-health-check.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+exec 3<>/dev/tcp/localhost/9080
+
+echo -e "GET /health/ready HTTP/1.1\nhost: localhost:9080\n" >&3
+
+timeout --preserve-status 1 cat <&3 | grep -m 1 status | grep -m 1 UP
+ERROR=$?
+
+exec 3<&-
+exec 3>&-
+
+exit $ERROR

src/main/docker/services.yml

@@ -0,0 +1,52 @@
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+name: da-discovery
+services:
+  postgresql:
+    extends:
+      file: ./postgresql.yml
+      service: postgresql
+    networks:
+      - da-discovery-network
+      
+  zookeeper:
+    extends:
+      file: ./kafka.yml
+      service: zookeeper
+    networks:
+      - da-discovery-network
+      
+  kafka:
+    extends:
+      file: ./kafka.yml
+      service: kafka
+    networks:
+      - da-discovery-network
+    depends_on:
+      - zookeeper
+      
+  keycloak:
+    extends:
+      file: ./keycloak.yml
+      service: keycloak
+    networks:
+      - da-discovery-network
+      
+  jhipster-registry:
+    extends:
+      file: ./jhipster-registry.yml
+      service: jhipster-registry
+    depends_on:
+      keycloak:
+        condition: service_healthy
+    networks:
+      - da-discovery-network
+
+networks:
+  da-discovery-network:
+    driver: bridge
+    
+volumes:
+  postgresql-data:
+  kafka-data:
+  keycloak-data:
+  jhipster-registry-data:

src/main/docker/shell-wrapper.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Shell wrapper script to execute Spring Shell commands
+# Usage: ./shell-wrapper.sh list-crawlers
+
+# If no arguments provided, run in interactive shell mode
+if [ $# -eq 0 ]; then
+  java -jar /app/app.jar shell --spring.profiles.active=shell
+else
+  # Run the specific command
+  java -jar /app/app.jar "$@" --spring.profiles.active=shell
+fi 

src/main/docker/sonar.yml

@@ -0,0 +1,15 @@
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+name: da-discovery
+services:
+  sonar:
+    container_name: sonarqube
+    image: sonarqube:10.3.0-community
+    # Forced authentication redirect for UI is turned off for out of the box experience while trying out SonarQube
+    # For real use cases delete SONAR_FORCEAUTHENTICATION variable or set SONAR_FORCEAUTHENTICATION=true
+    environment:
+      - SONAR_FORCEAUTHENTICATION=false
+    # If you want to expose these ports outside your dev PC,
+    # remove the "127.0.0.1:" prefix
+    ports:
+      - 127.0.0.1:9001:9000
+      - 127.0.0.1:9000:9000

src/main/docker/zipkin.yml

@@ -0,0 +1,7 @@
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+name: da-discovery
+services:
+  zipkin:
+    image: openzipkin/zipkin:3.0
+    ports:
+      - 127.0.0.1:9411:9411

src/main/java/com/dalab/discovery/application/DADiscoveryAgent.java

@@ -0,0 +1,238 @@
+package com.dalab.discovery.application;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Optional;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
+import org.springframework.shell.command.annotation.EnableCommand;
+
+import com.dalab.discovery.catalog.service.ICatalogService;
+//import org.springframework.shell.command.annotation.EnableCommand;
+import com.dalab.discovery.client.cli.DiscoveryCommands;
+import com.dalab.discovery.common.config.ApplicationProperties;
+import com.dalab.discovery.common.config.CRLFLogConverter;
+import com.dalab.discovery.common.config.DynamicConfig;
+import com.dalab.discovery.crawler.model.gcp.BigQueryResource;
+import com.dalab.discovery.crawler.service.IDiscoveryService;
+import com.dalab.discovery.crawler.service.IFolderManagementService;
+import com.dalab.discovery.crawler.service.gcp.GCPResourceCrawler;
+import com.dalab.discovery.log.service.ILogAnalyzer;
+
+import jakarta.annotation.PostConstruct;
+import tech.jhipster.config.DefaultProfileUtil;
+import tech.jhipster.config.JHipsterConstants;
+
+@SpringBootApplication
+@EnableConfigurationProperties({ LiquibaseProperties.class, ApplicationProperties.class, DynamicConfig.class })
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = "com.dalab.discovery.client.feign")
+@EnableScheduling
+@EnableAspectJAutoProxy(proxyTargetClass = true)
+@EnableCommand(DiscoveryCommands.class)
+@ComponentScan(basePackages = { "com.dalab.discovery" })
+@EnableMethodSecurity
+public class DADiscoveryAgent {
+
+        @Value("${unity.catalog.name}")
+        private String catalogName;
+
+        @Value("${unity.catalog.schema.name}")
+        private String schemaName;
+
+        @Autowired
+         private final IFolderManagementService folderManagementService;
+        
+        @Autowired
+        private GCPResourceCrawler<BigQueryResource> gcpResourceCrawler;
+
+        private static final Logger log = LoggerFactory.getLogger(DADiscoveryAgent.class);
+
+        private final Environment env;
+        private final DynamicConfig dynamicConfig;
+        private final ICatalogService catalogService;
+        private final Collection<IDiscoveryService<?>> discoveryServices;
+        private Collection<ILogAnalyzer> logAnalyzerServices;
+
+        public DADiscoveryAgent(Environment env, DynamicConfig dynamicConfig,
+                        ICatalogService unityCatalogManager, Collection<IDiscoveryService<?>> discoveryServices,
+                        Collection<ILogAnalyzer> logAnalyzerServices,IFolderManagementService folderManagementService,
+                        GCPResourceCrawler gcpResourceCrawler) {
+                this.gcpResourceCrawler = gcpResourceCrawler;
+                this.folderManagementService = folderManagementService;
+                this.env = env;
+                this.dynamicConfig = dynamicConfig;
+                this.catalogService = unityCatalogManager;
+                this.discoveryServices = discoveryServices;
+                this.logAnalyzerServices = logAnalyzerServices;
+        }
+
+
+        public void runGCPCrawler(){
+
+        //String folderId = dynamicConfig.getFolderId();        
+
+        String folderId = "621021804931";
+        String accountId = "aialabs-dg-dev";
+        // Prepare context for BigQueryCrawler
+        Map<String, Object> context = new HashMap<>();
+        context.put("projectId", accountId); // Ensure correct project ID
+        context.put("location", "us-central1"); // Optional
+
+
+           
+           gcpResourceCrawler.discoverResourcesAsync(accountId, context);
+    
+            //folderManagementService.listFolders(folderId);
+        
+
+
+
+
+        
+    }
+
+        /**
+         * Initializes DGCrawler.
+         * <p>
+         * Spring profiles can be configured with a program argument
+         * --spring.profiles.active=your-active-profile
+         * <p>
+         * You can find more information on how profiles work with JHipster on <a href=
+         * "https://www.jhipster.tech/profiles/">https://www.jhipster.tech/profiles/</a>.
+         */
+        @PostConstruct
+        public void initApplication() {
+                Collection<String> activeProfiles = Arrays.asList(env.getActiveProfiles());
+                if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) &&
+                                activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) {
+                        log.error(
+                                        "You have misconfigured your application! It should not run "
+                                                        + "with both the 'dev' and 'prod' profiles at the same time.");
+                }
+                if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) &&
+                                activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_CLOUD)) {
+                        log.error(
+                                        "You have misconfigured your application! It should not "
+                                                        + "run with both the 'dev' and 'cloud' profiles at the same time.");
+                }
+
+                runGCPCrawler();
+
+                bootupDiscoveryServices(discoveryServices);
+                bootupLogAnalyzerServices(logAnalyzerServices);
+        }
+
+        /**
+         * Main method, used to run the application.
+         *
+         * @param args the command line arguments.
+         */
+        public static void main(String[] args) {
+                // Determine if we're running a shell command or regular application
+                boolean isShellCommand = true;
+                if (args.length > 0 && !args[0].startsWith("-")) {
+                        // This is likely a shell command, not a regular Spring Boot argument
+                        isShellCommand = true;
+                        System.setProperty("spring.shell.interactive.enabled", "true");
+                } else {
+                        // This is a regular Spring Boot application, disable Spring Shell
+                        System.setProperty("spring.shell.interactive.enabled", "false");
+                        System.setProperty("spring.shell.noninteractive.enabled", "false");
+                }
+                log.info("Starting application in {} mode", isShellCommand ? "shell" : "regular");
+                // Initialize Spring application
+                SpringApplication app = new SpringApplication(DADiscoveryAgent.class);
+
+                // Add default profile if needed
+                DefaultProfileUtil.addDefaultProfile(app);
+
+                // Run the application
+                Environment env = app.run(args).getEnvironment();
+
+                // Log application startup
+                logApplicationStartup(env);
+        }
+
+        /**
+         * Bootup and configure the discovery services.
+         * 
+         * @param discoveryServices
+         */
+        private void bootupDiscoveryServices(Collection<IDiscoveryService<?>> discoveryServices) {
+        }
+
+        /**
+         * Bootup and configure the log analyzer services.
+         * 
+         * @param logAnalyzerServices
+         */
+        private void bootupLogAnalyzerServices(Collection<ILogAnalyzer> logAnalyzerServices) {
+        }
+
+        private static void logApplicationStartup(Environment env) {
+                String protocol = Optional.ofNullable(env.getProperty("server.ssl.key-store")).map(key -> "https")
+                                .orElse("http");
+                String applicationName = env.getProperty("spring.application.name");
+                String serverPort = env.getProperty("server.port");
+                String contextPath = Optional
+                                .ofNullable(env.getProperty("server.servlet.context-path"))
+                                .filter(StringUtils::isNotBlank)
+                                .orElse("/");
+                String hostAddress = "localhost";
+                try {
+                        hostAddress = InetAddress.getLocalHost().getHostAddress();
+                } catch (UnknownHostException e) {
+                        log.warn("The host name could not be determined, using `localhost` as fallback");
+                }
+                log.info(
+                                CRLFLogConverter.CRLF_SAFE_MARKER,
+                                """
+
+                                                ----------------------------------------------------------
+                                                \tApplication '{}' is running! Access URLs:
+                                                \tLocal: \t\t{}://localhost:{}{}
+                                                \tExternal: \t{}://{}:{}{}
+                                                \tProfile(s): \t{}
+                                                ----------------------------------------------------------""",
+                                applicationName,
+                                protocol,
+                                serverPort,
+                                contextPath,
+                                protocol,
+                                hostAddress,
+                                serverPort,
+                                contextPath,
+                                env.getActiveProfiles().length == 0 ? env.getDefaultProfiles()
+                                                : env.getActiveProfiles());
+
+                String configServerStatus = env.getProperty("configserver.status");
+                if (configServerStatus == null) {
+                        configServerStatus = "Not found or not setup for this application";
+                }
+                log.info(
+                                CRLFLogConverter.CRLF_SAFE_MARKER,
+                                "\n----------------------------------------------------------\n\t" +
+                                                "Config Server: \t{}\n----------------------------------------------------------",
+                                configServerStatus);
+        }
+}

src/main/java/com/dalab/discovery/catalog/client/CatalogClient.java

@@ -0,0 +1,218 @@
+package com.dalab.discovery.catalog.client;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import com.dalab.discovery.common.model.CloudResource;
+import com.dalab.discovery.common.model.CloudService;
+import com.dalab.discovery.common.model.ResourceChange;
+import com.dalab.discovery.common.model.ResourceType;
+
+/**
+ * Client interface for interacting with external catalog services.
+ * This provides a common interface for different catalog services,
+ * such as data catalogs, metadata stores, or asset inventory systems.
+ */
+public interface CatalogClient {
+
+    /**
+     * Registers a resource in the catalog.
+     *
+     * @param resource The resource to register
+     * @return The ID of the registered resource in the catalog
+     */
+    String registerResource(CloudResource resource);
+
+    /**
+     * Registers multiple resources in the catalog.
+     *
+     * @param resources The resources to register
+     * @return A map of resource IDs to their catalog IDs
+     */
+    Map<String, String> registerResources(List<CloudResource> resources);
+
+    /**
+     * Updates a resource in the catalog.
+     *
+     * @param resource The resource to update
+     * @return true if the resource was updated, false otherwise
+     */
+    boolean updateResource(CloudResource resource);
+
+    /**
+     * Gets a resource from the catalog.
+     *
+     * @param resourceId   The resource ID (usually the unique ID like OCID, ARN,
+     *                     etc.)
+     * @param resourceType The resource type record (contains ID, service, provider
+     *                     info)
+     * @return The resource, if found
+     */
+    Optional<CloudResource> getResource(String resourceId, ResourceType resourceType);
+
+    /**
+     * Searches for resources in the catalog.
+     *
+     * @param query      The search query
+     * @param parameters Additional search parameters
+     * @return The resources matching the search
+     */
+    List<CloudResource> searchResources(String query, Map<String, Object> parameters);
+
+    /**
+     * Deletes a resource from the catalog.
+     *
+     * @param resourceId   The resource ID
+     * @param resourceType The resource type record
+     * @return true if the resource was deleted, false otherwise
+     */
+    boolean deleteResource(String resourceId, ResourceType resourceType);
+
+    /**
+     * Registers a schema for a resource.
+     *
+     * @param resourceId The resource ID
+     * @param schema     The schema definition
+     * @return The ID of the registered schema
+     */
+    String registerSchema(String resourceId, Object schema);
+
+    /**
+     * Gets the schema for a resource.
+     *
+     * @param resourceId The resource ID
+     * @return The schema, if found
+     */
+    Optional<Object> getSchema(String resourceId);
+
+    /**
+     * Records lineage information.
+     *
+     * @param sourceResourceId The source resource ID
+     * @param targetResourceId The target resource ID
+     * @param lineageType      The type of lineage (e.g., "COPY", "DERIVE",
+     *                         "TRANSFORM")
+     * @param metadata         Additional lineage metadata
+     * @return The ID of the lineage record
+     */
+    String recordLineage(String sourceResourceId, String targetResourceId,
+            String lineageType, Map<String, Object> metadata);
+
+    /**
+     * Gets lineage information for a resource.
+     *
+     * @param resourceId The resource ID
+     * @param direction  The lineage direction ("UPSTREAM", "DOWNSTREAM", or "BOTH")
+     * @param depth      The maximum depth to traverse
+     * @return The lineage information
+     */
+    Map<String, Object> getLineage(String resourceId, String direction, int depth);
+
+    /**
+     * Adds tags to a resource.
+     *
+     * @param resourceId The resource ID
+     * @param tags       The tags to add
+     * @return true if the tags were added, false otherwise
+     */
+    boolean addTags(String resourceId, Map<String, String> tags);
+
+    /**
+     * Gets tags for a resource.
+     *
+     * @param resourceId The resource ID
+     * @return The tags for the resource
+     */
+    Map<String, String> getTags(String resourceId);
+
+    /**
+     * Records an access event for a resource.
+     *
+     * @param resourceId The resource ID
+     * @param userId     The user ID
+     * @param accessType The type of access (e.g., "READ", "WRITE")
+     * @param timestamp  The time of access (null for current time)
+     * @return true if the access was recorded, false otherwise
+     */
+    boolean recordAccess(String resourceId, String userId, String accessType, Long timestamp);
+
+    /**
+     * Gets access history for a resource.
+     *
+     * @param resourceId The resource ID
+     * @param limit      The maximum number of records to return
+     * @return The access history
+     */
+    List<Map<String, Object>> getAccessHistory(String resourceId, int limit);
+
+    /**
+     * Records a change to a resource.
+     *
+     * @param change The resource change
+     * @return The ID of the change record
+     */
+    String recordChange(ResourceChange change);
+
+    /**
+     * Gets change history for a resource.
+     *
+     * @param resourceId The resource ID
+     * @param limit      The maximum number of records to return
+     * @return The change history
+     */
+    List<ResourceChange> getChangeHistory(String resourceId, int limit);
+
+    /**
+     * Gets the catalog connection status.
+     *
+     * @return true if connected, false otherwise
+     */
+    boolean isConnected();
+
+    /**
+     * Gets information about the catalog service.
+     *
+     * @return Information about the catalog service
+     */
+    Map<String, Object> getCatalogInfo();
+
+    /**
+     * Gets all resource types from the catalog.
+     *
+     * @return List of all available resource types
+     */
+    List<ResourceType> getAllResourceTypes();
+
+    /**
+     * Gets all cloud services from the catalog.
+     *
+     * @return List of all available cloud services
+     */
+    List<CloudService> getAllCloudServices();
+
+    /**
+     * Gets a specific resource type by its ID.
+     *
+     * @param typeId The resource type ID
+     * @return The resource type if found, null otherwise
+     */
+    ResourceType getResourceType(String typeId);
+
+    /**
+     * Gets a specific cloud service by its ID.
+     *
+     * @param serviceId The service ID
+     * @return The cloud service if found, null otherwise
+     */
+    CloudService getCloudService(String serviceId);
+
+    /**
+     * Gets service mappings from the catalog.
+     * These mappings help translate between different cloud provider service
+     * identifiers.
+     *
+     * @return Map of service mappings
+     */
+    Map<String, Object> getServiceMappings();
+}

src/main/java/com/dalab/discovery/catalog/client/impl/DefaultCatalogClient.java

@@ -0,0 +1,563 @@
+package com.dalab.discovery.catalog.client.impl;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+import com.dalab.discovery.catalog.client.CatalogClient;
+import com.dalab.discovery.common.model.CloudResource;
+import com.dalab.discovery.common.model.CloudService;
+import com.dalab.discovery.common.model.ResourceChange;
+import com.dalab.discovery.common.model.ResourceType;
+
+/**
+ * Default implementation of the CatalogClient interface.
+ * This implementation uses REST API calls to interact with an external catalog
+ * service.
+ */
+@Service
+@ConditionalOnProperty(name = "catalog.external.enabled", havingValue = "true", matchIfMissing = false)
+public class DefaultCatalogClient implements CatalogClient {
+    private static final Logger logger = LoggerFactory.getLogger(DefaultCatalogClient.class);
+
+    private final RestTemplate restTemplate;
+    private final String catalogBaseUrl;
+    private final String apiKey;
+
+    public DefaultCatalogClient(
+            RestTemplate restTemplate,
+            @Value("${catalog.external.baseUrl}") String catalogBaseUrl,
+            @Value("${catalog.external.apiKey:#{null}}") String apiKey) {
+        this.restTemplate = restTemplate;
+        this.catalogBaseUrl = catalogBaseUrl;
+        this.apiKey = apiKey;
+        logger.info("Initialized DefaultCatalogClient with base URL: {}", catalogBaseUrl);
+    }
+
+    private HttpHeaders createHeaders() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        if (apiKey != null && !apiKey.isBlank()) {
+            headers.set("X-API-Key", apiKey);
+        }
+        return headers;
+    }
+
+    @Override
+    public String registerResource(CloudResource resource) {
+        try {
+            HttpEntity<CloudResource> entity = new HttpEntity<>(resource, createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resources",
+                    HttpMethod.POST,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return (String) response.getBody().get("catalogId");
+            }
+            logger.warn("Failed to register resource: {}", resource.getId());
+            return null;
+        } catch (Exception e) {
+            logger.error("Error registering resource: " + resource.getId(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public Map<String, String> registerResources(List<CloudResource> resources) {
+        try {
+            HttpEntity<List<CloudResource>> entity = new HttpEntity<>(resources, createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resources/batch",
+                    HttpMethod.POST,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                Map<String, String> result = new HashMap<>();
+                Map<String, String> responseMap = (Map<String, String>) response.getBody().get("catalogIds");
+                if (responseMap != null) {
+                    return responseMap;
+                }
+            }
+            logger.warn("Failed to batch register resources, count: {}", resources.size());
+            return Collections.emptyMap();
+        } catch (Exception e) {
+            logger.error("Error batch registering resources", e);
+            return Collections.emptyMap();
+        }
+    }
+
+    @Override
+    public boolean updateResource(CloudResource resource) {
+        try {
+            HttpEntity<CloudResource> entity = new HttpEntity<>(resource, createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resources/" + resource.getId(),
+                    HttpMethod.PUT,
+                    entity,
+                    Map.class);
+
+            return response.getStatusCode().is2xxSuccessful();
+        } catch (Exception e) {
+            logger.error("Error updating resource: " + resource.getId(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public Optional<CloudResource> getResource(String resourceId, ResourceType resourceType) {
+        if (resourceId == null || resourceType == null) {
+            logger.warn("Attempted to get resource with null ID or type.");
+            return Optional.empty();
+        }
+        try {
+            HttpEntity<Void> entity = new HttpEntity<>(createHeaders());
+            String url = catalogBaseUrl + "/resources/" + resourceId + "?type=" + resourceType.id();
+            ResponseEntity<CloudResource> response = restTemplate.exchange(
+                    url,
+                    HttpMethod.GET,
+                    entity,
+                    CloudResource.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return Optional.of(response.getBody());
+            }
+            return Optional.empty();
+        } catch (Exception e) {
+            logger.error("Error getting resource: " + resourceId + " with type " + resourceType.id(), e);
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public List<CloudResource> searchResources(String query, Map<String, Object> parameters) {
+        try {
+            Map<String, Object> requestBody = new HashMap<>();
+            requestBody.put("query", query);
+            requestBody.put("parameters", parameters);
+
+            HttpEntity<Map<String, Object>> entity = new HttpEntity<>(requestBody, createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resources/search",
+                    HttpMethod.POST,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                List<Map<String, Object>> resources = (List<Map<String, Object>>) response.getBody().get("resources");
+                if (resources != null) {
+                    // This would need a proper mapper from Map to CloudResource
+                    return resources.stream()
+                            .map(this::mapToCloudResource)
+                            .collect(Collectors.toList());
+                }
+            }
+            return Collections.emptyList();
+        } catch (Exception e) {
+            logger.error("Error searching resources", e);
+            return Collections.emptyList();
+        }
+    }
+
+    // This is a placeholder method - would need proper implementation
+    private CloudResource mapToCloudResource(Map<String, Object> resourceMap) {
+        // In a real implementation, would convert the map to a CloudResource object
+        return null;
+    }
+
+    @Override
+    public boolean deleteResource(String resourceId, ResourceType resourceType) {
+        if (resourceId == null || resourceType == null) {
+            logger.warn("Attempted to delete resource with null ID or type.");
+            return false;
+        }
+        try {
+            HttpEntity<Void> entity = new HttpEntity<>(createHeaders());
+            String url = catalogBaseUrl + "/resources/" + resourceId + "?type=" + resourceType.id();
+            ResponseEntity<Void> response = restTemplate.exchange(
+                    url,
+                    HttpMethod.DELETE,
+                    entity,
+                    Void.class);
+
+            return response.getStatusCode().is2xxSuccessful();
+        } catch (Exception e) {
+            logger.error("Error deleting resource: " + resourceId + " with type " + resourceType.id(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public String registerSchema(String resourceId, Object schema) {
+        try {
+            Map<String, Object> requestBody = new HashMap<>();
+            requestBody.put("resourceId", resourceId);
+            requestBody.put("schema", schema);
+
+            HttpEntity<Map<String, Object>> entity = new HttpEntity<>(requestBody, createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/schemas",
+                    HttpMethod.POST,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return (String) response.getBody().get("schemaId");
+            }
+            return null;
+        } catch (Exception e) {
+            logger.error("Error registering schema for resource: " + resourceId, e);
+            return null;
+        }
+    }
+
+    @Override
+    public Optional<Object> getSchema(String resourceId) {
+        try {
+            HttpEntity<Void> entity = new HttpEntity<>(createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/schemas/" + resourceId,
+                    HttpMethod.GET,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return Optional.ofNullable(response.getBody().get("schema"));
+            }
+            return Optional.empty();
+        } catch (Exception e) {
+            logger.error("Error getting schema for resource: " + resourceId, e);
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public String recordLineage(String sourceResourceId, String targetResourceId,
+            String lineageType, Map<String, Object> metadata) {
+        try {
+            Map<String, Object> requestBody = new HashMap<>();
+            requestBody.put("sourceResourceId", sourceResourceId);
+            requestBody.put("targetResourceId", targetResourceId);
+            requestBody.put("lineageType", lineageType);
+            requestBody.put("metadata", metadata);
+
+            HttpEntity<Map<String, Object>> entity = new HttpEntity<>(requestBody, createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/lineage",
+                    HttpMethod.POST,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return (String) response.getBody().get("lineageId");
+            }
+            return null;
+        } catch (Exception e) {
+            logger.error("Error recording lineage", e);
+            return null;
+        }
+    }
+
+    @Override
+    public Map<String, Object> getLineage(String resourceId, String direction, int depth) {
+        try {
+            HttpEntity<Void> entity = new HttpEntity<>(createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/lineage/" + resourceId +
+                            "?direction=" + direction + "&depth=" + depth,
+                    HttpMethod.GET,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return response.getBody();
+            }
+            return Collections.emptyMap();
+        } catch (Exception e) {
+            logger.error("Error getting lineage for resource: " + resourceId, e);
+            return Collections.emptyMap();
+        }
+    }
+
+    @Override
+    public boolean addTags(String resourceId, Map<String, String> tags) {
+        try {
+            HttpEntity<Map<String, String>> entity = new HttpEntity<>(tags, createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resources/" + resourceId + "/tags",
+                    HttpMethod.POST,
+                    entity,
+                    Map.class);
+
+            return response.getStatusCode().is2xxSuccessful();
+        } catch (Exception e) {
+            logger.error("Error adding tags to resource: " + resourceId, e);
+            return false;
+        }
+    }
+
+    @Override
+    public Map<String, String> getTags(String resourceId) {
+        try {
+            HttpEntity<Void> entity = new HttpEntity<>(createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resources/" + resourceId + "/tags",
+                    HttpMethod.GET,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return (Map<String, String>) response.getBody().get("tags");
+            }
+            return Collections.emptyMap();
+        } catch (Exception e) {
+            logger.error("Error getting tags for resource: " + resourceId, e);
+            return Collections.emptyMap();
+        }
+    }
+
+    @Override
+    public boolean recordAccess(String resourceId, String userId, String accessType, Long timestamp) {
+        try {
+            Map<String, Object> requestBody = new HashMap<>();
+            requestBody.put("userId", userId);
+            requestBody.put("accessType", accessType);
+            if (timestamp != null) {
+                requestBody.put("timestamp", timestamp);
+            }
+
+            HttpEntity<Map<String, Object>> entity = new HttpEntity<>(requestBody, createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resources/" + resourceId + "/access",
+                    HttpMethod.POST,
+                    entity,
+                    Map.class);
+
+            return response.getStatusCode().is2xxSuccessful();
+        } catch (Exception e) {
+            logger.error("Error recording access for resource: " + resourceId, e);
+            return false;
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getAccessHistory(String resourceId, int limit) {
+        try {
+            HttpEntity<Void> entity = new HttpEntity<>(createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resources/" + resourceId + "/access?limit=" + limit,
+                    HttpMethod.GET,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return (List<Map<String, Object>>) response.getBody().get("accessRecords");
+            }
+            return Collections.emptyList();
+        } catch (Exception e) {
+            logger.error("Error getting access history for resource: " + resourceId, e);
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public String recordChange(ResourceChange change) {
+        try {
+            HttpEntity<ResourceChange> entity = new HttpEntity<>(change, createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/changes",
+                    HttpMethod.POST,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return (String) response.getBody().get("changeId");
+            }
+            return null;
+        } catch (Exception e) {
+            logger.error("Error recording change", e);
+            return null;
+        }
+    }
+
+    @Override
+    public List<ResourceChange> getChangeHistory(String resourceId, int limit) {
+        try {
+            HttpEntity<Void> entity = new HttpEntity<>(createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resources/" + resourceId + "/changes?limit=" + limit,
+                    HttpMethod.GET,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                List<Map<String, Object>> changes = (List<Map<String, Object>>) response.getBody().get("changes");
+                // This would need a proper mapper from Map to ResourceChange
+                return Collections.emptyList(); // Placeholder
+            }
+            return Collections.emptyList();
+        } catch (Exception e) {
+            logger.error("Error getting change history for resource: " + resourceId, e);
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public boolean isConnected() {
+        try {
+            HttpEntity<Void> entity = new HttpEntity<>(createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/health",
+                    HttpMethod.GET,
+                    entity,
+                    Map.class);
+
+            return response.getStatusCode().is2xxSuccessful() &&
+                    response.getBody() != null &&
+                    "UP".equals(response.getBody().get("status"));
+        } catch (Exception e) {
+            logger.error("Error checking catalog connection", e);
+            return false;
+        }
+    }
+
+    @Override
+    public Map<String, Object> getCatalogInfo() {
+        try {
+            HttpEntity<Void> entity = new HttpEntity<>(createHeaders());
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/info",
+                    HttpMethod.GET,
+                    entity,
+                    Map.class);
+
+            if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                return response.getBody();
+            }
+            return Collections.emptyMap();
+        } catch (Exception e) {
+            logger.error("Error getting catalog info", e);
+            return Collections.emptyMap();
+        }
+    }
+
+    @Override
+    public List<ResourceType> getAllResourceTypes() {
+        try {
+            HttpHeaders headers = createHeaders();
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            ResponseEntity<ResourceType[]> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resourceTypes",
+                    HttpMethod.GET,
+                    entity,
+                    ResourceType[].class);
+
+            ResourceType[] resourceTypes = response.getBody();
+            if (resourceTypes != null) {
+                return List.of(resourceTypes);
+            }
+        } catch (RestClientException e) {
+            logger.error("Failed to get resource types from catalog: {}", e.getMessage(), e);
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<CloudService> getAllCloudServices() {
+        try {
+            HttpHeaders headers = createHeaders();
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            ResponseEntity<CloudService[]> response = restTemplate.exchange(
+                    catalogBaseUrl + "/services",
+                    HttpMethod.GET,
+                    entity,
+                    CloudService[].class);
+
+            CloudService[] services = response.getBody();
+            if (services != null) {
+                return List.of(services);
+            }
+        } catch (RestClientException e) {
+            logger.error("Failed to get cloud services from catalog: {}", e.getMessage(), e);
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public ResourceType getResourceType(String typeId) {
+        try {
+            HttpHeaders headers = createHeaders();
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            ResponseEntity<ResourceType> response = restTemplate.exchange(
+                    catalogBaseUrl + "/resourceTypes/" + typeId,
+                    HttpMethod.GET,
+                    entity,
+                    ResourceType.class);
+
+            return response.getBody();
+        } catch (RestClientException e) {
+            logger.error("Failed to get resource type {} from catalog: {}", typeId, e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public CloudService getCloudService(String serviceId) {
+        try {
+            HttpHeaders headers = createHeaders();
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            ResponseEntity<CloudService> response = restTemplate.exchange(
+                    catalogBaseUrl + "/services/" + serviceId,
+                    HttpMethod.GET,
+                    entity,
+                    CloudService.class);
+
+            return response.getBody();
+        } catch (RestClientException e) {
+            logger.error("Failed to get cloud service {} from catalog: {}", serviceId, e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public Map<String, Object> getServiceMappings() {
+        try {
+            HttpHeaders headers = createHeaders();
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    catalogBaseUrl + "/mappings",
+                    HttpMethod.GET,
+                    entity,
+                    Map.class);
+
+            return response.getBody();
+        } catch (RestClientException e) {
+            logger.error("Failed to get service mappings from catalog: {}", e.getMessage(), e);
+            return Collections.emptyMap();
+        }
+    }
+}

src/main/java/com/dalab/discovery/catalog/config/CatalogClientConfig.java

@@ -0,0 +1,78 @@
+package com.dalab.discovery.catalog.config;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+import com.dalab.discovery.catalog.client.CatalogClient;
+import com.dalab.discovery.catalog.client.impl.DefaultCatalogClient;
+
+/**
+ * Configuration for the catalog client.
+ */
+@Configuration
+@EnableConfigurationProperties(CatalogClientConfig.CatalogProperties.class)
+public class CatalogClientConfig {
+
+	/**
+	 * Properties for the external catalog configuration.
+	 */
+	@ConfigurationProperties(prefix = "catalog.external")
+	public static class CatalogProperties {
+		private boolean enabled = false;
+		private String baseUrl = "http://localhost:8080/api/catalog";
+		private String apiKey;
+		private int connectionTimeout = 5000;
+		private int readTimeout = 5000;
+
+		public boolean isEnabled() {
+			return enabled;
+		}
+
+		public void setEnabled(boolean enabled) {
+			this.enabled = enabled;
+		}
+
+		public String getBaseUrl() {
+			return baseUrl;
+		}
+
+		public void setBaseUrl(String baseUrl) {
+			this.baseUrl = baseUrl;
+		}
+
+		public String getApiKey() {
+			return apiKey;
+		}
+
+		public void setApiKey(String apiKey) {
+			this.apiKey = apiKey;
+		}
+
+		public int getConnectionTimeout() {
+			return connectionTimeout;
+		}
+
+		public void setConnectionTimeout(int connectionTimeout) {
+			this.connectionTimeout = connectionTimeout;
+		}
+
+		public int getReadTimeout() {
+			return readTimeout;
+		}
+
+		public void setReadTimeout(int readTimeout) {
+			this.readTimeout = readTimeout;
+		}
+	}
+
+	@Bean
+	@ConditionalOnProperty(name = "catalog.external.enabled", havingValue = "true")
+	public CatalogClient catalogClient(CatalogProperties properties) {
+		RestTemplate restTemplate = new RestTemplate();
+		return new DefaultCatalogClient(restTemplate, properties.getBaseUrl(), properties.getApiKey());
+	}
+}

src/main/java/com/dalab/discovery/catalog/config/PersistenceConfig.java

@@ -0,0 +1,134 @@
+package com.dalab.discovery.catalog.config;
+
+import java.util.Properties;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.env.Environment;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * Base configuration for persistence with Hibernate and Spring Data JPA.
+ */
+@Configuration
+@Profile("!dev")
+@EnableTransactionManagement
+@EnableJpaRepositories(basePackages = {
+		"com.dalab.discovery.catalog.model.repository",
+		"com.dalab.discovery.common.model.repository",
+		"com.dalab.discovery.crawler.model.repository",
+		"com.dalab.discovery.log.service.gcp.persistence.repository"
+})
+@EntityScan(basePackages = {
+		"com.dalab.discovery.catalog.model",
+		"com.dalab.discovery.common.model",
+		"com.dalab.discovery.crawler.model",
+		"com.dalab.discovery.log.service.gcp.persistence.entity"
+})
+public abstract class PersistenceConfig {
+
+	@Autowired
+	private Environment env;
+
+	/**
+	 * Creates the entity manager factory.
+	 *
+	 * @param dataSource The data source
+	 * @return The entity manager factory bean
+	 */
+	@Bean
+	public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource) {
+		LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+		em.setDataSource(dataSource);
+		em.setPackagesToScan(
+				"com.dalab.discovery.catalog.model",
+				"com.dalab.discovery.common.model",
+				"com.dalab.discovery.crawler.model");
+
+		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+		vendorAdapter.setGenerateDdl(false);
+		em.setJpaVendorAdapter(vendorAdapter);
+
+		em.setJpaProperties(additionalJpaProperties());
+
+		return em;
+	}
+
+	/**
+	 * Creates the transaction manager.
+	 *
+	 * @param entityManagerFactory The entity manager factory
+	 * @return The transaction manager
+	 */
+	@Bean
+	public PlatformTransactionManager transactionManager(
+			LocalContainerEntityManagerFactoryBean entityManagerFactory) {
+		JpaTransactionManager transactionManager = new JpaTransactionManager();
+		transactionManager.setEntityManagerFactory(entityManagerFactory.getObject());
+		return transactionManager;
+	}
+
+	/**
+	 * Configures additional JPA properties.
+	 *
+	 * @return The JPA properties
+	 */
+	protected Properties additionalJpaProperties() {
+		Properties properties = new Properties();
+
+		// 1. DDL Auto Strategy
+		// Try the specific key from application-dev.yml, then standard Spring Boot key,
+		// then default to "update" (for tests).
+		String ddlAuto = env.getProperty("spring.jpa.properties.hibernate.hbm2ddl.auto");
+		if (ddlAuto == null) {
+			ddlAuto = env.getProperty("spring.jpa.hibernate.ddl-auto", "update");
+		}
+		properties.setProperty("hibernate.hbm2ddl.auto", ddlAuto);
+
+		// 2. Hibernate Dialect
+		// Try specific Hibernate dialect property, then standard Spring Boot
+		// database-platform, then default to H2 (for tests).
+		String dialect = env.getProperty("spring.jpa.properties.hibernate.dialect");
+		if (dialect == null) {
+			dialect = env.getProperty("spring.jpa.database-platform");
+			if (dialect == null) {
+				dialect = "org.hibernate.dialect.H2Dialect"; // Default for tests if no platform specified
+			}
+		}
+		properties.setProperty("hibernate.dialect", dialect);
+
+		// 3. Show SQL
+		// Read from standard Spring Boot key, default to "false".
+		properties.setProperty("hibernate.show_sql",
+				env.getProperty("spring.jpa.show-sql", "false"));
+
+		// 4. Format SQL
+		// Read from specific Hibernate property key, default to "false".
+		properties.setProperty("hibernate.format_sql",
+				env.getProperty("spring.jpa.properties.hibernate.format_sql", "false"));
+
+		// 5. Second Level Cache
+		properties.setProperty("hibernate.cache.use_second_level_cache",
+				env.getProperty("spring.jpa.properties.hibernate.cache.use_second_level_cache", "false"));
+
+		// 6. Query Cache
+		properties.setProperty("hibernate.cache.use_query_cache",
+				env.getProperty("spring.jpa.properties.hibernate.cache.use_query_cache", "false"));
+
+		// 7. JDBC Timezone
+		properties.setProperty("hibernate.jdbc.time_zone",
+				env.getProperty("spring.jpa.properties.hibernate.jdbc.time_zone", "UTC"));
+
+		return properties;
+	}
+}

src/main/java/com/dalab/discovery/catalog/config/ProdStagingPersistenceConfig.java

@@ -0,0 +1,26 @@
+package com.dalab.discovery.catalog.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+/**
+ * Production and staging environment persistence configuration using
+ * PostgreSQL.
+ */
+@Configuration
+@Profile({ "prod", "staging" })
+public class ProdStagingPersistenceConfig extends PersistenceConfig {
+
+	@Value("${spring.datasource.url}")
+	private String url;
+
+	@Value("${spring.datasource.username}")
+	private String username;
+
+	@Value("${spring.datasource.password}")
+	private String password;
+
+	@Value("${spring.datasource.driver-class-name}")
+	private String driverClassName;
+}

src/main/java/com/dalab/discovery/catalog/persistence/CloudHierarchyRegistry.java

@@ -0,0 +1,163 @@
+package com.dalab.discovery.catalog.persistence;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import com.dalab.discovery.common.config.CloudHierarchyProperties;
+import com.dalab.discovery.common.model.CloudService;
+import com.dalab.discovery.common.model.ResourceType;
+import com.dalab.discovery.common.model.enums.CloudProvider;
+
+import jakarta.annotation.PostConstruct;
+
+@Service
+public class CloudHierarchyRegistry {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(CloudHierarchyRegistry.class);
+
+	private final CloudHierarchyProperties cloudHierarchyProperties;
+
+	// Internal storage for the loaded hierarchy (made unmodifiable after init)
+	private Map<String, CloudService> servicesById = Collections.emptyMap();
+	private Map<String, ResourceType> resourceTypesById = Collections.emptyMap();
+	private Map<CloudProvider, List<CloudService>> servicesByProvider = Collections.emptyMap();
+	private Map<CloudService, List<ResourceType>> resourceTypesByService = Collections.emptyMap();
+
+	public CloudHierarchyRegistry(CloudHierarchyProperties cloudHierarchyProperties) {
+		LOGGER.info("Initializing Cloud Hierarchy Registry with properties: {}", cloudHierarchyProperties);
+		this.cloudHierarchyProperties = Objects.requireNonNull(cloudHierarchyProperties,
+				"cloudHierarchyProperties cannot be null");
+	}
+
+	@PostConstruct
+	public void initialize() {
+		LOGGER.info("Initializing Cloud Hierarchy Registry...");
+		if (cloudHierarchyProperties == null || CollectionUtils.isEmpty(cloudHierarchyProperties.getProviders())) {
+			LOGGER.warn("Cloud hierarchy configuration is empty or null. Registry will be empty.");
+			// Keep maps empty
+			return;
+		}
+
+		Map<String, CloudService> tempServicesById = new HashMap<>();
+		Map<String, ResourceType> tempResourceTypesById = new HashMap<>();
+		Map<CloudProvider, List<CloudService>> tempServicesByProvider = new HashMap<>();
+		Map<CloudService, List<ResourceType>> tempResourceTypesByService = new HashMap<>();
+
+		try {
+			for (CloudHierarchyProperties.ProviderConfig providerConfig : cloudHierarchyProperties.getProviders()) {
+				CloudProvider currentProvider = providerConfig.getProvider();
+				if (currentProvider == null) {
+					throw new IllegalStateException("Configuration error: ProviderConfig missing 'provider' field.");
+				}
+				List<CloudService> providerServices = new ArrayList<>();
+				tempServicesByProvider.put(currentProvider, providerServices);
+
+				if (CollectionUtils.isEmpty(providerConfig.getServices())) {
+					LOGGER.warn("No services configured for provider: {}", currentProvider);
+					continue;
+				}
+
+				for (CloudHierarchyProperties.ServiceConfig serviceConfig : providerConfig.getServices()) {
+					// Create and validate Service
+					CloudService service = new CloudService(serviceConfig.getId(), serviceConfig.getDisplayName(),
+							currentProvider);
+					if (tempServicesById.containsKey(service.id())) {
+						throw new IllegalStateException("Duplicate service ID found in configuration: " + service.id());
+					}
+					tempServicesById.put(service.id(), service);
+					providerServices.add(service); // Add to the list for the current provider
+
+					List<ResourceType> serviceResourceTypes = new ArrayList<>();
+					tempResourceTypesByService.put(service, serviceResourceTypes);
+
+					if (CollectionUtils.isEmpty(serviceConfig.getResourceTypes())) {
+						LOGGER.warn("No resource types configured for service: {} ({})", service.id(),
+								service.displayName());
+						continue;
+					}
+
+					for (CloudHierarchyProperties.ResourceTypeConfig resourceTypeConfig : serviceConfig
+							.getResourceTypes()) {
+						// Create and validate ResourceType
+						ResourceType resourceType = new ResourceType(resourceTypeConfig.getId(),
+								resourceTypeConfig.getDisplayName(), service);
+						if (tempResourceTypesById.containsKey(resourceType.id())) {
+							throw new IllegalStateException(
+									"Duplicate resource type ID found in configuration: " + resourceType.id());
+						}
+						tempResourceTypesById.put(resourceType.id(), resourceType);
+						serviceResourceTypes.add(resourceType); // Add to the list for the current service
+					}
+					// Make the list for this service unmodifiable
+					tempResourceTypesByService.put(service,
+							Collections.unmodifiableList(new ArrayList<>(serviceResourceTypes)));
+				}
+				// Make the list for this provider unmodifiable
+				tempServicesByProvider.put(currentProvider,
+						Collections.unmodifiableList(new ArrayList<>(providerServices)));
+			}
+
+			// Make the main maps unmodifiable
+			this.servicesById = Collections.unmodifiableMap(tempServicesById);
+			this.resourceTypesById = Collections.unmodifiableMap(tempResourceTypesById);
+			this.servicesByProvider = Collections.unmodifiableMap(tempServicesByProvider);
+			this.resourceTypesByService = Collections.unmodifiableMap(tempResourceTypesByService);
+
+			LOGGER.info("Cloud Hierarchy Registry initialized successfully with {} services and {} resource types.",
+					this.servicesById.size(), this.resourceTypesById.size());
+
+		} catch (Exception e) {
+			LOGGER.error("Failed to initialize Cloud Hierarchy Registry from configuration: {}", e.getMessage(), e);
+			// Prevent partial initialization - keep maps empty
+			this.servicesById = Collections.emptyMap();
+			this.resourceTypesById = Collections.emptyMap();
+			this.servicesByProvider = Collections.emptyMap();
+			this.resourceTypesByService = Collections.emptyMap();
+			// Optionally re-throw as a runtime exception to halt application startup
+			throw new RuntimeException("Failed to initialize Cloud Hierarchy Registry", e);
+		}
+	}
+
+	// --- Public Accessor Methods ---
+
+	public CloudService getService(String serviceId) {
+		return servicesById.get(serviceId);
+	}
+
+	public ResourceType getResourceType(String resourceTypeId) {
+		return resourceTypesById.get(resourceTypeId);
+	}
+
+	public List<CloudService> getServices(CloudProvider provider) {
+		return servicesByProvider.getOrDefault(provider, Collections.emptyList());
+	}
+
+	public List<ResourceType> getResourceTypes(CloudService service) {
+		return resourceTypesByService.getOrDefault(service, Collections.emptyList());
+	}
+
+	public List<ResourceType> getResourceTypes(CloudProvider provider) {
+		return getServices(provider).stream()
+				.flatMap(service -> getResourceTypes(service).stream())
+				.collect(Collectors.toList()); // Already unmodifiable lists from getResourceTypes(Service)
+	}
+
+	public Set<CloudService> getAllServices() {
+		return Collections.unmodifiableSet(servicesById.values().stream().collect(Collectors.toSet()));
+	}
+
+	public Set<ResourceType> getAllResourceTypes() {
+		return Collections.unmodifiableSet(resourceTypesById.values().stream().collect(Collectors.toSet()));
+	}
+}

src/main/java/com/dalab/discovery/catalog/persistence/IResourceCrawlerRegistry.java

@@ -0,0 +1,81 @@
+package com.dalab.discovery.catalog.persistence;
+
+import java.util.Collection;
+import java.util.List;
+
+import com.dalab.discovery.crawler.service.IResourceCrawler;
+import com.dalab.discovery.common.model.CloudResource;
+import com.dalab.discovery.common.model.CloudService;
+import com.dalab.discovery.common.model.ResourceType;
+import com.dalab.discovery.common.model.enums.CloudProvider;
+
+/**
+ * Registry for managing and retrieving resource crawlers.
+ */
+public interface IResourceCrawlerRegistry {
+
+    /**
+     * Gets crawlers for a specific cloud provider.
+     * 
+     * @param provider The cloud provider
+     * @return Collection of resource crawlers for the provider
+     */
+    Collection<IResourceCrawler<CloudResource>> getCrawlersForProvider(CloudProvider provider);
+
+    /**
+     * Gets crawlers for specific resource types and cloud provider.
+     * 
+     * @param provider      The cloud provider
+     * @param resourceTypes The resource types to get crawlers for
+     * @return Collection of resource crawlers for the specified types
+     */
+    Collection<IResourceCrawler<CloudResource>> getCrawlersForTypes(CloudProvider provider,
+            List<ResourceType> resourceTypes);
+
+    /**
+     * Registers a new resource crawler.
+     *
+     * @param resourceCrawler The crawler to register
+     * @return true if registration was successful
+     */
+    boolean registerCrawler(IResourceCrawler<?> resourceCrawler);
+
+    /**
+     * Unregisters an existing resource crawler.
+     *
+     * @param resourceCrawler The crawler to unregister
+     * @return true if unregistration was successful
+     */
+    boolean unregisterCrawler(IResourceCrawler<?> resourceCrawler);
+
+    /**
+     * Gets a crawler for a specific resource type.
+     *
+     * @param resourceType The resource type
+     * @return The crawler that can handle the type, or null if none found
+     */
+    IResourceCrawler<?> getCrawler(ResourceType resourceType);
+
+    /**
+     * Gets crawlers for a specific cloud service.
+     *
+     * @param service The cloud service
+     * @return List of resource crawlers for the service
+     */
+    List<IResourceCrawler<?>> getCrawlers(CloudService service);
+
+    /**
+     * Gets crawlers for a specific cloud provider (legacy method).
+     *
+     * @param provider The cloud provider
+     * @return List of resource crawlers for the provider
+     */
+    List<IResourceCrawler<?>> getCrawlers(CloudProvider provider);
+
+    /**
+     * Gets all registered crawlers.
+     *
+     * @return List of all resource crawlers
+     */
+    List<IResourceCrawler<?>> getAllCrawlers();
+}

src/main/java/com/dalab/discovery/catalog/persistence/impl/DefaultResourceCrawlerRegistry.java

@@ -0,0 +1,185 @@
+package com.dalab.discovery.catalog.persistence.impl;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.dalab.discovery.crawler.service.IResourceCrawler;
+import com.dalab.discovery.common.model.CloudResource;
+import com.dalab.discovery.common.model.CloudService;
+// Import the new ResourceType and Service records
+import com.dalab.discovery.common.model.ResourceType;
+import com.dalab.discovery.common.model.enums.CloudProvider;
+import com.dalab.discovery.catalog.persistence.CloudHierarchyRegistry;
+import com.dalab.discovery.catalog.persistence.IResourceCrawlerRegistry;
+
+/**
+ * Default implementation of ResourceRegistry that stores Crawlers in memory,
+ * mapped by the ResourceType they support.
+ */
+@org.springframework.stereotype.Service // Fully qualified annotation
+public class DefaultResourceCrawlerRegistry implements IResourceCrawlerRegistry {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultResourceCrawlerRegistry.class);
+
+    // Registry containing the loaded Service/ResourceType hierarchy
+    private final CloudHierarchyRegistry hierarchyRegistry;
+
+    // Maps ResourceType record to the corresponding Crawler that handles it.
+    // Assumes one crawler per resource type for simplicity. Use List<> if multiple
+    // are allowed.
+    private final Map<ResourceType, IResourceCrawler<?>> crawlersByResourceType = new ConcurrentHashMap<>();
+
+    // Constructor injection
+    public DefaultResourceCrawlerRegistry(CloudHierarchyRegistry hierarchyRegistry) {
+        this.hierarchyRegistry = Objects.requireNonNull(hierarchyRegistry, "hierarchyRegistry cannot be null");
+    }
+
+    @Override
+    public boolean registerCrawler(IResourceCrawler<?> resourceCrawler) {
+        if (resourceCrawler == null) {
+            LOGGER.warn("Attempted to register a null Crawler");
+            return false;
+        }
+
+        List<ResourceType> supportedTypes = resourceCrawler.getSupportedResourceTypes();
+        if (supportedTypes == null || supportedTypes.isEmpty()) {
+            LOGGER.warn("Crawler {} does not support any resource types. Skipping registration.",
+                    resourceCrawler.getClass().getSimpleName());
+            return false;
+        }
+
+        LOGGER.info("Registering Crawler: {} for types: {}",
+                resourceCrawler.getClass().getSimpleName(),
+                supportedTypes.stream().map(ResourceType::id).collect(Collectors.joining(", ")));
+
+        boolean registeredAny = false;
+        for (ResourceType type : supportedTypes) {
+            IResourceCrawler<?> previous = crawlersByResourceType.put(type, resourceCrawler);
+            if (previous != null && previous != resourceCrawler) {
+                LOGGER.warn(
+                        "Crawler registration conflict: ResourceType '{}' was handled by {} but is now handled by {}.",
+                        type.id(), previous.getClass().getSimpleName(), resourceCrawler.getClass().getSimpleName());
+            }
+            registeredAny = true;
+        }
+        return registeredAny;
+    }
+
+    @Override
+    public boolean unregisterCrawler(IResourceCrawler<?> resourceCrawler) {
+        if (resourceCrawler == null) {
+            LOGGER.warn("Attempted to unregister a null Crawler");
+            return false;
+        }
+
+        LOGGER.info("Unregistering Crawler: {}", resourceCrawler.getClass().getSimpleName());
+
+        // Find all resource types handled by this crawler and remove them
+        // This is less efficient but necessary if a crawler handles multiple types.
+        // Consider a reverse map if performance becomes an issue.
+        List<ResourceType> keysToRemove = crawlersByResourceType.entrySet().stream()
+                .filter(entry -> entry.getValue() == resourceCrawler) // Use identity check
+                .map(Map.Entry::getKey)
+                .toList(); // Java 16+
+
+        if (keysToRemove.isEmpty()) {
+            LOGGER.warn("Crawler {} was not found in the registry.", resourceCrawler.getClass().getSimpleName());
+            return false;
+        }
+
+        keysToRemove.forEach(crawlersByResourceType::remove);
+        LOGGER.info("Unregistered crawler {} for types: {}",
+                resourceCrawler.getClass().getSimpleName(),
+                keysToRemove.stream().map(ResourceType::id).collect(Collectors.joining(", ")));
+        return true;
+    }
+
+    @Override
+    public IResourceCrawler<?> getCrawler(ResourceType resourceType) {
+        if (resourceType == null) {
+            return null;
+        }
+        return crawlersByResourceType.get(resourceType);
+    }
+
+    @Override
+    public List<IResourceCrawler<?>> getCrawlers(CloudService service) {
+        if (service == null) {
+            return Collections.emptyList();
+        }
+        // Find all resource types for this service from the hierarchy registry
+        return hierarchyRegistry.getResourceTypes(service).stream()
+                .map(this::getCrawler) // Look up the crawler for each type
+                .filter(Objects::nonNull) // Filter out types with no registered crawler
+                .distinct() // Ensure each crawler instance appears only once
+                .collect(Collectors.toUnmodifiableList());
+    }
+
+    @Override
+    public List<IResourceCrawler<?>> getCrawlers(CloudProvider provider) {
+        if (provider == null) {
+            return Collections.emptyList();
+        }
+        // Find all services for this provider, then get crawlers for each service
+        return hierarchyRegistry.getServices(provider).stream()
+                .flatMap(service -> getCrawlers(service).stream()) // Get crawlers for each service
+                .distinct() // Ensure each crawler instance appears only once
+                .collect(Collectors.toUnmodifiableList());
+    }
+
+    @Override
+    public Collection<IResourceCrawler<CloudResource>> getCrawlersForProvider(CloudProvider provider) {
+        if (provider == null) {
+            return Collections.emptyList();
+        }
+
+        // Cast to the required Collection type from our existing method
+        @SuppressWarnings("unchecked")
+        List<IResourceCrawler<CloudResource>> result = (List<IResourceCrawler<CloudResource>>) (List<?>) getCrawlers(
+                provider);
+        return result;
+    }
+
+    @Override
+    public Collection<IResourceCrawler<CloudResource>> getCrawlersForTypes(CloudProvider provider,
+            List<ResourceType> resourceTypes) {
+        if (provider == null || resourceTypes == null || resourceTypes.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        // Get all crawlers for this provider
+        Collection<IResourceCrawler<CloudResource>> allCrawlers = getCrawlersForProvider(provider);
+
+        // Filter to those that support any of the requested types
+        return allCrawlers.stream()
+                .filter(crawler -> crawler.getSupportedResourceTypes().stream()
+                        .anyMatch(resourceTypes::contains))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<IResourceCrawler<?>> getAllCrawlers() {
+        // Return a unique, unmodifiable list of all registered crawler instances
+        return crawlersByResourceType.values().stream()
+                .distinct()
+                .collect(Collectors.toUnmodifiableList());
+    }
+
+    // Remove the old getCrawlersByProvider method as getCrawlers(CloudProvider)
+    // replaces it
+    /*
+     * @Override
+     * public List<IResourceCrawler<?>> getCrawlersByProvider(CloudProvider
+     * cloudProvider) {
+     * // ... old implementation ...
+     * }
+     */
+}

src/main/java/com/dalab/discovery/catalog/service/CatalogLiterals.java

@@ -0,0 +1,43 @@
+package com.dalab.discovery.catalog.service;
+
+public class CatalogLiterals {
+
+    public static final String BASE_URL = "http://localhost:8080/api/2.1/unity-catalog"; // TODO Read it from config
+    public static final String CATALOGS_ENDPOINT = BASE_URL + "/catalogs";
+    public static final String SCHEMAS_ENDPOINT = BASE_URL + "/schemas";
+    public static final String TABLES_ENDPOINT = BASE_URL + "/tables";
+    public static final String CONTENT_TYPE = "Content-Type";
+    public static final String APPLICATION_JSON = "application/json";
+    public static final String ACCEPT = "Accept";
+    public static final String NAME = "name";
+    public static final String CATALOG_NAME = "catalog_name";
+    public static final String SCHEMA_NAME = "schema_name";
+    public static final String TABLE_TYPE = "table_type";
+    public static final String EXTERNAL = "EXTERNAL";
+    public static final String DATA_SOURCE_FORMAT = "data_source_format";
+    public static final String DELTA = "DELTA";
+    public static final String COLUMNS = "columns";
+    public static final String STORAGE_LOCATION = "storage_location";
+    public static final String COMMENT = "comment";
+    public static final String PROPERTIES = "properties";
+    public static final String ADDITIONAL_PROP1 = "additionalProp1";
+    public static final String ADDITIONAL_PROP2 = "additionalProp2";
+    public static final String ADDITIONAL_PROP3 = "additionalProp3";
+    public static final String VALUE1 = "value1";
+    public static final String VALUE2 = "value2";
+    public static final String VALUE3 = "value3";
+    public static final String ID = "id";
+    public static final String INT = "INT";
+    public static final String STRING = "STRING";
+    public static final String PRIMARY_KEY_COLUMN = "Primary key column";
+    public static final String NAME_OF_ENTITY = "Name of the entity";
+    public static final String POSITION = "position";
+    public static final String TYPE_TEXT = "type_text";
+    public static final String TYPE_JSON = "type_json";
+    public static final String TYPE_NAME = "type_name";
+    public static final String TYPE_PRECISION = "type_precision";
+    public static final String TYPE_SCALE = "type_scale";
+    public static final String TYPE_INTERVAL_TYPE = "type_interval_type";
+    public static final String NULLABLE = "nullable";
+    public static final String PARTITION_INDEX = "partition_index";
+}

src/main/java/com/dalab/discovery/catalog/service/ICatalogService.java

@@ -0,0 +1,148 @@
+package com.dalab.discovery.catalog.service;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.dalab.discovery.common.model.CloudResource;
+import com.dalab.discovery.common.model.ResourceChange;
+import com.dalab.discovery.common.model.ResourceType;
+import com.dalab.discovery.common.model.enums.CloudProvider;
+
+/**
+ * Consolidated service interface for catalog operations.
+ * Works with the com.dalab.discovery.common.models (CloudResource,
+ * ResourceChange).
+ */
+public interface ICatalogService {
+
+	// --- Resource Query Methods ---
+
+	/**
+	 * Retrieves a resource by its internal database primary key.
+	 *
+	 * @param resourceDbId The database UUID.
+	 * @return Optional containing the resource if found.
+	 */
+	Optional<CloudResource> getResource(UUID resourceDbId);
+
+	/**
+	 * Retrieves a resource by its business key (resource ID, provider, type ID).
+	 *
+	 * @param resourceId The provider-specific resource ID.
+	 * @param provider   The cloud provider.
+	 * @param typeId     The resource type ID.
+	 * @return Optional containing the resource if found.
+	 */
+	Optional<CloudResource> getResourceByKey(String resourceId, CloudProvider provider, String typeId);
+
+	/**
+	 * Retrieves resources by type (using ResourceType record) and provider.
+	 * Provides pagination support.
+	 *
+	 * @param type     The ResourceType record.
+	 * @param provider The cloud provider.
+	 * @param pageable Pagination information.
+	 * @return A Page of matching resources.
+	 */
+	Page<CloudResource> getResourcesByType(ResourceType type, CloudProvider provider, Pageable pageable);
+
+	/**
+	 * Retrieves resources by Account ID (e.g., AWS Account, Azure Subscription, GCP
+	 * Project).
+	 * Provides pagination support.
+	 *
+	 * @param accountId The account identifier.
+	 * @param pageable  Pagination information.
+	 * @return A Page of resources associated with the account.
+	 */
+	Page<CloudResource> getResourcesByAccount(String accountId, Pageable pageable);
+
+	// --- Change Processing Method ---
+
+	/**
+	 * Updates resources in the catalog.
+	 * 
+	 * @param resources The resources to update
+	 */
+	void updateResources(List<CloudResource> resources);
+
+	/**
+	 * Processes a resource change.
+	 * 
+	 * @param change The resource change to process
+	 */
+	void processResourceChange(ResourceChange change);
+
+	/**
+	 * Processes multiple resource changes.
+	 * 
+	 * @param changes The resource changes to process
+	 */
+	default void processResourceChanges(List<ResourceChange> changes) {
+		if (changes != null) {
+			changes.forEach(this::processResourceChange);
+		}
+	}
+
+	// --- Change History Query Methods ---
+
+	/**
+	 * Retrieves change history for a specific resource (identified by DB ID).
+	 * Provides pagination support.
+	 *
+	 * @param resourceDbId The database UUID of the CloudResource.
+	 * @param pageable     Pagination information.
+	 * @return A Page of ResourceChange records for the resource.
+	 */
+	Page<ResourceChange> getResourceChanges(UUID resourceDbId, Pageable pageable);
+
+	/**
+	 * Retrieves change history within a specific time range.
+	 * Provides pagination support.
+	 *
+	 * @param start    Start time (inclusive).
+	 * @param end      End time (exclusive).
+	 * @param pageable Pagination information.
+	 * @return A Page of ResourceChange records within the time range.
+	 */
+	Page<ResourceChange> getChangesByTimeRange(Instant start, Instant end, Pageable pageable);
+
+	// --- Potentially useful methods adapted from ICatalogUpdater ---
+	// These might need adjustment or implementation based on requirements
+
+	/**
+	 * Updates tags for a specific resource.
+	 *
+	 * @param resourceDbId The database UUID of the CloudResource.
+	 * @param tags         The complete set of tags to apply.
+	 * @return The updated CloudResource, or empty if not found.
+	 */
+	Optional<CloudResource> updateResourceTags(UUID resourceDbId, Map<String, String> tags);
+
+	/**
+	 * Updates technical metadata for a specific resource.
+	 *
+	 * @param resourceDbId The database UUID of the CloudResource.
+	 * @param metadata     The complete set of technical metadata to apply.
+	 * @return The updated CloudResource, or empty if not found.
+	 */
+	Optional<CloudResource> updateTechnicalMetadata(UUID resourceDbId, Map<String, String> metadata);
+
+	/**
+	 * Updates business metadata for a specific resource.
+	 *
+	 * @param resourceDbId The database UUID of the CloudResource.
+	 * @param metadata     The complete set of business metadata to apply.
+	 * @return The updated CloudResource, or empty if not found.
+	 */
+	Optional<CloudResource> updateBusinessMetadata(UUID resourceDbId, Map<String, String> metadata);
+
+	// markResourceDeleted might be handled by processResourceChanges(DELETE)
+	// updateResourceProperties merged into metadata methods?
+}

src/main/java/com/dalab/discovery/catalog/service/UnityCatalogManager.java

@@ -0,0 +1,102 @@
+package com.dalab.discovery.catalog.service;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class UnityCatalogManager {
+
+    private static final Logger log = LoggerFactory.getLogger(UnityCatalogManager.class);
+
+    public void createCatalog(String catalogName) throws Exception {
+        String payload = "{\"" + CatalogLiterals.NAME + "\": \"" + catalogName + "\"}";
+        log.info("Creating catalog: " + catalogName);
+        ApiResponse response = sendPostRequest(CatalogLiterals.CATALOGS_ENDPOINT, payload);
+        handleResponse(response, "Catalog");
+    }
+
+    public void createSchema(String catalogName, String schemaName) throws Exception {
+        String payload =
+            "{\"" + CatalogLiterals.NAME + "\": \"" + schemaName + "\", \"" + CatalogLiterals.CATALOG_NAME + "\": \"" + catalogName + "\"}";
+        log.info("Creating schema: " + schemaName + " in catalog: " + catalogName);
+        ApiResponse response = sendPostRequest(CatalogLiterals.SCHEMAS_ENDPOINT, payload);
+        handleResponse(response, "Schema");
+    }
+
+
+    static ApiResponse sendPostRequest(String endpoint, String payload) throws Exception {
+        HttpURLConnection conn = null;
+        try {
+            URL url = new URL(endpoint);
+            conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("POST");
+            conn.setRequestProperty("Content-Type", "application/json");
+            conn.setRequestProperty("Accept", "application/json");
+            conn.setDoOutput(true);
+
+            // Write request payload
+            try (OutputStream os = conn.getOutputStream()) {
+                byte[] input = payload.getBytes(StandardCharsets.UTF_8);
+                os.write(input, 0, input.length);
+            }
+
+            // Read response
+            int responseCode = conn.getResponseCode();
+            String responseBody;
+            try (
+                BufferedReader br = new BufferedReader(
+                    new InputStreamReader(responseCode < 400 ? conn.getInputStream() : conn.getErrorStream(), StandardCharsets.UTF_8)
+                )
+            ) {
+                StringBuilder response = new StringBuilder();
+                String responseLine;
+                while ((responseLine = br.readLine()) != null) {
+                    response.append(responseLine.trim());
+                }
+                responseBody = response.toString();
+            }
+
+            return new ApiResponse(responseCode, responseBody);
+        } finally {
+            if (conn != null) {
+                conn.disconnect();
+            }
+        }
+    }
+
+    void handleResponse(ApiResponse response, String resourceType) {
+        if (response.getStatusCode() == HttpURLConnection.HTTP_OK || response.getStatusCode() == HttpURLConnection.HTTP_CREATED) {
+            log.info(resourceType + " created successfully. Response: " + response.getResponseBody());
+        } else {
+            log.info(
+                "Failed to create " + resourceType + ". Status Code: " + response.getStatusCode() + ", Error: " + response.getResponseBody()
+            );
+            throw new RuntimeException("Failed to create " + resourceType + ": " + response.getResponseBody());
+        }
+    }
+
+    // Helper class to store API response
+    static class ApiResponse {
+
+        private final int statusCode;
+        private final String responseBody;
+
+        public ApiResponse(int statusCode, String responseBody) {
+            this.statusCode = statusCode;
+            this.responseBody = responseBody;
+        }
+
+        public int getStatusCode() {
+            return statusCode;
+        }
+
+        public String getResponseBody() {
+            return responseBody;
+        }
+    }
+}

src/main/java/com/dalab/discovery/catalog/service/impl/CatalogServiceImpl.java

@@ -0,0 +1,501 @@
+package com.dalab.discovery.catalog.service.impl;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.dalab.discovery.catalog.service.ICatalogService;
+import com.dalab.discovery.common.model.CloudResource;
+import com.dalab.discovery.common.model.CloudResourceFactory;
+import com.dalab.discovery.common.model.CloudResourceUsageStats;
+import com.dalab.discovery.common.model.ResourceChange;
+import com.dalab.discovery.common.model.ResourceType;
+import com.dalab.discovery.common.model.enums.CloudProvider;
+import com.dalab.discovery.common.model.repository.CloudResourceRepository;
+import com.dalab.discovery.common.model.repository.CloudResourceUsageStatsRepository;
+import com.dalab.discovery.common.model.repository.ResourceChangeRepository;
+
+/**
+ * Implementation of the consolidated ICatalogService.
+ * Handles querying and updating the catalog based on the sd.domain model.
+ */
+@Service
+@Transactional
+public class CatalogServiceImpl implements ICatalogService {
+
+	private static final Logger log = LoggerFactory.getLogger(CatalogServiceImpl.class);
+
+	private final CloudResourceRepository cloudResourceRepository;
+	private final ResourceChangeRepository resourceChangeRepository;
+	private final CloudResourceUsageStatsRepository usageStatsRepository;
+	private final CloudResourceFactory cloudResourceFactory;
+
+	@Autowired
+	public CatalogServiceImpl(CloudResourceRepository cloudResourceRepository,
+			ResourceChangeRepository resourceChangeRepository,
+			CloudResourceUsageStatsRepository usageStatsRepository,
+			CloudResourceFactory cloudResourceFactory) {
+		this.cloudResourceRepository = cloudResourceRepository;
+		this.resourceChangeRepository = resourceChangeRepository;
+		this.usageStatsRepository = usageStatsRepository;
+		this.cloudResourceFactory = cloudResourceFactory;
+	}
+
+	@Override
+	@Transactional(readOnly = true)
+	public Optional<CloudResource> getResource(UUID resourceDbId) {
+		log.debug("Fetching resource by DB ID: {}", resourceDbId);
+		return cloudResourceRepository.findById(resourceDbId);
+	}
+
+	@Override
+	@Transactional(readOnly = true)
+	public Optional<CloudResource> getResourceByKey(String resourceId, CloudProvider provider, String typeId) {
+		log.debug("Fetching resource by key: resourceId={}, provider={}, typeId={}", resourceId, provider, typeId);
+		return cloudResourceRepository.findByResourceIdAndCloudProviderAndTypeId(resourceId, provider, typeId);
+	}
+
+	@Override
+	@Transactional(readOnly = true)
+	public Page<CloudResource> getResourcesByType(ResourceType type, CloudProvider provider, Pageable pageable) {
+		if (type == null || provider == null || type.service() == null) {
+			log.warn("ResourceType, Provider, or Service within ResourceType is null, cannot query by type.");
+			return Page.empty(pageable);
+		}
+		log.debug("Fetching resources by type: provider={}, serviceId={}, typeId={}, pageable={}",
+				provider, type.service().id(), type.id(), pageable);
+
+		return cloudResourceRepository.findByCloudProviderAndServiceIdAndTypeId(
+				provider, type.service().id(), type.id(), pageable);
+	}
+
+	@Override
+	@Transactional(readOnly = true)
+	public Page<CloudResource> getResourcesByAccount(String accountId, Pageable pageable) {
+		log.debug("Fetching resources by account: {}, pageable={}", accountId, pageable);
+
+		return cloudResourceRepository.findByAccountId(accountId, pageable);
+	}
+
+	@Override
+	public void processResourceChanges(List<ResourceChange> changes) {
+		if (changes == null || changes.isEmpty()) {
+			log.debug("No resource changes to process.");
+			return;
+		}
+		log.info("Processing {} resource change(s)...", changes.size());
+
+		for (ResourceChange change : changes) {
+			try {
+				processResourceChange(change);
+			} catch (Exception e) {
+				log.error("Failed to process resource change for resourceId: {} - {}",
+						change.getResourceId(), e.getMessage(), e);
+			}
+		}
+		log.info("Finished processing resource changes.");
+	}
+
+	@Override
+	public void processResourceChange(ResourceChange change) {
+		if (change == null) {
+			log.debug("No resource change to process.");
+			return;
+		}
+
+		try {
+			resourceChangeRepository.save(change);
+			Optional<CloudResource> existingResourceOpt = cloudResourceRepository
+					.findByResourceIdAndCloudProviderAndTypeId(
+							change.getResourceId(),
+							change.getCloudProvider(),
+							change.getTypeId());
+
+			switch (change.getChangeType()) {
+				case CREATE:
+					handleCreate(change, existingResourceOpt);
+					break;
+				case UPDATE:
+					handleUpdate(change, existingResourceOpt);
+					break;
+				case DELETE:
+					handleDelete(change, existingResourceOpt);
+					break;
+				case ACCESS:
+					handleAccess(change, existingResourceOpt);
+					break;
+				case PERMISSION:
+					handlePermission(change, existingResourceOpt);
+					break;
+				default:
+					handleUnknown(change, existingResourceOpt);
+					break;
+			}
+		} catch (Exception e) {
+			log.error("Failed to process resource change for resourceId: {} - {}",
+					change.getResourceId(), e.getMessage(), e);
+			throw e; // Re-throw to be consistent with interface expectations
+		}
+	}
+
+	@Override
+	@Transactional(readOnly = true)
+	public Page<ResourceChange> getResourceChanges(UUID resourceDbId, Pageable pageable) {
+		log.debug("Fetching changes for resource DB ID: {}, pageable={}", resourceDbId, pageable);
+
+		// Get the resource first to determine its business key
+		return cloudResourceRepository.findById(resourceDbId)
+				.map(resource -> resourceChangeRepository.findByResourceIdOrderByTimestampDesc(
+						resource.getResourceId(), pageable))
+				.orElse(Page.empty(pageable));
+	}
+
+	@Override
+	@Transactional(readOnly = true)
+	public Page<ResourceChange> getChangesByTimeRange(Instant start, Instant end, Pageable pageable) {
+		log.debug("Fetching changes between {} and {}, pageable={}", start, end, pageable);
+
+		return resourceChangeRepository.findByTimestampBetweenOrderByTimestampDesc(start, end, pageable);
+	}
+
+	@Override
+	public Optional<CloudResource> updateResourceTags(UUID resourceDbId, Map<String, String> tags) {
+		log.info("Updating tags for resource DB ID: {}", resourceDbId);
+		return cloudResourceRepository.findById(resourceDbId).map(resource -> {
+			resource.setTags(tags);
+			resource.setUpdatedAt(Instant.now());
+			// Track change? Maybe handled by other flows.
+			return cloudResourceRepository.save(resource);
+		});
+	}
+
+	@Override
+	public Optional<CloudResource> updateTechnicalMetadata(UUID resourceDbId, Map<String, String> metadata) {
+		log.info("Updating technical metadata for resource DB ID: {}", resourceDbId);
+		return cloudResourceRepository.findById(resourceDbId).map(resource -> {
+			resource.setTechnicalMetadata(metadata);
+			resource.setUpdatedAt(Instant.now());
+			return cloudResourceRepository.save(resource);
+		});
+	}
+
+	@Override
+	public Optional<CloudResource> updateBusinessMetadata(UUID resourceDbId, Map<String, String> metadata) {
+		log.info("Updating business metadata for resource DB ID: {}", resourceDbId);
+		return cloudResourceRepository.findById(resourceDbId).map(resource -> {
+			resource.setBusinessMetadata(metadata);
+			resource.setUpdatedAt(Instant.now());
+			return cloudResourceRepository.save(resource);
+		});
+	}
+
+	@Override
+	public void updateResources(List<CloudResource> resources) {
+		if (resources == null || resources.isEmpty()) {
+			log.debug("No resources to update.");
+			return;
+		}
+		
+		log.info("Updating {} resources in catalog...", resources.size());
+		
+		for (CloudResource resource : resources) {
+			try {
+				// Check if resource already exists
+				Optional<CloudResource> existingResource = cloudResourceRepository
+						.findByResourceIdAndCloudProviderAndTypeId(
+								resource.getResourceId(),
+								resource.getCloudProviderEnum(),
+								resource.getTypeId());
+				
+				if (existingResource.isPresent()) {
+					CloudResource current = existingResource.get();
+					
+					// Update fields that should be preserved
+					current.setName(resource.getName());
+					current.setRegion(resource.getRegion());
+					current.setLocation(resource.getLocation());
+					current.setParentId(resource.getParentId());
+					current.setUri(resource.getUri());
+					current.setDescription(resource.getDescription());
+					current.setTags(resource.getTags());
+					current.setTechnicalMetadata(resource.getTechnicalMetadata());
+					current.setBusinessMetadata(resource.getBusinessMetadata());
+					current.setLastDiscoveredAt(Instant.now());
+					current.setUpdatedAt(Instant.now());
+					
+					cloudResourceRepository.save(current);
+					log.debug("Updated existing resource: {} ({})", current.getId(), current.getResourceId());
+				} else {
+					// Set creation timestamps for new resources
+					resource.setCreatedAt(Instant.now());
+					resource.setUpdatedAt(Instant.now());
+					resource.setLastDiscoveredAt(Instant.now());
+					
+					cloudResourceRepository.save(resource);
+					log.debug("Added new resource: {}", resource.getResourceId());
+				}
+			} catch (Exception e) {
+				log.error("Error updating resource {}: {}", resource.getResourceId(), e.getMessage(), e);
+			}
+		}
+		
+		log.info("Finished updating resources in catalog.");
+	}
+
+	private void handleCreate(ResourceChange change, Optional<CloudResource> existingResourceOpt) {
+		if (existingResourceOpt.isPresent()) {
+			log.warn("CREATE event for existing resource: {}. Treating as UPDATE.", change.getResourceId());
+			handleUpdate(change, existingResourceOpt);
+		} else {
+			log.info("Processing CREATE for resource: {}", change.getResourceId());
+
+			// Create appropriate CloudResource subclass using factory
+			CloudResource newResource = cloudResourceFactory.createResource(
+					change.getCloudProvider(),
+					change.getResourceId(),
+					change.getServiceId(),
+					change.getTypeId(),
+					change.getDetails().getOrDefault(
+							change.getCloudProvider().name().toLowerCase() + ".resourceNameShort",
+							change.getResourceId()));
+
+			if (newResource == null) {
+				log.error("Failed to create resource instance for provider: {}", change.getCloudProvider());
+				return;
+			}
+
+			// Set Account ID (example assumes GCP uses projectId, generalize for others)
+			if (change.getCloudProvider() == CloudProvider.GCP) {
+				newResource.setAccountId(change.getProjectId());
+			} else {
+				// Extract account ID for other providers from change details or context
+				newResource.setAccountId(change.getDetails().get("accountId")); // Example placeholder
+			}
+
+			newResource.setCreatedAt(change.getTimestamp());
+			newResource.setUpdatedAt(change.getTimestamp());
+			newResource.setLastDiscoveredAt(Instant.now());
+
+			// Extract region etc. from details map
+			newResource.setRegion(
+					change.getDetails().get(change.getCloudProvider().name().toLowerCase() + ".request.region"));
+			newResource.setLocation(
+					change.getDetails().get(change.getCloudProvider().name().toLowerCase() + ".request.location"));
+			// ... populate other common fields like description, uri, parentId if available
+			// in details
+
+			mapMetadata(newResource, change.getDetails());
+
+			// Create and link initial usage stats
+			Instant windowStart = Instant.now().truncatedTo(ChronoUnit.DAYS);
+			Instant windowEnd = windowStart.plus(30, ChronoUnit.DAYS); // Example: 30 day window
+			CloudResourceUsageStats stats = new CloudResourceUsageStats(newResource, windowStart, windowEnd);
+			stats.setLastAccessedAt(change.getTimestamp());
+			stats.incrementEditCount(); // Treat creation as 1 edit/write
+			newResource.setUsageStats(stats); // Link stats via the setter
+
+			cloudResourceRepository.save(newResource); // Cascade should save stats
+			log.info("Created resource: {} ({})", newResource.getId(), newResource.getResourceId());
+		}
+	}
+
+	private void handleUpdate(ResourceChange change, Optional<CloudResource> existingResourceOpt) {
+		existingResourceOpt.ifPresentOrElse(resource -> {
+			log.info("Processing UPDATE for resource: {} ({})", resource.getId(), resource.getResourceId());
+			resource.setUpdatedAt(change.getTimestamp());
+			resource.setLastDiscoveredAt(Instant.now());
+			// Optionally update name, region, etc. based on details
+			String nameKey = change.getCloudProvider().name().toLowerCase() + ".resourceNameShort";
+			if (change.getDetails().containsKey(nameKey)) {
+				resource.setName(change.getDetails().get(nameKey));
+			}
+			// ... other field updates
+			mapMetadata(resource, change.getDetails());
+			updateUsageStats(resource, ResourceChange.ChangeType.UPDATE, change.getTimestamp());
+			cloudResourceRepository.save(resource);
+			log.debug("Updated resource: {} ({})", resource.getId(), resource.getResourceId());
+		}, () -> log.warn("UPDATE event for non-existent resource: {}. Ignoring.", change.getResourceId()));
+	}
+
+	private void handleDelete(ResourceChange change, Optional<CloudResource> existingResourceOpt) {
+		existingResourceOpt.ifPresentOrElse(resource -> {
+			UUID resourceDbId = resource.getId();
+			String resourceId = resource.getResourceId();
+			log.info("Processing DELETE for resource: {} ({})", resourceDbId, resourceId);
+			// Delete associated stats first (if relation isn't cascading delete properly)
+			CloudResourceUsageStats stats = resource.getUsageStats();
+			if (stats != null) {
+				try {
+					usageStatsRepository.deleteById(stats.getId());
+				} catch (Exception e) {
+					log.error("Error deleting usage stats for resource {}: {}", resourceDbId, e.getMessage());
+				}
+			}
+			cloudResourceRepository.delete(resource);
+			log.info("Deleted resource: {} ({})", resourceDbId, resourceId);
+		}, () -> log.warn("DELETE event for non-existent resource: {}. Ignoring.", change.getResourceId()));
+	}
+
+	private void handleAccess(ResourceChange change, Optional<CloudResource> existingResourceOpt) {
+		existingResourceOpt.ifPresentOrElse(resource -> {
+			log.info("Processing ACCESS for resource: {} ({})", resource.getId(), resource.getResourceId());
+			updateUsageStats(resource, ResourceChange.ChangeType.ACCESS, change.getTimestamp());
+		}, () -> log.warn("ACCESS event for non-existent resource: {}. Ignoring.", change.getResourceId()));
+	}
+
+	private void handlePermission(ResourceChange change, Optional<CloudResource> existingResourceOpt) {
+		existingResourceOpt.ifPresentOrElse(resource -> {
+			log.info("Processing PERMISSION for resource: {} ({})", resource.getId(), resource.getResourceId());
+			resource.setUpdatedAt(change.getTimestamp());
+			resource.setLastDiscoveredAt(Instant.now());
+			mapMetadata(resource, change.getDetails());
+			updateUsageStats(resource, ResourceChange.ChangeType.PERMISSION, change.getTimestamp()); // Count as edit
+			cloudResourceRepository.save(resource);
+			log.debug("Updated resource due to PERMISSION change: {} ({})", resource.getId(), resource.getResourceId());
+		}, () -> log.warn("PERMISSION event for non-existent resource: {}. Ignoring.", change.getResourceId()));
+	}
+
+	private void handleUnknown(ResourceChange change, Optional<CloudResource> existingResourceOpt) {
+		existingResourceOpt.ifPresentOrElse(resource -> {
+			log.info("Processing UNKNOWN change for resource: {} ({}) as potential update.", resource.getId(),
+					resource.getResourceId());
+			resource.setUpdatedAt(change.getTimestamp());
+			resource.setLastDiscoveredAt(Instant.now());
+			mapMetadata(resource, change.getDetails());
+			cloudResourceRepository.save(resource);
+			// Optionally update usage stats?
+		}, () -> log.warn("UNKNOWN event for non-existent resource: {}. Ignoring.", change.getResourceId()));
+	}
+
+	private void updateUsageStats(CloudResource resource, ResourceChange.ChangeType changeType, Instant eventTime) {
+		CloudResourceUsageStats stats = resource.getUsageStats();
+		boolean needsSave = false;
+
+		if (stats == null) {
+			log.warn("Usage stats not found for resource {}, creating new.", resource.getId());
+			Instant windowStart = Instant.now().truncatedTo(ChronoUnit.DAYS);
+			Instant windowEnd = windowStart.plus(30, ChronoUnit.DAYS);
+			stats = new CloudResourceUsageStats(resource, windowStart, windowEnd);
+			resource.setUsageStats(stats);
+			// Rely on cascade for initial save
+		} else {
+			needsSave = true; // Existing stats need explicit save
+
+			// Check if we need to roll over the stats window
+			if (eventTime.isAfter(stats.getTimeWindowEnd())) {
+				log.info("Rolling over usage stats window for resource {}", resource.getId());
+
+				// Create a new window starting from the end of the previous window
+				Instant newWindowStart = stats.getTimeWindowEnd();
+				Instant newWindowEnd = newWindowStart.plus(30, ChronoUnit.DAYS);
+
+				// Reset window counters but preserve total cumulative counts
+				long totalReadCount = stats.getTotalReadCount();
+				long totalWriteCount = stats.getTotalWriteCount();
+				long totalEditCount = stats.getTotalEditCount();
+
+				// Create new stats with the new window
+				stats = new CloudResourceUsageStats(resource, newWindowStart, newWindowEnd);
+
+				// Preserve the cumulative totals
+				stats.setTotalReadCount(totalReadCount);
+				stats.setTotalWriteCount(totalWriteCount);
+				stats.setTotalEditCount(totalEditCount);
+
+				// Link to resource
+				resource.setUsageStats(stats);
+			}
+		}
+
+		stats.setLastAccessedAt(eventTime);
+
+		switch (changeType) {
+			case ACCESS:
+				stats.incrementReadCount();
+				break;
+			case UPDATE:
+			case PERMISSION: // Treat permission change as an edit
+				stats.incrementEditCount();
+				break;
+			default:
+				break; // CREATE/DELETE handled elsewhere
+		}
+
+		if (needsSave) {
+			try {
+				usageStatsRepository.save(stats);
+				log.debug("Updated usage stats for resource: {}", resource.getId());
+			} catch (Exception e) {
+				log.error("Failed to save usage stats for resource {}: {}", resource.getId(), e.getMessage());
+			}
+		}
+	}
+
+	private void mapMetadata(CloudResource resource, Map<String, String> details) {
+		if (details == null || details.isEmpty())
+			return;
+		Map<String, String> techMetadata = resource.getTechnicalMetadata();
+		Map<String, String> bizMetadata = resource.getBusinessMetadata();
+
+		details.forEach((key, value) -> {
+			if (value == null || value.isBlank())
+				return;
+			String lowerCaseKey = key.toLowerCase(); // Use lowercase for easier matching
+			String providerPrefix = resource.getCloudProviderEnum().name().toLowerCase() + ".";
+
+			// --- Business Metadata Rules ---
+			if (lowerCaseKey.equals(providerPrefix + "actoremail")
+					|| lowerCaseKey.equals(providerPrefix + "authenticationinfo.principalemail")) {
+				bizMetadata.put("owner", value);
+			} else if (lowerCaseKey.startsWith(providerPrefix + "resourcelabel.cost-center")) {
+				bizMetadata.put("costCenter", value);
+			} else if (lowerCaseKey.startsWith(providerPrefix + "resourcelabel.environment")) {
+				bizMetadata.put("environment", value);
+			} else if (lowerCaseKey.startsWith(providerPrefix + "resourcelabel.application")) {
+				bizMetadata.put("applicationName", value);
+			} else if (lowerCaseKey.startsWith(providerPrefix + "request.label.owner")
+					|| lowerCaseKey.startsWith(providerPrefix + "request.label.team")) {
+				bizMetadata.put(key.substring((providerPrefix + "request.label.").length()), value);
+			}
+			// Add more business rules...
+
+			// --- Technical Metadata Rules ---
+			else if (lowerCaseKey.startsWith(providerPrefix + "resourcelabel.")) {
+				techMetadata.put(key.substring((providerPrefix + "resourcelabel.").length()), value);
+			} else if (lowerCaseKey.startsWith(providerPrefix + "request.label.")) { // Other request labels
+				techMetadata.put(key.substring((providerPrefix + "request.label.").length()), value);
+			} else if (lowerCaseKey.startsWith(providerPrefix + "loglabel.")) {
+				techMetadata.put(key.substring((providerPrefix + "loglabel.").length()), value);
+			} else if (lowerCaseKey.startsWith(providerPrefix + "request.")) {
+				String requestKey = key.substring((providerPrefix + "request.").length());
+				if (requestKey.equals("machineType") || requestKey.equals("zone") ||
+						requestKey.equals("region") || requestKey.equals("location") ||
+						requestKey.equals("storageClass") || requestKey.equals("datasetId")) {
+					techMetadata.put(requestKey, value);
+				}
+			} else if (lowerCaseKey.startsWith(providerPrefix + "response.")) {
+				String responseKey = key.substring((providerPrefix + "response.").length());
+				if (responseKey.equals("selfLink") || responseKey.equals("id")) {
+					techMetadata.put(responseKey, value);
+				}
+			} else if (lowerCaseKey.equals(providerPrefix + "resourcetype")
+					|| lowerCaseKey.equals(providerPrefix + "sourceip")
+					|| lowerCaseKey.equals(providerPrefix + "useragent")) {
+				techMetadata.put(key.substring(providerPrefix.length()), value);
+			}
+		});
+		log.trace("Mapped metadata for resource: {}", resource.getId());
+		// Maps are modified directly on the managed entity
+	}
+}

src/main/java/com/dalab/discovery/client/cli/ApplicationCommands.java

@@ -0,0 +1,71 @@
+package com.dalab.discovery.client.cli;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
+import org.springframework.boot.info.GitProperties;
+import org.springframework.core.env.Environment;
+import org.springframework.shell.command.annotation.Command;
+import org.springframework.stereotype.Component;
+
+/**
+ * Basic application commands available in Spring Shell.
+ */
+@Component
+@Command
+public class ApplicationCommands {
+
+	private final Environment environment;
+	private final Optional<BuildProperties> buildProperties;
+	private final Optional<GitProperties> gitProperties;
+
+	@Autowired
+	public ApplicationCommands(
+			Environment environment,
+			Optional<BuildProperties> buildProperties,
+			Optional<GitProperties> gitProperties) {
+		this.environment = environment;
+		this.buildProperties = buildProperties;
+		this.gitProperties = gitProperties;
+	}
+
+	/**
+	 * Display application status and configuration information.
+	 * 
+	 * @return Application status string
+	 */
+	@Command(command = "app-status", description = "Show application status and configuration")
+	public String appStatus() {
+		StringBuilder status = new StringBuilder();
+		status.append("=== Application Status ===\n");
+
+		buildProperties.ifPresent(props -> {
+			status.append("Name: ").append(props.getName()).append("\n");
+			status.append("Version: ").append(props.getVersion()).append("\n");
+			status.append("Build Time: ").append(props.getTime()).append("\n");
+		});
+
+		status.append("Active Profiles: ").append(Arrays.toString(environment.getActiveProfiles())).append("\n");
+
+		gitProperties.ifPresent(props -> {
+			status.append("Git Branch: ").append(props.getBranch()).append("\n");
+			status.append("Git Commit: ").append(props.getShortCommitId()).append("\n");
+		});
+
+		status.append("Shell Mode: ").append(System.getProperty("app.shell.mode", "false")).append("\n");
+
+		return status.toString();
+	}
+
+	/**
+	 * Show active Spring profiles.
+	 * 
+	 * @return Active profiles string
+	 */
+	@Command(command = "profiles", description = "Show active Spring profiles")
+	public String profiles() {
+		return "Active Profiles: " + Arrays.toString(environment.getActiveProfiles());
+	}
+}

src/main/java/com/dalab/discovery/client/cli/DGCommandLine.java

@@ -0,0 +1,68 @@
+package com.dalab.discovery.client.cli;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+//@Command(command = "dg")
+public class DGCommandLine {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DGCommandLine.class);
+
+    // @Autowired
+    // GCPCrawler gcpCrawler;
+
+    // From Here the shell calls the Folders
+    // @Command(command = "scanFolder", description = "Start data guardian Folder")
+    // public String runFolder(String folderId) {
+    // // @Option(
+    // // label = "folderName",
+    // // description = "Name of the Folder to Scanned ",
+    // // defaultValue = "621021804931",
+    // // required = true
+    // // ) String folderId
+
+    // LOGGER.debug("Starting data guardian Folder.");
+    // long FolderCount = gcpCrawler.fetchFolders(folderId);
+    // LOGGER.debug("Crawler has stopped running. Total folder found: {}",
+    // FolderCount);
+    // return "Spider fetched " + FolderCount + "folders.";
+
+    // }
+
+    // @Command(command = "stopFolder", description = "Stop data guardian Folder")
+    public String stopFolder() {
+        LOGGER.debug("Stopping data guardian Folder.");
+
+        LOGGER.debug("Folder has stopped running.");
+        return "Folder is stopped";
+    }
+
+    // @Command(command = "folderstatus", description = "Get status of data guardian
+    // Folder")
+    public String getFolderStatus() {
+        return "Folder is running";
+    }
+
+    // Fetching assets shell shart from here
+    // @Command(command = "runCrawler", description = "Start data guardian ")
+    // public String runCrawler() {
+    // LOGGER.debug("Starting data guardian .");
+    // // long assetCount = gcpCrawler.fetchAssets();
+    // LOGGER.debug("Crawler has stopped running. Total assets found: {}",
+    // assetCount);
+    // return "Spider fetched " + assetCount + "assets.";
+    // }
+
+    // @Command(command = "stopCrawler", description = "Stop data guardian ")
+    public String stopCrawler() {
+        LOGGER.debug("Stopping data guardian .");
+
+        LOGGER.debug("Crawler has stopped running.");
+        return "Crawler is stopped";
+    }
+
+    // @Command(command = "status", description = "Get status of data guardian ")
+    public String getStatus() {
+        return "Crawler is running";
+    }
+}