github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[promethesus-adapter] use the new tag name (#19961)

Browse Source 
Some metrics labels (namely `pod_name` and `container_name`) have been
removed in Kubernetes 1.16 (deprecated for a few releases). This patch
switch to use the new metrics labels so that metrics can be properly
retrieved and parsed from Prometheus.

See more details about the removal of metrics labels here:
https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.16.md#removed-metrics

Also, bump the min supported Kubernetes version to 1.14 because the new
metrics labels are introduced in 1.14. See the following release notes:
https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md

Signed-off-by: Jie Yu <yujie.jay@gmail.com>
This commit is contained in:
Jie Yu
2020-01-10 08:18:35 -08:00
committed by Kubernetes Prow Robot
parent 24fde49c71
commit bd032743a6
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/prometheus-adapter/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: prometheus-adapter
version: 1.4.0
version: 2.0.0
appVersion: v0.5.0
description: A Helm chart for k8s prometheus adapter
home: https://github.com/DirectXMan12/k8s-prometheus-adapter
stable/prometheus-adapter/README.md
+5 -5
View File
@@ -4,7 +4,7 @@ Installs the [Prometheus Adapter](https://github.com/DirectXMan12/k8s-prometheus
## Prerequisites
Kubernetes 1.11+
Kubernetes 1.14+
## Installing the Chart
@@ -74,9 +74,9 @@ rules:
resource: node
namespace:
resource: namespace
pod_name:
pod:
resource: pod
containerLabel: container_name
containerLabel: container
memory:
containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
@@ -86,9 +86,9 @@ rules:
resource: node
namespace:
resource: namespace
pod_name:
pod:
resource: pod
containerLabel: container_name
containerLabel: container
window: 3m
```
stable/prometheus-adapter/templates/custom-metrics-configmap.yaml
+9 -9
View File
@@ -12,46 +12,46 @@ data:
config.yaml: |
rules:
{{- if .Values.rules.default }}
- seriesQuery: '{__name__=~"^container_.*",container_name!="POD",namespace!="",pod_name!=""}'
- seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}'
seriesFilters: []
resources:
overrides:
namespace:
resource: namespace
pod_name:
pod:
resource: pod
name:
matches: ^container_(.*)_seconds_total$
as: ""
metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}[5m]))
metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[5m]))
by (<<.GroupBy>>)
- seriesQuery: '{__name__=~"^container_.*",container_name!="POD",namespace!="",pod_name!=""}'
- seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}'
seriesFilters:
- isNot: ^container_.*_seconds_total$
resources:
overrides:
namespace:
resource: namespace
pod_name:
pod:
resource: pod
name:
matches: ^container_(.*)_total$
as: ""
metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}[5m]))
metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[5m]))
by (<<.GroupBy>>)
- seriesQuery: '{__name__=~"^container_.*",container_name!="POD",namespace!="",pod_name!=""}'
- seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}'
seriesFilters:
- isNot: ^container_.*_total$
resources:
overrides:
namespace:
resource: namespace
pod_name:
pod:
resource: pod
name:
matches: ^container_(.*)$
as: ""
metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}) by (<<.GroupBy>>)
metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>,container!="POD"}) by (<<.GroupBy>>)
- seriesQuery: '{namespace!="",__name__!~"^container_.*"}'
seriesFilters:
- isNot: .*_total$
stable/prometheus-adapter/values.yaml
+4 -4
View File
@@ -71,9 +71,9 @@ rules:
# resource: node
# namespace:
# resource: namespace
# pod_name:
# pod:
# resource: pod
# containerLabel: container_name
# containerLabel: container
# memory:
# containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
# nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
@@ -83,9 +83,9 @@ rules:
# resource: node
# namespace:
# resource: namespace
# pod_name:
# pod:
# resource: pod
# containerLabel: container_name
# containerLabel: container
# window: 3m
service: