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

Remove updates to helm chart, fix typo in flag, add make generated files

Browse Source
This commit is contained in:
Purandare, Aditya
2019-01-16 22:05:47 +05:30
parent e3b989ccd3
commit 95771caf8c
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsonnet/kube-prometheus/kube-prometheus.libsonnet
View File

@@ -82,7 +82,7 @@ local configMapList = k.core.v1.configMapList;
prometheusSelector: 'job="prometheus-k8s"',
prometheusOperatorSelector: 'job="prometheus-operator"',
enableAdminApi: 'true',
enableAdminAPI: 'true',
jobs: {
Kubelet: $._config.kubeletSelector,
@@ -99,7 +99,7 @@ local configMapList = k.core.v1.configMapList;
prometheus+:: {
rules: $.prometheusRules + $.prometheusAlerts,
enableAdminApi: $._config.enableAdminApi,
enableAdminAPI: $._config.enableAdminAPI,
},
grafana+:: {

4
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View File

@@ -18,7 +18,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
prometheus+:: {
name: 'k8s',
enableAdminApi: 'true',
enableAdminAPI: 'true',
replicas: 2,
rules: {},
renderedRules: {},
@@ -169,7 +169,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
replicas: $._config.prometheus.replicas,
version: $._config.versions.prometheus,
baseImage: $._config.imageRepos.prometheus,
enableAdminApi: $._config.prometheus.enableAdminApi,
enableAdminAPI: $._config.prometheus.enableAdminAPI,
serviceAccountName: 'prometheus-' + $._config.prometheus.name,
serviceMonitorSelector: {},
serviceMonitorNamespaceSelector: {},