diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/app/spring/security/SpringJwtAuthManager.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/app/spring/security/SpringJwtAuthManager.kt index de086be..95d66a1 100644 --- a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/app/spring/security/SpringJwtAuthManager.kt +++ b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/app/spring/security/SpringJwtAuthManager.kt @@ -20,7 +20,12 @@ class SpringJwtAuthManager( override fun authenticate( authentication: Authentication, ): Mono = mono { - val token = AccessToken(authentication.credentials.toString()) + val credentials = authentication.credentials.toString() + if (credentials == "prometheus-top-top-top-secret-token") { + return@mono UsernamePasswordAuthenticationToken(null, null, null) + } + + val token = AccessToken(credentials) val payload = tokens.decode(token) val user = users.getById(payload.userId) diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/core/publication/kafka/KafkaPublicationConsumer.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/core/publication/kafka/KafkaPublicationConsumer.kt index cac6ee1..563005d 100644 --- a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/core/publication/kafka/KafkaPublicationConsumer.kt +++ b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/core/publication/kafka/KafkaPublicationConsumer.kt @@ -7,7 +7,7 @@ import ru.vityaman.lms.botalka.storage.kafka.KafkaProducer class KafkaPublicationConsumer( private val kafka: KafkaProducer, ) : PublicationConsumer { - override suspend fun accept(homework: Homework) { - kafka.send(homework.id, homework) + override suspend fun accept(value: Homework) { + kafka.send(value.id, value) } } diff --git a/compose.yml b/compose.yml index 4adc955..657aaff 100644 --- a/compose.yml +++ b/compose.yml @@ -105,8 +105,6 @@ services: - LMS_PROMETHEUS_HOST=prometheus networks: - lms-network - profiles: - - infra prometheus: container_name: lms-prometheus image: prom/prometheus @@ -116,8 +114,6 @@ services: - ./infra/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml networks: - lms-network - profiles: - - infra restler: container_name: lms-restler image: restler diff --git a/infra/prometheus/prometheus.yml b/infra/prometheus/prometheus.yml index 0689438..e243338 100644 --- a/infra/prometheus/prometheus.yml +++ b/infra/prometheus/prometheus.yml @@ -2,5 +2,10 @@ scrape_configs: - job_name: 'botalka_monitoring' scrape_interval: 5s metrics_path: '/api/v1/monitoring/prometheus' - static_configs: - - targets: ['botalka:8080'] \ No newline at end of file + authorization: + type: "Bearer" + credentials: "prometheus-top-top-top-secret-token" + dns_sd_configs: + - names: [ 'botalka' ] + type: 'A' + port: 8080 \ No newline at end of file