Merge branch 'master' into feature/281-Add-Beam-Kubernetes-Benchmark-Definitions

helm/templates/grafana/dashboard-config-map.yaml

@@ -527,7 +527,7 @@ data:
         "steppedLine": false,
         "targets": [
           {
-            "expr": "sum by(topic) (kafka_topic_partitions >= 0)",
+            "expr": "kafka_topic_partitions",
             "format": "time_series",
             "intervalFactor": 1,
             "legendFormat": "{{topic}}",

theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java

@@ -34,7 +34,7 @@ final class DocumentMapper extends SimpleFunction<ActivePowerRecord, Document> {
   private String createDocumentName(final String documentId) {
     this.initFirestoreConfig();
     return "projects/" + this.firestoreConfig.getProjectId()
-        + "/databases/" + this.firestoreConfig.getDatabaseDdlRequest()
+        + "/databases/" + this.firestoreConfig.getDatabase()
         + "/documents/" + this.collection
         + "/" + documentId;
   }

theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java

@@ -16,8 +16,8 @@ final class FirestoreConfig {
     return this.firestoreOptions.getProjectId();
   }
 
-  public String getDatabaseDdlRequest() {
-    return this.firestoreOptions.getProjectId();
+  public String getDatabase() {
+    return this.firestoreOptions.getDatabaseId();
   }
 
   public static FirestoreConfig createFromDefaults() throws IOException {