From 9f07c7feb8a5d40c400bb485f86a3b4c437f5af3 Mon Sep 17 00:00:00 2001 From: Shashank Reddy Boyapally Date: Tue, 13 Feb 2024 13:24:35 -0500 Subject: [PATCH 1/7] added metadata as field in config Signed-off-by: Shashank Reddy Boyapally --- .gitignore | 4 +- examples/small-scale-cluster-density.yaml | 0 examples/small-scale-node-density-cni.yaml | 56 ++++++++++++++++++++++ utils/orion_funcs.py | 5 +- 4 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 examples/small-scale-cluster-density.yaml create mode 100644 examples/small-scale-node-density-cni.yaml diff --git a/.gitignore b/.gitignore index 850de9f..605c514 100644 --- a/.gitignore +++ b/.gitignore @@ -159,6 +159,8 @@ cython_debug/ # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ -*.yaml +# Ignore YAML files in the top folder +/*.yaml + *.csv .vscode/ diff --git a/examples/small-scale-cluster-density.yaml b/examples/small-scale-cluster-density.yaml new file mode 100644 index 0000000..e69de29 diff --git a/examples/small-scale-node-density-cni.yaml b/examples/small-scale-node-density-cni.yaml new file mode 100644 index 0000000..b5a7962 --- /dev/null +++ b/examples/small-scale-node-density-cni.yaml @@ -0,0 +1,56 @@ +tests : + - name : aws-small-scale-node-density-cni + metadata: + platform: AWS + masterNodesType: m6a.xlarge + masterNodesCount: 3 + workerNodesType: m6a.xlarge + workerNodesCount: 6 + infraNodesCount: 3 + benchmark: node-density-cni + ocpVersion: 4.15 + networkType: OVNKubernetes + infraNodesType: r5.2xlarge + # encrypted: true + # fips: false + # ipsec: false + + metrics : + - name: podReadyLatency + metricName: podLatencyQuantilesMeasurement + quantileName: Ready + metric_of_interest: P99 + not: + - jobConfig.name: "garbage-collection" + + - name: apiserverCPU + metricName : containerCPU + labels.namespace: openshift-kube-apiserver + metric_of_interest: value + agg: + value: cpu + agg_type: avg + + - name: ovnCPU + metricName : containerCPU + labels.namespace: openshift-ovn-kubernetes + metric_of_interest: value + agg: + value: cpu + agg_type: avg + + - name: etcdCPU + metricName : containerCPU + labels.namespace: openshift-etcd + metric_of_interest: value + agg: + value: cpu + agg_type: avg + + - name: etcdDisck + metricName : 99thEtcdDiskBackendCommitDurationSeconds + metric_of_interest: value + agg: + value: duration + agg_type: avg + diff --git a/utils/orion_funcs.py b/utils/orion_funcs.py index f0fdd4b..b778d73 100644 --- a/utils/orion_funcs.py +++ b/utils/orion_funcs.py @@ -111,10 +111,7 @@ def get_metadata(test,logger): dict: dictionary of the metadata """ metadata = {} - for k,v in test.items(): - if k in ["metrics","name"]: - continue - metadata[k] = v + metadata=test['metadata'] metadata["ocpVersion"] = str(metadata["ocpVersion"]) logger.debug('metadata' + str(metadata)) return metadata From b88f468270d03e8f4b8f643a01271f33b82c4af4 Mon Sep 17 00:00:00 2001 From: Shashank Reddy Boyapally Date: Tue, 13 Feb 2024 13:25:47 -0500 Subject: [PATCH 2/7] added small scale cluster density Signed-off-by: Shashank Reddy Boyapally --- examples/small-scale-cluster-density.yaml | 54 +++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/examples/small-scale-cluster-density.yaml b/examples/small-scale-cluster-density.yaml index e69de29..c8aa080 100644 --- a/examples/small-scale-cluster-density.yaml +++ b/examples/small-scale-cluster-density.yaml @@ -0,0 +1,54 @@ +tests : + - name : aws-small-scale-cluster-density-v2 + metadata: + platform: AWS + masterNodesType: m6a.xlarge + masterNodesCount: 3 + workerNodesType: m6a.xlarge + workerNodesCount: 24 + benchmark: cluster-density-v2 + ocpVersion: 4.15 + networkType: OVNKubernetes + # encrypted: true + # fips: false + # ipsec: false + + metrics : + - name: podReadyLatency + metricName: podLatencyQuantilesMeasurement + quantileName: Ready + metric_of_interest: P99 + not: + - jobConfig.name: "garbage-collection" + + - name: apiserverCPU + metricName : containerCPU + labels.namespace: openshift-kube-apiserver + metric_of_interest: value + agg: + value: cpu + agg_type: avg + + - name: ovnCPU + metricName : containerCPU + labels.namespace: openshift-ovn-kubernetes + metric_of_interest: value + agg: + value: cpu + agg_type: avg + + - name: etcdCPU + metricName : containerCPU + labels.namespace: openshift-etcd + metric_of_interest: value + agg: + value: cpu + agg_type: avg + + - name: etcdDisck + metricName : 99thEtcdDiskBackendCommitDurationSeconds + metric_of_interest: value + agg: + value: duration + agg_type: avg + From adbb2c7a27d608b5c934af71385a7612d947f06b Mon Sep 17 00:00:00 2001 From: Shashank Reddy Boyapally Date: Tue, 13 Feb 2024 14:00:09 -0500 Subject: [PATCH 3/7] added readme Signed-off-by: Shashank Reddy Boyapally --- README.md | 20 ++++++++++---------- utils/orion_funcs.py | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 986e8d4..53a4269 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,15 @@ Below is an illustrative example of the config and metadata that Orion can handl ``` tests : - name : aws-small-scale-cluster-density-v2 - platform: AWS - masterNodesType: m6a.xlarge - masterNodesCount: 3 - workerNodesType: m6a.xlarge - workerNodesCount: 24 - benchmark: cluster-density-v2 - ocpVersion: 4.15 - networkType: OVNKubernetes + metadata: + platform: AWS + masterNodesType: m6a.xlarge + masterNodesCount: 3 + workerNodesType: m6a.xlarge + workerNodesCount: 24 + benchmark: cluster-density-v2 + ocpVersion: 4.15 + networkType: OVNKubernetes # encrypted: true # fips: false # ipsec: false @@ -56,8 +57,7 @@ tests : agg: value: duration agg_type: avg - - + ``` ## Build Orion diff --git a/utils/orion_funcs.py b/utils/orion_funcs.py index b778d73..08ec813 100644 --- a/utils/orion_funcs.py +++ b/utils/orion_funcs.py @@ -110,7 +110,6 @@ def get_metadata(test,logger): Returns: dict: dictionary of the metadata """ - metadata = {} metadata=test['metadata'] metadata["ocpVersion"] = str(metadata["ocpVersion"]) logger.debug('metadata' + str(metadata)) From fae1a1aa146d151942139d96b79d2655edb55255 Mon Sep 17 00:00:00 2001 From: Shashank Reddy Boyapally Date: Fri, 16 Feb 2024 14:21:51 -0500 Subject: [PATCH 4/7] updated to use keyword for keyword fields in config and orion Signed-off-by: Shashank Reddy Boyapally --- README.md | 10 +++++----- examples/small-scale-cluster-density.yaml | 10 +++++----- examples/small-scale-node-density-cni.yaml | 10 +++++----- orion.py | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 53a4269..8c124d6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ tests : masterNodesCount: 3 workerNodesType: m6a.xlarge workerNodesCount: 24 - benchmark: cluster-density-v2 + benchmark.keyword: cluster-density-v2 ocpVersion: 4.15 networkType: OVNKubernetes # encrypted: true @@ -25,11 +25,11 @@ tests : quantileName: Ready metric_of_interest: P99 not: - - jobConfig.name: "garbage-collection" + jobConfig.name: "garbage-collection" - name: apiserverCPU metricName : containerCPU - labels.namespace: openshift-kube-apiserver + labels.namespace.keyword: openshift-kube-apiserver metric_of_interest: value agg: value: cpu @@ -37,7 +37,7 @@ tests : - name: ovnCPU metricName : containerCPU - labels.namespace: openshift-ovn-kubernetes + labels.namespace.keyword: openshift-ovn-kubernetes metric_of_interest: value agg: value: cpu @@ -45,7 +45,7 @@ tests : - name: etcdCPU metricName : containerCPU - labels.namespace: openshift-etcd + labels.namespace.keyword: openshift-etcd metric_of_interest: value agg: value: cpu diff --git a/examples/small-scale-cluster-density.yaml b/examples/small-scale-cluster-density.yaml index c8aa080..e2ffbee 100644 --- a/examples/small-scale-cluster-density.yaml +++ b/examples/small-scale-cluster-density.yaml @@ -6,7 +6,7 @@ tests : masterNodesCount: 3 workerNodesType: m6a.xlarge workerNodesCount: 24 - benchmark: cluster-density-v2 + benchmark.keyword: cluster-density-v2 ocpVersion: 4.15 networkType: OVNKubernetes # encrypted: true @@ -19,11 +19,11 @@ tests : quantileName: Ready metric_of_interest: P99 not: - - jobConfig.name: "garbage-collection" + jobConfig.name: "garbage-collection" - name: apiserverCPU metricName : containerCPU - labels.namespace: openshift-kube-apiserver + labels.namespace.keyword: openshift-kube-apiserver metric_of_interest: value agg: value: cpu @@ -31,7 +31,7 @@ tests : - name: ovnCPU metricName : containerCPU - labels.namespace: openshift-ovn-kubernetes + labels.namespace.keyword: openshift-ovn-kubernetes metric_of_interest: value agg: value: cpu @@ -39,7 +39,7 @@ tests : - name: etcdCPU metricName : containerCPU - labels.namespace: openshift-etcd + labels.namespace.keyword: openshift-etcd metric_of_interest: value agg: value: cpu diff --git a/examples/small-scale-node-density-cni.yaml b/examples/small-scale-node-density-cni.yaml index b5a7962..d74ebc3 100644 --- a/examples/small-scale-node-density-cni.yaml +++ b/examples/small-scale-node-density-cni.yaml @@ -7,7 +7,7 @@ tests : workerNodesType: m6a.xlarge workerNodesCount: 6 infraNodesCount: 3 - benchmark: node-density-cni + benchmark.keyword: node-density-cni ocpVersion: 4.15 networkType: OVNKubernetes infraNodesType: r5.2xlarge @@ -21,11 +21,11 @@ tests : quantileName: Ready metric_of_interest: P99 not: - - jobConfig.name: "garbage-collection" + jobConfig.name: "garbage-collection" - name: apiserverCPU metricName : containerCPU - labels.namespace: openshift-kube-apiserver + labels.namespace.keyword: openshift-kube-apiserver metric_of_interest: value agg: value: cpu @@ -33,7 +33,7 @@ tests : - name: ovnCPU metricName : containerCPU - labels.namespace: openshift-ovn-kubernetes + labels.namespace.keyword: openshift-ovn-kubernetes metric_of_interest: value agg: value: cpu @@ -41,7 +41,7 @@ tests : - name: etcdCPU metricName : containerCPU - labels.namespace: openshift-etcd + labels.namespace.keyword: openshift-etcd metric_of_interest: value agg: value: cpu diff --git a/orion.py b/orion.py index b0e24c3..de52114 100644 --- a/orion.py +++ b/orion.py @@ -59,10 +59,10 @@ def orion(config, debug, output,hunter_analyze): print("No UUID present for given metadata") sys.exit() - if metadata["benchmark"] == "k8s-netperf" : + if metadata["benchmark.keyword"] == "k8s-netperf" : index = "k8s-netperf" ids = uuids - elif metadata["benchmark"] == "ingress-perf" : + elif metadata["benchmark.keyword"] == "ingress-perf" : index = "ingress-performance" ids = uuids else: From 40f29420ab91b3d54914e769f7b29ebb98a6d191 Mon Sep 17 00:00:00 2001 From: Shashank Reddy Boyapally Date: Mon, 19 Feb 2024 09:49:18 -0500 Subject: [PATCH 5/7] spell check Signed-off-by: Shashank Reddy Boyapally --- examples/small-scale-node-density-cni.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/small-scale-node-density-cni.yaml b/examples/small-scale-node-density-cni.yaml index d74ebc3..1821f1a 100644 --- a/examples/small-scale-node-density-cni.yaml +++ b/examples/small-scale-node-density-cni.yaml @@ -47,7 +47,7 @@ tests : value: cpu agg_type: avg - - name: etcdDisck + - name: etcdDisk metricName : 99thEtcdDiskBackendCommitDurationSeconds metric_of_interest: value agg: From 9f7bf091dd84380f378e9a7ca4dfbb28fd6358a8 Mon Sep 17 00:00:00 2001 From: Shashank Reddy Boyapally Date: Mon, 19 Feb 2024 16:36:05 -0500 Subject: [PATCH 6/7] fmatch version bump Signed-off-by: Shashank Reddy Boyapally --- examples/small-scale-cluster-density.yaml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/small-scale-cluster-density.yaml b/examples/small-scale-cluster-density.yaml index e2ffbee..703f1b5 100644 --- a/examples/small-scale-cluster-density.yaml +++ b/examples/small-scale-cluster-density.yaml @@ -45,7 +45,7 @@ tests : value: cpu agg_type: avg - - name: etcdDisck + - name: etcdDisk metricName : 99thEtcdDiskBackendCommitDurationSeconds metric_of_interest: value agg: diff --git a/requirements.txt b/requirements.txt index 2736514..690cf1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ click==8.1.7 elastic-transport==8.11.0 elasticsearch==8.11.1 elasticsearch7==7.13.0 -fmatch==0.0.4 +fmatch==0.0.5 python-dateutil==2.8.2 pytz==2023.3.post1 PyYAML==6.0.1 From 41f0ac28554318a9ccba11b8d63c0316fbb5648c Mon Sep 17 00:00:00 2001 From: Shashank Reddy Boyapally Date: Mon, 19 Feb 2024 16:39:27 -0500 Subject: [PATCH 7/7] elasticsearch version change Signed-off-by: Shashank Reddy Boyapally --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 690cf1c..e298835 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,7 @@ hunter @ git+https://github.com/datastax-labs/hunter.git@v0.5.0 certifi==2023.11.17 click==8.1.7 elastic-transport==8.11.0 -elasticsearch==8.11.1 -elasticsearch7==7.13.0 +elasticsearch==7.13.0 fmatch==0.0.5 python-dateutil==2.8.2 pytz==2023.3.post1