Merge pull request #1386 from nickman/master

Adds proxy_url to v1.Endpoint. Fixes #1385
2018-05-30 14:17:24 +02:00
parent fedfc8afd3 7eee585cdf
commit b405326bfc
2 changed files with 5 additions and 1 deletions
--- a/jsonnet/kube-prometheus/prometheus-operator/servicemonitor-crd.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus-operator/servicemonitor-crd.libsonnet
--- a/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
@@ -133,6 +133,10 @@ spec:
                    description: Name of the service port this endpoint refers to.
                      Mutually exclusive with targetPort.
                    type: string
+                  proxyUrl:
+                    description: ProxyURL eg http://proxyserver:2195 Directs scrapes
+                      to proxy through this endpoint.
+                    type: string
                  scheme:
                    description: HTTP scheme to use for scraping.
                    type: string