easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resource config now in config.kubeStateMetrics

Browse Source 
As requested, this updates the resource specification to live directly in config.kubeStateMetrics

It also clarifies the config variables. These names are what google uses in some of their tooling.

(And a slight tweak to the way collectors are specified)
This commit is contained in:
seph
2018-07-17 09:52:30 -04:00
parent b6e7d708c5
commit 358c8477ea
2 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
View File

@@ -5,19 +5,14 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
namespace: 'default',
kubeStateMetrics+:: {
// when this is an empty string, you get the default set
collectors: '',
scrapeTimeout: '',
collectors: '', // empty string gets a default set
scrapeInterval: '30s',
},
scrapeTimeout: '',
resizer+:: {
kubeStateMetrics+:: {
cpu: '100m',
extraCpu: '2m',
memory: '150Mi',
extraMemory: '30Mi',
},
baseCPU: '100m',
baseMemory: '150Mi',
cpuPerNode: '2m',
memoryPerNode: '30Mi',
},
versions+:: {
@@ -153,20 +148,19 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
'--port=8081',
'--telemetry-host=127.0.0.1',
'--telemetry-port=8082',
'--collectors=' + $._config.kubeStateMetrics.collectors,
]) +
container.mixin.resources.withRequests({ cpu: $._config.resizer.kubeStateMetrics.cpu, memory: $._config.resizer.kubeStateMetrics.memory }) +
container.mixin.resources.withLimits({ cpu: $._config.resizer.kubeStateMetrics.cpu, memory: $._config.resizer.kubeStateMetrics.memory });
] + if $._config.kubeStateMetrics.collectors != '' then ['--collectors=' + $._config.kubeStateMetrics.collectors] else []) +
container.mixin.resources.withRequests({ cpu: $._config.kubeStateMetrics.baseCPU, memory: $._config.kubeStateMetrics.baseMemory }) +
container.mixin.resources.withLimits({ cpu: $._config.kubeStateMetrics.baseCPU, memory: $._config.kubeStateMetrics.baseMemory });
local addonResizer =
container.new('addon-resizer', $._config.imageRepos.addonResizer + ':' + $._config.versions.addonResizer) +
container.withCommand([
'/pod_nanny',
'--container=kube-state-metrics',
'--cpu=' + $._config.resizer.kubeStateMetrics.cpu,
'--extra-cpu=' + $._config.resizer.kubeStateMetrics.extraCpu,
'--memory=' + $._config.resizer.kubeStateMetrics.memory,
'--extra-memory=' + $._config.resizer.kubeStateMetrics.extraMemory,
'--cpu=' + $._config.kubeStateMetrics.baseCPU,
'--extra-cpu=' + $._config.kubeStateMetrics.cpuPerNode,
'--memory=' + $._config.kubeStateMetrics.baseMemory,
'--extra-memory=' + $._config.kubeStateMetrics.memoryPerNode,
'--threshold=5',
'--deployment=kube-state-metrics',
]) +