mirror of
https://github.com/prometheus-operator/kube-prometheus.git
synced 2025-08-27 09:21:56 +02:00
Merge pull request #410 from gjkim42/experimental/custom-metrics-api
experimental/custom-metrics-api: Fix deprecated query for k8s 1.16
This commit is contained in:
commit
5cabd5eeda
@ -6,44 +6,44 @@ metadata:
|
|||||||
data:
|
data:
|
||||||
config.yaml: |
|
config.yaml: |
|
||||||
rules:
|
rules:
|
||||||
- seriesQuery: '{__name__=~"^container_.*",container_name!="POD",namespace!="",pod_name!=""}'
|
- seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}'
|
||||||
seriesFilters: []
|
seriesFilters: []
|
||||||
resources:
|
resources:
|
||||||
overrides:
|
overrides:
|
||||||
namespace:
|
namespace:
|
||||||
resource: namespace
|
resource: namespace
|
||||||
pod_name:
|
pod:
|
||||||
resource: pod
|
resource: pod
|
||||||
name:
|
name:
|
||||||
matches: ^container_(.*)_seconds_total$
|
matches: ^container_(.*)_seconds_total$
|
||||||
as: ""
|
as: ""
|
||||||
metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}[1m])) by (<<.GroupBy>>)
|
metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[1m])) by (<<.GroupBy>>)
|
||||||
- seriesQuery: '{__name__=~"^container_.*",container_name!="POD",namespace!="",pod_name!=""}'
|
- seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}'
|
||||||
seriesFilters:
|
seriesFilters:
|
||||||
- isNot: ^container_.*_seconds_total$
|
- isNot: ^container_.*_seconds_total$
|
||||||
resources:
|
resources:
|
||||||
overrides:
|
overrides:
|
||||||
namespace:
|
namespace:
|
||||||
resource: namespace
|
resource: namespace
|
||||||
pod_name:
|
pod:
|
||||||
resource: pod
|
resource: pod
|
||||||
name:
|
name:
|
||||||
matches: ^container_(.*)_total$
|
matches: ^container_(.*)_total$
|
||||||
as: ""
|
as: ""
|
||||||
metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}[1m])) by (<<.GroupBy>>)
|
metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[1m])) by (<<.GroupBy>>)
|
||||||
- seriesQuery: '{__name__=~"^container_.*",container_name!="POD",namespace!="",pod_name!=""}'
|
- seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}'
|
||||||
seriesFilters:
|
seriesFilters:
|
||||||
- isNot: ^container_.*_total$
|
- isNot: ^container_.*_total$
|
||||||
resources:
|
resources:
|
||||||
overrides:
|
overrides:
|
||||||
namespace:
|
namespace:
|
||||||
resource: namespace
|
resource: namespace
|
||||||
pod_name:
|
pod:
|
||||||
resource: pod
|
resource: pod
|
||||||
name:
|
name:
|
||||||
matches: ^container_(.*)$
|
matches: ^container_(.*)$
|
||||||
as: ""
|
as: ""
|
||||||
metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>,container_name!="POD"}) by (<<.GroupBy>>)
|
metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>,container!="POD"}) by (<<.GroupBy>>)
|
||||||
- seriesQuery: '{namespace!="",__name__!~"^container_.*"}'
|
- seriesQuery: '{namespace!="",__name__!~"^container_.*"}'
|
||||||
seriesFilters:
|
seriesFilters:
|
||||||
- isNot: .*_total$
|
- isNot: .*_total$
|
||||||
@ -80,9 +80,9 @@ data:
|
|||||||
resource: node
|
resource: node
|
||||||
namespace:
|
namespace:
|
||||||
resource: namespace
|
resource: namespace
|
||||||
pod_name:
|
pod:
|
||||||
resource: pod
|
resource: pod
|
||||||
containerLabel: container_name
|
containerLabel: container
|
||||||
memory:
|
memory:
|
||||||
containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
|
containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
|
||||||
nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
|
nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
|
||||||
@ -92,7 +92,7 @@ data:
|
|||||||
resource: node
|
resource: node
|
||||||
namespace:
|
namespace:
|
||||||
resource: namespace
|
resource: namespace
|
||||||
pod_name:
|
pod:
|
||||||
resource: pod
|
resource: pod
|
||||||
containerLabel: container_name
|
containerLabel: container
|
||||||
window: 1m
|
window: 1m
|
||||||
|
Loading…
x
Reference in New Issue
Block a user