diff --git a/examples/prometheus/prometheus.yaml b/examples/prometheus/prometheus.yaml index 7f4ce7d4754e..1345f28b4925 100644 --- a/examples/prometheus/prometheus.yaml +++ b/examples/prometheus/prometheus.yaml @@ -5,7 +5,7 @@ metadata: annotations: "openshift.io/display-name": Prometheus description: | - A monitoring solution for an OpenShift cluster - collect and gather metrics from nodes, services, and the infrastructure. + A monitoring solution for an OpenShift cluster - collect and gather metrics from nodes, services, and the infrastructure. This is a tech preview feature. iconClass: icon-cogs tags: "monitoring,prometheus,time-series" parameters: @@ -14,10 +14,10 @@ parameters: value: kube-system - description: The location of the proxy image name: IMAGE_PROXY - value: registry.svc.ci.openshift.org/ci/oauth-proxy:latest + value: openshift/oauth-proxy:v1.0.0 - description: The location of the prometheus image name: IMAGE_PROMETHEUS - value: registry.svc.ci.openshift.org/ci/prometheus:latest + value: openshift/prometheus:v2.0.0-dev - description: The session secret for the proxy name: SESSION_SECRET generate: expression @@ -126,9 +126,9 @@ objects: - name: prometheus args: - - -storage.tsdb.retention=6h - - -config.file=/etc/prometheus/prometheus.yml - - -web.listen-address=localhost:9090 + - --storage.tsdb.retention=6h + - --config.file=/etc/prometheus/prometheus.yml + - --web.listen-address=localhost:9090 image: ${IMAGE_PROMETHEUS} imagePullPolicy: IfNotPresent volumeMounts: diff --git a/pkg/bootstrap/bindata.go b/pkg/bootstrap/bindata.go index 694a7dfb7c1c..f38a06e7efda 100644 --- a/pkg/bootstrap/bindata.go +++ b/pkg/bootstrap/bindata.go @@ -12885,7 +12885,7 @@ metadata: annotations: "openshift.io/display-name": Prometheus description: | - A monitoring solution for an OpenShift cluster - collect and gather metrics from nodes, services, and the infrastructure. + A monitoring solution for an OpenShift cluster - collect and gather metrics from nodes, services, and the infrastructure. This is a tech preview feature. iconClass: icon-cogs tags: "monitoring,prometheus,time-series" parameters: @@ -12894,10 +12894,10 @@ parameters: value: kube-system - description: The location of the proxy image name: IMAGE_PROXY - value: registry.svc.ci.openshift.org/ci/oauth-proxy:latest + value: openshift/oauth-proxy:v1.0.0 - description: The location of the prometheus image name: IMAGE_PROMETHEUS - value: registry.svc.ci.openshift.org/ci/prometheus:latest + value: openshift/prometheus:v2.0.0-dev - description: The session secret for the proxy name: SESSION_SECRET generate: expression @@ -13006,9 +13006,9 @@ objects: - name: prometheus args: - - -storage.tsdb.retention=6h - - -config.file=/etc/prometheus/prometheus.yml - - -web.listen-address=localhost:9090 + - --storage.tsdb.retention=6h + - --config.file=/etc/prometheus/prometheus.yml + - --web.listen-address=localhost:9090 image: ${IMAGE_PROMETHEUS} imagePullPolicy: IfNotPresent volumeMounts: