[bitnami/kube-prometheus] Allow custom prometheus url in Thanos sidecar (#5798)

* [bitnami/kube-prometheus] Allow custom prometheus url in Thanos sidecar

* Improve code quality and change chart version number
This commit is contained in:
Etienne Barbier
2021-03-17 10:39:25 +01:00
committed by GitHub
parent 8bfd73aad2
commit f92b9b5edd
4 changed files with 8 additions and 2 deletions

View File

@@ -34,4 +34,4 @@ sources:
- https://github.com/bitnami/bitnami-docker-prometheus
- https://github.com/bitnami/bitnami-docker-alertmanager
- https://github.com/prometheus-operator/kube-prometheus
version: 4.1.2
version: 4.2.0

View File

@@ -258,6 +258,7 @@ The following table lists the configurable parameters of the kube-prometheus cha
| `prometheus.thanos.image.tag` | Thanos image tag | `{TAG_NAME}` |
| `prometheus.thanos.image.pullPolicy` | Thanos image pull policy | `IfNotPresent` |
| `prometheus.thanos.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `prometheus.thanos.prometheusUrl` | Specify custom prometheus url | `""` |
| `prometheus.thanos.extraArgs` | Additional arguments passed to the thanos sidecar container | `[]` |
| `prometheus.thanos.objectStorageConfig.secretName` | Defines the secretName to load. | `nil` |
| `prometheus.thanos.objectStorageConfig.secretKey` | Defines the key inside the secret which references the objectStorageConfig for the thanos sideCar | `nil` |

View File

@@ -211,7 +211,7 @@ spec:
imagePullPolicy: {{ .Values.prometheus.thanos.image.pullPolicy }}
args:
- sidecar
- --prometheus.url=http://localhost:9090
- --prometheus.url={{ default "http://localhost:9090" .Values.prometheus.thanos.prometheusUrl }}
- --grpc-address=0.0.0.0:10901
- --http-address=0.0.0.0:10902
- --tsdb.path=/prometheus/

View File

@@ -827,6 +827,11 @@ prometheus:
# pullSecrets:
# - myRegistryKeySecretName
## Override default prometheus url "http://localhost:9090"
##
prometheusUrl: ""
## Extra arguments passed to thanos sidecar 'args' section
##
extraArgs: []