Version bump cert-manager, argo-cd, new EFS multi PVC feature and switch to new kube-prometheus charts #28

Merged
stefan merged 8 commits from kube-prometheus into master 2020-10-21 12:32:50 +00:00
1 changed files with 5 additions and 5 deletions
Showing only changes of commit c486223699 - Show all commits

View File

@ -160,11 +160,11 @@ prometheus-adapter:
default: false
resource:
cpu:
containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[3m])) by (<<.GroupBy>>)
nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[3m])) by (<<.GroupBy>>)
containerQuery: sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[3m])) by (<<.GroupBy>>)
nodeQuery: sum(1 - irate(node_cpu_seconds_total{mode="idle"}[3m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
resources:
overrides:
instance:
node:
resource: node
namespace:
resource: namespace
@ -172,11 +172,11 @@ prometheus-adapter:
resource: pod
containerLabel: container
memory:
containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}) by (<<.GroupBy>>)
nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
resources:
overrides:
instance:
node:
resource: node
namespace:
resource: namespace