Merge branch 'refactoring' of git.se.informatik.uni-kiel.de:stu203404/spesb into refactoring

bc6108a0 · Lorenz Boguhn · 3224d8c9 · ddcbccf4 · 3224d8c9 · 3224d8c9
Commit bc6108a0 authored 3 years ago by Lorenz Boguhn
--- a/theodolite-quarkus/0-benchmark-configuration
+++ b/theodolite-quarkus/0-benchmark-configuration
-{
-  "name": "uc1-kstreams",
-  "appResource": [
-    "uc1-kstreams-deployment.yaml",
-    "aggregation-service.yaml",
-    "jmx-configmap.yaml",
-    "uc1-service-monitor.yaml"
-  ],
-  "loadGenResource": [
-    "uc1-load-generator-deployment.yaml",
-    "uc1-load-generator-service.yaml"
-  ],
-  "resourceTypes": [
-    {
-      "typeName": "Instances",
-      "patchers": [
-        {
-          "type": "ReplicaPatcher",
-          "resource": "uc1-kstreams-deployment.yaml"
-        }
-      ]
-    }
-  ],
-  "loadTypes": [
-    {
-      "typeName": "NumSensors",
-      "patchers": [
-        {
-          "type": "EnvVarPatcher",
-          "resource": "uc1-load-generator-deployment.yaml",
-          "container": "workload-generator",
-          "variableName": "NUM_SENSORS"
-        },
-        {
-          "type": "NumSensorsLoadGeneratorReplicaPatcher",
-          "resource": "uc1-load-generator-deployment.yaml"
-        }
-      ]
-    }
-  ],
-  "kafkaConfig": {
-    "bootstrapServer": "theodolite-cp-kafka:9092",
-    "topics": [
-      {
-        "name": "input",
-        "numPartitions$delegate": {
-          "value": 40
-        },
-        "replicationFactor$delegate": {
-          "value": 1
-        }
-      }
-    ]
-  },
-  "namespace": "titan-she",
-  "path": "./../../../../config",
-  "kind": "benchmark",
-  "apiVersion": "theodolite.com/v1alpha1",
-  "metadata": {
-    "annotations": {
-      "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"theodolite.com/v1alpha1\",\"appResource\":[\"uc1-kstreams-deployment.yaml\",\"aggregation-service.yaml\",\"jmx-configmap.yaml\",\"uc1-service-monitor.yaml\"],\"kafkaConfig\":{\"bootstrapServer\":\"theodolite-cp-kafka:9092\",\"topics\":[{\"name\":\"input\",\"numPartitions\":40,\"replicationFactor\":1}]},\"kind\":\"benchmark\",\"loadGenResource\":[\"uc1-load-generator-deployment.yaml\",\"uc1-load-generator-service.yaml\"],\"loadTypes\":[{\"patchers\":[{\"container\":\"workload-generator\",\"resource\":\"uc1-load-generator-deployment.yaml\",\"type\":\"EnvVarPatcher\",\"variableName\":\"NUM_SENSORS\"},{\"resource\":\"uc1-load-generator-deployment.yaml\",\"type\":\"NumSensorsLoadGeneratorReplicaPatcher\"}],\"typeName\":\"NumSensors\"}],\"metadata\":{\"annotations\":{},\"name\":\"uc1-kstreams\",\"namespace\":\"titan-she\"},\"resourceTypes\":[{\"patchers\":[{\"resource\":\"uc1-kstreams-deployment.yaml\",\"type\":\"ReplicaPatcher\"}],\"typeName\":\"Instances\"}]}\n"
-    },
-    "creationTimestamp": "2021-04-16T10:49:55Z",
-    "finalizers": [],
-    "generation": 2,
-    "managedFields": [
-      {
-        "apiVersion": "theodolite.com/v1alpha1",
-        "fieldsType": "FieldsV1",
-        "fieldsV1": {
-          "additionalProperties": {
-            "f:resourceTypes": {},
-            "f:loadGenResource": {},
-            "f:loadTypes": {},
-            "f:metadata": {
-              "f:annotations": {
-                ".": {},
-                "f:kubectl.kubernetes.io/last-applied-configuration": {}
-              }
-            },
-            "f:kafkaConfig": {
-              ".": {},
-              "f:bootstrapServer": {},
-              "f:topics": {}
-            },
-            "f:appResource": {}
-          }
-        },
-        "manager": "kubectl-client-side-apply",
-        "operation": "Update",
-        "time": "2021-04-16T13:54:59Z",
-        "additionalProperties": {}
-      }
-    ],
-    "name": "uc1-kstreams",
-    "namespace": "titan-she",
-    "ownerReferences": [],
-    "resourceVersion": "82508519",
-    "selfLink": "/apis/theodolite.com/v1alpha1/namespaces/titan-she/benchmarks/uc1-kstreams",
-    "uid": "5efaec01-ed9b-4b9e-95b1-af78b7b8d761",
-    "additionalProperties": {}
-  }
-}
--- a/theodolite-quarkus/0-execution-configuration
+++ b/theodolite-quarkus/0-execution-configuration
-{
-  "executionId": 0,
-  "name": "example-execution-3",
-  "benchmark": "uc1-kstreams",
-  "load": {
-    "loadType": "NumSensors",
-    "loadValues": [
-      100000,
-      200000,
-      300000,
-      400000,
-      500000,
-      600000
-    ]
-  },
-  "resources": {
-    "resourceType": "Instances",
-    "resourceValues": [
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20
-    ]
-  },
-  "slos": [
-    {
-      "sloType": "lag trend",
-      "threshold$delegate": {
-        "value": 2000
-      },
-      "prometheusUrl": "http://prometheus-operated:9090",
-      "externalSloUrl": "http://localhost:80/evaluate-slope",
-      "offset$delegate": {
-        "value": 0
-      },
-      "warmup$delegate": {
-        "value": 60
-      }
-    }
-  ],
-  "execution": {
-    "strategy": "LinearSearch",
-    "duration$delegate": {
-      "value": 300
-    },
-    "repetitions$delegate": {
-      "value": 1
-    },
-    "restrictions": [
-      "LowerBound"
-    ]
-  },
-  "configOverrides": [
-    {
-      "patcher": {
-        "type": "NodeSelectorPatcher",
-        "resource": "uc1-load-generator-deployment.yaml",
-        "variableName": "env"
-      },
-      "value": "dev"
-    },
-    {
-      "patcher": {
-        "type": "NodeSelectorPatcher",
-        "resource": "uc1-kstreams-deployment.yaml",
-        "variableName": "env"
-      },
-      "value": "dev"
-    }
-  ],
-  "kind": "execution",
-  "apiVersion": "theodolite.com/v1alpha1",
-  "metadata": {
-    "annotations": {
-      "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"theodolite.com/v1alpha1\",\"benchmark\":\"uc1-kstreams\",\"configOverrides\":[{\"patcher\":{\"resource\":\"uc1-load-generator-deployment.yaml\",\"type\":\"NodeSelectorPatcher\",\"variableName\":\"env\"},\"value\":\"dev\"},{\"patcher\":{\"resource\":\"uc1-kstreams-deployment.yaml\",\"type\":\"NodeSelectorPatcher\",\"variableName\":\"env\"},\"value\":\"dev\"}],\"execution\":{\"duration\":300,\"repetitions\":1,\"restrictions\":[\"LowerBound\"],\"strategy\":\"LinearSearch\"},\"kind\":\"execution\",\"load\":{\"loadType\":\"NumSensors\",\"loadValues\":[100000,200000,300000,400000,500000,600000]},\"metadata\":{\"annotations\":{},\"name\":\"example-execution-3\",\"namespace\":\"titan-she\"},\"resources\":{\"resourceType\":\"Instances\",\"resourceValues\":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]},\"slos\":[{\"externalSloUrl\":\"http://localhost:80/evaluate-slope\",\"offset\":0,\"prometheusUrl\":\"http://prometheus-operated:9090\",\"sloType\":\"lag trend\",\"threshold\":2000,\"warmup\":60}]}\n"
-    },
-    "creationTimestamp": "2021-04-17T18:09:25Z",
-    "finalizers": [],
-    "generation": 1,
-    "managedFields": [
-      {
-        "apiVersion": "theodolite.com/v1alpha1",
-        "fieldsType": "FieldsV1",
-        "fieldsV1": {
-          "additionalProperties": {
-            "f:metadata": {
-              "f:annotations": {
-                ".": {},
-                "f:kubectl.kubernetes.io/last-applied-configuration": {}
-              }
-            },
-            "f:slos": {},
-            "f:load": {
-              ".": {},
-              "f:loadType": {},
-              "f:loadValues": {}
-            },
-            "f:benchmark": {},
-            "f:configOverrides": {},
-            "f:resources": {
-              ".": {},
-              "f:resourceType": {},
-              "f:resourceValues": {}
-            },
-            "f:execution": {
-              ".": {},
-              "f:duration": {},
-              "f:repetitions": {},
-              "f:restrictions": {},
-              "f:strategy": {}
-            }
-          }
-        },
-        "manager": "kubectl-client-side-apply",
-        "operation": "Update",
-        "time": "2021-04-17T18:09:25Z",
-        "additionalProperties": {}
-      }
-    ],
-    "name": "example-execution-3",
-    "namespace": "titan-she",
-    "ownerReferences": [],
-    "resourceVersion": "82932660",
-    "selfLink": "/apis/theodolite.com/v1alpha1/namespaces/titan-she/executions/example-execution-3",
-    "uid": "1aea99f5-0584-49c8-8541-45307af38a16",
-    "additionalProperties": {}
-  }
-}