ZeroDownTime
/
kubezero
3
0
Fork 0
Code Issues 1 Pull Requests 27 Releases Wiki Activity

First stab at new prometheus charts

This commit is contained in:
Stefan Reimer 2020-10-09 17:58:44 -07:00
parent e5cb34c6af
commit 7dbc97bcbc
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
charts/kubezero-metrics/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-metrics name: kubezero-metrics
description: KubeZero Umbrella Chart for prometheus-operator description: KubeZero Umbrella Chart for prometheus-operator
type: application type: application
version: 0.1.4 version: 0.2.0
home: https://kubezero.com home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
keywords: keywords:
@ -15,10 +15,10 @@ dependencies:
- name: kubezero-lib - name: kubezero-lib
version: ">= 0.1.3" version: ">= 0.1.3"
repository: https://zero-down-time.github.io/kubezero/ repository: https://zero-down-time.github.io/kubezero/
- name: prometheus-operator - name: kube-prometheus-stack
version: 9.3.1 version: 10.0.1
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://prometheus-community.github.io/helm-charts
- name: prometheus-adapter - name: prometheus-adapter
version: 2.5.0 version: 2.7.0
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://prometheus-community.github.io/helm-charts
kubeVersion: ">= 1.16.0" kubeVersion: ">= 1.16.0"

20
charts/kubezero-metrics/values.yaml
View File

@ -11,7 +11,7 @@ prometheus:
url: "" url: ""
gateway: istio-system/ingressgateway gateway: istio-system/ingressgateway
prometheus-operator: kube-prometheus-stack:
defaultRules: defaultRules:
create: true create: true
@ -60,9 +60,9 @@ prometheus-operator:
prometheusOperator: prometheusOperator:
enabled: true enabled: true
#image: #image:
# tag: v0.41.0 # tag: v0.42.1
#prometheusConfigReloaderImage: #prometheusConfigReloaderImage:
# tag: v0.41.0 # tag: v0.42.1
# Run on controller nodes # Run on controller nodes
tolerations: tolerations:
@ -160,11 +160,11 @@ prometheus-adapter:
default: false default: false
resource: resource:
cpu: cpu:
containerQuery: sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m])) by (<<.GroupBy>>) containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[3m])) by (<<.GroupBy>>)
nodeQuery: sum(1 - irate(node_cpu_seconds_total{mode="idle"}[5m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>) nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[3m])) by (<<.GroupBy>>)
resources: resources:
overrides: overrides:
node: instance:
resource: node resource: node
namespace: namespace:
resource: namespace resource: namespace
@ -172,15 +172,15 @@ prometheus-adapter:
resource: pod resource: pod
containerLabel: container containerLabel: container
memory: memory:
containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}) by (<<.GroupBy>>) containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
nodeQuery: sum(node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>} - node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>}) by (<<.GroupBy>>) nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
resources: resources:
overrides: overrides:
node: instance:
resource: node resource: node
namespace: namespace:
resource: namespace resource: namespace
pod: pod:
resource: pod resource: pod
containerLabel: container containerLabel: container
window: 5m window: 3m