Remove updates to helm chart, fix typo in flag, add make generated files
This commit is contained in:
@@ -281,7 +281,7 @@ These are the available fields with their respective default values:
|
|||||||
names: 'k8s',
|
names: 'k8s',
|
||||||
replicas: 2,
|
replicas: 2,
|
||||||
rules: {},
|
rules: {},
|
||||||
enableAdminApi: 'true',
|
enableAdminAPI: 'true',
|
||||||
},
|
},
|
||||||
|
|
||||||
alertmanager+:: {
|
alertmanager+:: {
|
||||||
|
@@ -4,7 +4,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + {
|
|||||||
},
|
},
|
||||||
prometheus+:: {
|
prometheus+:: {
|
||||||
name: 'k8s',
|
name: 'k8s',
|
||||||
enableAdminApi: 'true',
|
enableAdminAPI: 'true',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -82,7 +82,7 @@ local configMapList = k.core.v1.configMapList;
|
|||||||
prometheusSelector: 'job="prometheus-k8s"',
|
prometheusSelector: 'job="prometheus-k8s"',
|
||||||
prometheusOperatorSelector: 'job="prometheus-operator"',
|
prometheusOperatorSelector: 'job="prometheus-operator"',
|
||||||
|
|
||||||
enableAdminApi: 'true',
|
enableAdminAPI: 'true',
|
||||||
|
|
||||||
jobs: {
|
jobs: {
|
||||||
Kubelet: $._config.kubeletSelector,
|
Kubelet: $._config.kubeletSelector,
|
||||||
@@ -99,7 +99,7 @@ local configMapList = k.core.v1.configMapList;
|
|||||||
|
|
||||||
prometheus+:: {
|
prometheus+:: {
|
||||||
rules: $.prometheusRules + $.prometheusAlerts,
|
rules: $.prometheusRules + $.prometheusAlerts,
|
||||||
enableAdminApi: $._config.enableAdminApi,
|
enableAdminAPI: $._config.enableAdminAPI,
|
||||||
},
|
},
|
||||||
|
|
||||||
grafana+:: {
|
grafana+:: {
|
||||||
|
@@ -18,7 +18,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
|
|||||||
|
|
||||||
prometheus+:: {
|
prometheus+:: {
|
||||||
name: 'k8s',
|
name: 'k8s',
|
||||||
enableAdminApi: 'true',
|
enableAdminAPI: 'true',
|
||||||
replicas: 2,
|
replicas: 2,
|
||||||
rules: {},
|
rules: {},
|
||||||
renderedRules: {},
|
renderedRules: {},
|
||||||
@@ -169,7 +169,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
|
|||||||
replicas: $._config.prometheus.replicas,
|
replicas: $._config.prometheus.replicas,
|
||||||
version: $._config.versions.prometheus,
|
version: $._config.versions.prometheus,
|
||||||
baseImage: $._config.imageRepos.prometheus,
|
baseImage: $._config.imageRepos.prometheus,
|
||||||
enableAdminApi: $._config.prometheus.enableAdminApi,
|
enableAdminAPI: $._config.prometheus.enableAdminAPI,
|
||||||
serviceAccountName: 'prometheus-' + $._config.prometheus.name,
|
serviceAccountName: 'prometheus-' + $._config.prometheus.name,
|
||||||
serviceMonitorSelector: {},
|
serviceMonitorSelector: {},
|
||||||
serviceMonitorNamespaceSelector: {},
|
serviceMonitorNamespaceSelector: {},
|
||||||
|
@@ -1538,7 +1538,7 @@ spec:
|
|||||||
required:
|
required:
|
||||||
- name
|
- name
|
||||||
type: array
|
type: array
|
||||||
enableAdminApi:
|
enableAdminAPI:
|
||||||
description: Enable access to prometheus web admin API. More info: https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis
|
description: Enable access to prometheus web admin API. More info: https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis
|
||||||
type: boolean
|
type: boolean
|
||||||
evaluationInterval:
|
evaluationInterval:
|
||||||
|
@@ -12,7 +12,7 @@ spec:
|
|||||||
namespace: monitoring
|
namespace: monitoring
|
||||||
port: web
|
port: web
|
||||||
baseImage: quay.io/prometheus/prometheus
|
baseImage: quay.io/prometheus/prometheus
|
||||||
enableAdminApi: true
|
enableAdminAPI: true
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: linux
|
beta.kubernetes.io/os: linux
|
||||||
replicas: 2
|
replicas: 2
|
||||||
|
Reference in New Issue
Block a user