diff options
3 files changed, 7 insertions, 7 deletions
diff --git a/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/base.py b/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/base.py index 4367d80..3be8fe1 100644 --- a/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/base.py +++ b/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/base.py @@ -54,10 +54,10 @@ class BaseKindLoader(abc.ABC): f""" avg by(resource) ( kube_pod_container_resource_limits{{ - {self.cluster_selector} namespace="{namespace}", pod=~"{'|'.join(pods)}", container="{container_name}" + {self.cluster_selector} }} ) """ @@ -66,10 +66,10 @@ class BaseKindLoader(abc.ABC): f""" avg by(resource) ( kube_pod_container_resource_requests{{ - {self.cluster_selector} namespace="{namespace}", pod=~"{'|'.join(pods)}", container="{container_name}" + {self.cluster_selector} }} ) """ @@ -94,8 +94,8 @@ class BaseKindLoader(abc.ABC): f""" count by (container) ( kube_pod_container_info{{ - {self.cluster_selector} pod=~"{'|'.join(pods)}" + {self.cluster_selector} }} ) """ diff --git a/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/double_parent.py b/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/double_parent.py index b4ce13e..ea2353b 100644 --- a/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/double_parent.py +++ b/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/double_parent.py @@ -57,9 +57,9 @@ class DoubleParentLoader(BaseKindLoader): f""" count by (namespace, owner_name, {subowner_label}, owner_kind) ( {metric_name} {{ - {self.cluster_selector} {namespace_selector}, owner_kind=~"{'|'.join(kinds)}" + {self.cluster_selector} }} ) """ @@ -95,10 +95,10 @@ class DoubleParentLoader(BaseKindLoader): f""" count by (namespace, owner_name, owner_kind, pod) ( kube_pod_owner{{ - {self.cluster_selector} namespace="{namespace}", owner_name=~"{'|'.join(subowner_names)}", owner_kind="{subowner_kind}" + {self.cluster_selector} }} ) """ diff --git a/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/simple_parent.py b/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/simple_parent.py index 9bc53d2..05b7d74 100644 --- a/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/simple_parent.py +++ b/robusta_krr/core/integrations/kubernetes/workload_loader/prometheus/loaders/simple_parent.py @@ -26,9 +26,9 @@ class SimpleParentLoader(BaseKindLoader): f""" count by (namespace, owner_name, owner_kind, pod) ( kube_pod_owner{{ - {self.cluster_selector} {namespace_selector}, owner_kind=~"{'|'.join(self.kinds_to_scan)}" + {self.cluster_selector} }} ) """ @@ -50,9 +50,9 @@ class SimpleParentLoader(BaseKindLoader): f""" count by (namespace, job_name) ( kube_job_owner{{ - {self.cluster_selector} {namespace_selector}, owner_kind="CronJob" + {self.cluster_selector} }} ) """ |