Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combining metrics profiles files #411

Merged
merged 5 commits into from
Sep 30, 2022
Merged

Combining metrics profiles files #411

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f0ee21
combining metrics profiles
paigerube14 May 26, 2022
c7f2eed
adding container touchstone configs
paigerube14 Sep 29, 2022
7ab532d
adding overall container metrics
paigerube14 Sep 30, 2022
cca56c2
deleting old files
paigerube14 Sep 30, 2022
28aec6f
adding metrics-ovn back
paigerube14 Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 0 additions & 137 deletions workloads/kube-burner/metrics-profiles/metrics-ovn.yaml
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions workloads/kube-burner/metrics-profiles/metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
metricName: serviceSyncLatency

# Containers & pod metrics
- query: sum(irate(container_cpu_usage_seconds_total{name!="",namespace=~"openshift-(etcd|oauth-apiserver|.*apiserver|ovn-kubernetes|sdn|ingress|authentication|.*controller-manager|.*scheduler|monitoring|logging|image-registry)"}[2m]) * 100) by (pod, namespace, node)
metricName: podCPU

- query: sum(container_memory_rss{name!="",namespace=~"openshift-(etcd|oauth-apiserver|.*apiserver|ovn-kubernetes|sdn|ingress|authentication|.*controller-manager|.*scheduler|monitoring|logging|image-registry)"}) by (pod, namespace, node)
metricName: podMemory
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that we're using containerCPU and containerMemory metrics in touchstone I think we can skip add these two queries here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with this being the only difference in these 2 files can we not just add these 2 queries and combine?


- query: (sum(irate(container_cpu_usage_seconds_total{name!="",container!~"POD|",namespace=~"openshift-(etcd|.*apiserver|ovn-kubernetes|sdn|ingress|.*controller-manager|.*scheduler)"}[2m]) * 100) by (container, pod, namespace, node)) > 0
metricName: containerCPU
Expand Down
21 changes: 21 additions & 0 deletions workloads/kube-burner/touchstone-configs/containerCPU-avg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"elasticsearch": {
"ripsaw-kube-burner": [
{
"filter": {
"metricName.keyword": "containerCPU",
"labels.namespace.keyword": "${TOUCHSTONE_NAMESPACE}"
},
"buckets": [
"labels.pod.keyword",
"labels.node.keyword"
],
"aggregations": {
"value": [
"avg"
]
}
}
]
}
}
21 changes: 21 additions & 0 deletions workloads/kube-burner/touchstone-configs/containerCPU-max.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"elasticsearch": {
"ripsaw-kube-burner": [
{
"filter": {
"metricName.keyword": "containerCPU",
"labels.namespace.keyword": "${TOUCHSTONE_NAMESPACE}"
},
"buckets": [
"labels.pod.keyword",
"labels.node.keyword"
],
"aggregations": {
"value": [
"max"
]
}
}
]
}
}
21 changes: 21 additions & 0 deletions workloads/kube-burner/touchstone-configs/containerMemory-avg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"elasticsearch": {
"ripsaw-kube-burner": [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 4 configuration files rather than a single one holding all queries?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sent a example on slack on how to consolidate this.

{
"filter": {
"metricName.keyword": "containerMemory",
"labels.namespace.keyword": "${TOUCHSTONE_NAMESPACE}"
},
"buckets": [
"labels.pod.keyword",
"labels.node.keyword"
],
"aggregations": {
"value": [
"avg"
]
}
}
]
}
}
21 changes: 21 additions & 0 deletions workloads/kube-burner/touchstone-configs/containerMemory-max.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"elasticsearch": {
"ripsaw-kube-burner": [
{
"filter": {
"metricName.keyword": "containerMemory",
"labels.namespace.keyword": "${TOUCHSTONE_NAMESPACE}"
},
"buckets": [
"labels.pod.keyword",
"labels.node.keyword"
],
"aggregations": {
"value": [
"max"
]
}
}
]
}
}