From 07125382ed63a97449d0336908578df47be596e3 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Mon, 18 Oct 2021 16:58:20 +0200
Subject: [PATCH] minor code changes in evaluation related parts
---
helm/templates/theodolite/crd-execution.yaml | 3 ---
theodolite/crd/crd-execution.yaml | 3 ---
.../theodolite/benchmark/BenchmarkExecution.kt | 1 -
.../theodolite/evaluation/AnalysisExecutor.kt | 1 -
.../theodolite/evaluation/SloCheckerFactory.kt | 10 +++++-----
.../theodolite/evaluation/SloConfigHandler.kt | 16 ++++++----------
.../kotlin/theodolite/evaluation/SloTypes.kt | 10 ++++++++++
.../src/main/resources/application.properties | 2 +-
8 files changed, 22 insertions(+), 24 deletions(-)
create mode 100644 theodolite/src/main/kotlin/theodolite/evaluation/SloTypes.kt
diff --git a/helm/templates/theodolite/crd-execution.yaml b/helm/templates/theodolite/crd-execution.yaml
index f6305ad3e..163835e9b 100644
--- a/helm/templates/theodolite/crd-execution.yaml
+++ b/helm/templates/theodolite/crd-execution.yaml
@@ -60,9 +60,6 @@ spec:
prometheusUrl:
description: Connection string for Promehteus.
type: string
- query:
- description: The prometheus query string
- type: string
offset:
description: Hours by which the start and end timestamp will be shifted (for different timezones).
type: integer
diff --git a/theodolite/crd/crd-execution.yaml b/theodolite/crd/crd-execution.yaml
index 0debaa46d..d9cd41903 100644
--- a/theodolite/crd/crd-execution.yaml
+++ b/theodolite/crd/crd-execution.yaml
@@ -68,9 +68,6 @@ spec:
prometheusUrl:
description: Connection string for Promehteus.
type: string
- query:
- description: The prometheus query string
- type: string
offset:
description: Hours by which the start and end timestamp will be shifted (for different timezones).
type: integer
diff --git a/theodolite/src/main/kotlin/theodolite/benchmark/BenchmarkExecution.kt b/theodolite/src/main/kotlin/theodolite/benchmark/BenchmarkExecution.kt
index 6aeeb2c54..f2dda487d 100644
--- a/theodolite/src/main/kotlin/theodolite/benchmark/BenchmarkExecution.kt
+++ b/theodolite/src/main/kotlin/theodolite/benchmark/BenchmarkExecution.kt
@@ -63,7 +63,6 @@ class BenchmarkExecution : KubernetesResource {
class Slo : KubernetesResource {
lateinit var sloType: String
lateinit var prometheusUrl: String
- lateinit var query: String
var offset by Delegates.notNull<Int>()
lateinit var properties: MutableMap<String, String>
}
diff --git a/theodolite/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt b/theodolite/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
index d1eadd035..709dc9f0a 100644
--- a/theodolite/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
+++ b/theodolite/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
@@ -12,7 +12,6 @@ import java.util.*
import java.util.regex.Pattern
private val logger = KotlinLogging.logger {}
-private val RECORD_LAG_QUERY = "sum by(group)(kafka_consumergroup_group_lag >= 0)"
/**
* Contains the analysis. Fetches a metric from Prometheus, documents it, and evaluates it.
diff --git a/theodolite/src/main/kotlin/theodolite/evaluation/SloCheckerFactory.kt b/theodolite/src/main/kotlin/theodolite/evaluation/SloCheckerFactory.kt
index 76b158a58..e1ee4f4d2 100644
--- a/theodolite/src/main/kotlin/theodolite/evaluation/SloCheckerFactory.kt
+++ b/theodolite/src/main/kotlin/theodolite/evaluation/SloCheckerFactory.kt
@@ -43,25 +43,25 @@ class SloCheckerFactory {
properties: MutableMap<String, String>,
load: LoadDimension
): SloChecker {
- return when (sloType) {
- "lag trend" -> ExternalSloChecker(
+ return when (sloType.toLowerCase()) {
+ SloTypes.LAG_TREND.value, SloTypes.DROPPED_RECORDS.value -> ExternalSloChecker(
externalSlopeURL = properties["externalSloUrl"]
?: throw IllegalArgumentException("externalSloUrl expected"),
threshold = properties["threshold"]?.toInt() ?: throw IllegalArgumentException("threshold expected"),
warmup = properties["warmup"]?.toInt() ?: throw IllegalArgumentException("warmup expected")
)
- "lag trend percent" -> {
+ SloTypes.LAG_TREND_PERCENTAGE.value, SloTypes.DROPPED_RECORDS_PERCENTAGE.value -> {
if (!properties["loadType"].equals("NumSensors")) {
throw IllegalArgumentException("Percent Threshold is only allowed with load type NumSensors")
}
- var thresholdPercent =
+ val thresholdPercent =
properties["percent"]?.toDouble()
?: throw IllegalArgumentException("percent for threshold expected")
if (thresholdPercent < 0.0 || thresholdPercent > 1.0) {
throw IllegalArgumentException("Threshold percent need to be an Double in the range between 0.0 and 1.0 (inclusive)")
}
// cast to int, as rounding is not really necessary
- var threshold = (load.get() * thresholdPercent).toInt()
+ val threshold = (load.get() * thresholdPercent).toInt()
ExternalSloChecker(
externalSlopeURL = properties["externalSloUrl"]
diff --git a/theodolite/src/main/kotlin/theodolite/evaluation/SloConfigHandler.kt b/theodolite/src/main/kotlin/theodolite/evaluation/SloConfigHandler.kt
index 38f21f586..27601878f 100644
--- a/theodolite/src/main/kotlin/theodolite/evaluation/SloConfigHandler.kt
+++ b/theodolite/src/main/kotlin/theodolite/evaluation/SloConfigHandler.kt
@@ -1,19 +1,15 @@
package theodolite.evaluation
import theodolite.util.InvalidPatcherConfigurationException
-import theodolite.util.TheodoliteConfig
-import javax.inject.Inject
-
-class SloConfigHandler {
+import javax.enterprise.context.ApplicationScoped
+@ApplicationScoped
+class SloConfigHandler() {
companion object {
- @Inject
- lateinit var config: TheodoliteConfig
-
fun getQueryString(sloType: String): String {
- return when (sloType){
- "Lag Trend" -> config.PROM_RECORD_LAG_QUERY
- "Dropped Records" -> config.PROM_DROPPED_RECORDS_QUERY
+ return when (sloType.toLowerCase()) {
+ SloTypes.LAG_TREND.value, SloTypes.LAG_TREND_PERCENTAGE.value -> "sum by(group)(kafka_consumergroup_group_lag >= 0)"
+ SloTypes.DROPPED_RECORDS.value, SloTypes.DROPPED_RECORDS_PERCENTAGE.value -> "sum by(job) (kafka_streams_stream_task_metrics_dropped_records_total>=0)"
else -> throw InvalidPatcherConfigurationException("Could not find Prometheus query string for slo type $sloType")
}
}
diff --git a/theodolite/src/main/kotlin/theodolite/evaluation/SloTypes.kt b/theodolite/src/main/kotlin/theodolite/evaluation/SloTypes.kt
new file mode 100644
index 000000000..7a37c698e
--- /dev/null
+++ b/theodolite/src/main/kotlin/theodolite/evaluation/SloTypes.kt
@@ -0,0 +1,10 @@
+package theodolite.evaluation
+
+enum class SloTypes(val value: String) {
+ LAG_TREND("lag trend"),
+ LAG_TREND_PERCENTAGE("lag trend percentage"),
+ DROPPED_RECORDS("dropped records"),
+ DROPPED_RECORDS_PERCENTAGE("dropped records percentage")
+
+
+}
\ No newline at end of file
diff --git a/theodolite/src/main/resources/application.properties b/theodolite/src/main/resources/application.properties
index b888207f1..8eb6f4862 100644
--- a/theodolite/src/main/resources/application.properties
+++ b/theodolite/src/main/resources/application.properties
@@ -6,4 +6,4 @@ quarkus.native.additional-build-args=\
--report-unsupported-elements-at-runtime
prom.record.lag.query="sum by(group)(kafka_consumergroup_group_lag >= 0)"
-prom.dropped.records.query="todo"
+prom.dropped.records.query="sum by(job) (kafka_streams_stream_task_metrics_dropped_records_total>=0)"
--
GitLab