diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/ExternalSloChecker.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/ExternalSloChecker.kt index 3a76fa7c0d9511b8989d3e444cbefe5c8a50b285..7458530ab09408ddef789ac5207caba18bac74ab 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/ExternalSloChecker.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/ExternalSloChecker.kt @@ -2,7 +2,6 @@ package rocks.theodolite.kubernetes.slo import khttp.post import mu.KotlinLogging -import rocks.theodolite.kubernetes.util.PrometheusResponse import java.net.ConnectException /** @@ -23,7 +22,7 @@ class ExternalSloChecker( /** * Evaluates an experiment using an external service. * Will try to reach the external service until success or [RETRIES] times. - * Each request will timeout after [TIMEOUT]. + * Each request will time out after [TIMEOUT]. * * @param fetchedData that should be evaluated * @return true if the experiment was successful (the threshold was not exceeded). diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/MetricFetcher.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/MetricFetcher.kt index 962564475d0ad0b56bad8cf99daf12329950eaf3..58c83909ae6f7d8b87ceab2bbb6a2977ec8c470a 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/MetricFetcher.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/MetricFetcher.kt @@ -4,7 +4,6 @@ import com.google.gson.Gson import khttp.get import khttp.responses.Response import mu.KotlinLogging -import rocks.theodolite.kubernetes.util.PrometheusResponse import java.net.ConnectException import java.time.Duration import java.time.Instant diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/PrometheusResponse.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/PrometheusResponse.kt index 7a3ac237a88390f85b9d49d3f8eba7447621f0f0..fce39a5a88ee746c0926c368b694c3cca85974f0 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/PrometheusResponse.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/PrometheusResponse.kt @@ -1,4 +1,4 @@ -package rocks.theodolite.kubernetes.util +package rocks.theodolite.kubernetes.slo import io.quarkus.runtime.annotations.RegisterForReflection import java.util.* diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloChecker.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloChecker.kt index f4ac163547421d5f0f07d2511c2e3eeeebdb35b0..af0483bd76117d4413da2f07869512e97fe314ad 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloChecker.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloChecker.kt @@ -1,7 +1,5 @@ package rocks.theodolite.kubernetes.slo -import rocks.theodolite.kubernetes.util.PrometheusResponse - /** * A SloChecker can be used to evaluate data from Prometheus. * @constructor Creates an empty SloChecker diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloConfigHandler.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloConfigHandler.kt index ed18e4a0b4027ce4284cc83ff4c9520738ec2ba7..8bfe86fb56b9a1a7ab863af60864a4c226802397 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloConfigHandler.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloConfigHandler.kt @@ -19,8 +19,8 @@ class SloConfigHandler { "sum by(consumergroup) ($DEFAULT_CONSUMER_LAG_METRIC_BASE$it >= 0)" } SloTypes.DROPPED_RECORDS.value, SloTypes.DROPPED_RECORDS_RATIO.value -> slo.properties["promQLQuery"] ?: DEFAULT_DROPPED_RECORDS_QUERY - SloTypes.LAG_TREND.value, SloTypes.LAG_TREND_RATIO.value -> slo.properties["promQLQuery"] ?: DEFAULT_CONSUMER_LAG_QUERY - SloTypes.DROPPED_RECORDS.value, SloTypes.DROPPED_RECORDS_RATIO.value -> slo.properties["promQLQuery"] ?: DEFAULT_DROPPED_RECORDS_QUERY + SloTypes.LAG_TREND.value, SloTypes.LAG_TREND_RATIO.value -> slo.properties["promQLQuery"] ?: DEFAULT_CONSUMER_LAG_QUERY // TODO reachable? + SloTypes.DROPPED_RECORDS.value, SloTypes.DROPPED_RECORDS_RATIO.value -> slo.properties["promQLQuery"] ?: DEFAULT_DROPPED_RECORDS_QUERY // TODO reachable? else -> throw InvalidPatcherConfigurationException("Could not find Prometheus query string for slo type ${slo.sloType}") } } diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloJson.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloJson.kt index 653ad6b5f998014a0f5b9e8b7397bcd3ce51f729..d91696ee98eac26325e88b58efeda1c47355b197 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloJson.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/slo/SloJson.kt @@ -1,7 +1,6 @@ package rocks.theodolite.kubernetes.slo import com.google.gson.Gson -import rocks.theodolite.kubernetes.util.PromResult class SloJson constructor( val results: List<List<PromResult>>,