mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-10-24 13:41:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1325 from paulfantom/fix-1324

Browse Source 
jsonnet: set thanos config to null by default
This commit is contained in:
Damien Grisonnet 2021-08-17 11:20:47 +02:00 committed by GitHub
commit c1fa4971e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jsonnet/kube-prometheus/components/prometheus.libsonnet
View File

@ -34,7 +34,7 @@ local defaults = {
runbookURLPattern: 'https://runbooks.prometheus-operator.dev/runbooks/prometheus/%s', runbookURLPattern: 'https://runbooks.prometheus-operator.dev/runbooks/prometheus/%s',
}, },
}, },
thanos: {}, thanos: null,
}; };
@ -100,7 +100,7 @@ function(params) {
{ name: 'web', targetPort: 'web', port: 9090 }, { name: 'web', targetPort: 'web', port: 9090 },
] + ] +
( (
if p._config.thanos != {} then if p._config.thanos != null then
[{ name: 'grpc', port: 10901, targetPort: 10901 }] [{ name: 'grpc', port: 10901, targetPort: 10901 }]
else [] else []
), ),
@ -325,7 +325,7 @@ function(params) {
}, },
// Include thanos sidecar PrometheusRule only if thanos config was passed by user // Include thanos sidecar PrometheusRule only if thanos config was passed by user
[if std.objectHas(params, 'thanos') && std.length(params.thanos) > 0 then 'prometheusRuleThanosSidecar']: { [if std.objectHas(params, 'thanos') && params.thanos != null then 'prometheusRuleThanosSidecar']: {
apiVersion: 'monitoring.coreos.com/v1', apiVersion: 'monitoring.coreos.com/v1',
kind: 'PrometheusRule', kind: 'PrometheusRule',
metadata: { metadata: {
@ -341,7 +341,7 @@ function(params) {
}, },
// Include thanos sidecar Service only if thanos config was passed by user // Include thanos sidecar Service only if thanos config was passed by user
[if std.objectHas(params, 'thanos') && std.length(params.thanos) > 0 then 'serviceThanosSidecar']: { [if std.objectHas(params, 'thanos') && params.thanos != null then 'serviceThanosSidecar']: {
apiVersion: 'v1', apiVersion: 'v1',
kind: 'Service', kind: 'Service',
metadata+: { metadata+: {
@ -366,7 +366,7 @@ function(params) {
}, },
// Include thanos sidecar ServiceMonitor only if thanos config was passed by user // Include thanos sidecar ServiceMonitor only if thanos config was passed by user
[if std.objectHas(params, 'thanos') && std.length(params.thanos) > 0 then 'serviceMonitorThanosSidecar']: { [if std.objectHas(params, 'thanos') && params.thanos != null then 'serviceMonitorThanosSidecar']: {
apiVersion: 'monitoring.coreos.com/v1', apiVersion: 'monitoring.coreos.com/v1',
kind: 'ServiceMonitor', kind: 'ServiceMonitor',
metadata+: { metadata+: {