Optional proxy of Prometheus from outside the cluster #2527

yaacov · 2019-08-29T06:48:48Z

Description:
It will be nice to have an option to proxy prometheus from outside the cluster for devel.

This PR adds the option to proxy Prometheus and AlertManager when running outside the
cluster.

It adds new CLI options:

./bin/bridge --help
...
  -k8s-mode-off-cluster-alertmanager string
    	DEV ONLY. URL of the cluster's AlertManager server.
  -k8s-mode-off-cluster-prometheus string
    	DEV ONLY. URL of the cluster's Pormetheus server.

...

Usage:
Already integrated when running dev scripts:

source ./contrib/oc-environment.sh
./bin/bridge

And

./examples/run-bridge.sh

Ref:
https://docs.google.com/document/d/1epyQuj0AqL77zCLuea6T6WUKq-v47NbT9v24pOBFS1A/edit

https://jira.coreos.com/browse/CONSOLE-737

yaacov · 2019-08-29T06:51:31Z

@dtaylor113 Hi,
This is a way to get data from prometheus when running is dev env.
How do you run pages [1] that need to get data from prometheus on dev env ?

[1] #2497

yaacov · 2019-08-29T10:00:54Z

@rawagner @suomiy @mareklibra @vojtechszocs @spadgett Hi,

Is there a way to get data from Promethean/AlertManger in devel mode ? what am I missing ?

yaacov · 2019-08-29T10:01:35Z

/test e2e-aws

spadgett · 2019-08-29T13:04:41Z

README.md

I don't think we should recommend people set this even for development. It's too easy to forget you have this disabled.

👍 removed, we now use proxy to get the data, no CORS 🎉

spadgett · 2019-08-29T13:05:46Z

cmd/bridge/main.go

Can we have an off-cluster prometheus URL and proxy to that instead of the service? That more closely mirrors a real environment and avoids the same origin problems.

👍 Thanks !

use the proxy now 🎂 🍻 🍰

spadgett · 2019-08-29T13:06:09Z

/hold

yaacov · 2019-08-30T05:11:47Z

/test e2e-aws-console-olm
/test e2e-aws

yaacov · 2019-08-30T05:16:58Z

/test e2e-aws-console-olm

kyoto · 2019-08-30T07:58:28Z

cmd/bridge/main.go

Typo: Prmetheus -> Prometheus

kyoto · 2019-08-30T08:01:35Z

cmd/bridge/main.go

Typo: clusters -> cluster's (and same in the line below)

I should wait with fixing :-)

yaacov · 2019-08-30T14:51:54Z

@spadgett hi, removed the need to use un secure browser, now using proxy, please re-review.

spadgett

Nice! Thanks for making this work

spadgett · 2019-08-30T15:46:16Z

contrib/oc-environment.sh

You can avoid the jq requirement with

Suggested change

export BRIDGE_K8S_MODE_OFF_CLUSTER_PROMETHEUS=$(oc -n openshift-monitoring get configmap sharing-config -o json | jq .data.prometheusURL | tr -d '"')

export BRIDGE_K8S_MODE_OFF_CLUSTER_PROMETHEUS=$(oc -n openshift-monitoring get configmap sharing-config -o jsonpath='{.data.prometheusURL}')

(same for below)

spadgett · 2019-08-30T15:48:11Z

pkg/server/server.go

Isn't the proxy config still set? Is this change needed?

Yes, my bad ... fixing 👍

spadgett · 2019-08-30T16:04:39Z

lgtm, just need to squash. thanks!

spadgett

👍

/lgtm

openshift-ci-robot · 2019-08-30T16:27:21Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: spadgett, yaacov

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [spadgett]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

yaacov · 2019-08-30T16:30:09Z

@spadgett do-not-merge/hold label ?

spadgett · 2019-08-30T16:49:25Z

/hold cancel

spadgett · 2019-08-30T17:18:43Z

/retest

yaacov · 2019-08-30T17:53:37Z

/test e2e-aws-console
/test e2e-aws

yaacov · 2019-08-30T18:12:44Z

/test e2e-aws-console

yaacov · 2019-08-31T03:54:49Z

/test e2e-aws-console-olm

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 29, 2019

openshift-ci-robot requested review from rhamilto and spadgett August 29, 2019 06:48

openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. component/backend Related to backend labels Aug 29, 2019

openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 29, 2019

spadgett requested changes Aug 29, 2019

View reviewed changes

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 29, 2019

yaacov force-pushed the bypass-monitoring-proxy-for-dev branch from 893f363 to 81f3106 Compare August 30, 2019 04:49

yaacov changed the title ~~[WIP] Bypass monitoring proxy for dev~~ Bypass monitoring proxy for dev Aug 30, 2019

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 30, 2019

yaacov changed the title ~~Bypass monitoring proxy for dev~~ Optional proxy of off cluster Prometheus. Aug 30, 2019

yaacov changed the title ~~Optional proxy of off cluster Prometheus.~~ Optional proxy of Prometheus from outside the cluster Aug 30, 2019

kyoto reviewed Aug 30, 2019

View reviewed changes

spadgett reviewed Aug 30, 2019

View reviewed changes

add dev option to bypass prometheus and alrtmanager proxy

ab163e2

yaacov force-pushed the bypass-monitoring-proxy-for-dev branch from 3724d04 to ab163e2 Compare August 30, 2019 16:06

spadgett approved these changes Aug 30, 2019

View reviewed changes

openshift-ci-robot assigned spadgett Aug 30, 2019

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 30, 2019

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 30, 2019

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 30, 2019

spadgett added this to the v4.2 milestone Aug 30, 2019

openshift-merge-robot merged commit a889005 into openshift:master Aug 31, 2019

spadgett mentioned this pull request Sep 6, 2019

Enable metering proxy for local development #2622

Merged

	export BRIDGE_K8S_MODE_OFF_CLUSTER_PROMETHEUS=$(oc -n openshift-monitoring get configmap sharing-config -o json \| jq .data.prometheusURL \| tr -d '"')
	export BRIDGE_K8S_MODE_OFF_CLUSTER_PROMETHEUS=$(oc -n openshift-monitoring get configmap sharing-config -o jsonpath='{.data.prometheusURL}')

Optional proxy of Prometheus from outside the cluster #2527

Optional proxy of Prometheus from outside the cluster #2527

Uh oh!

Conversation

yaacov commented Aug 29, 2019 • edited by spadgett Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yaacov commented Aug 29, 2019

Uh oh!

yaacov commented Aug 29, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yaacov commented Aug 29, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

spadgett commented Aug 29, 2019

Uh oh!

yaacov commented Aug 30, 2019

Uh oh!

yaacov commented Aug 30, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kyoto Aug 30, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yaacov commented Aug 30, 2019

Uh oh!

spadgett left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

spadgett commented Aug 30, 2019

Uh oh!

spadgett left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Aug 30, 2019

Uh oh!

yaacov commented Aug 30, 2019

Uh oh!

spadgett commented Aug 30, 2019

Uh oh!

spadgett commented Aug 30, 2019

Uh oh!

yaacov commented Aug 30, 2019

Uh oh!

yaacov commented Aug 30, 2019

Uh oh!

yaacov commented Aug 31, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

yaacov commented Aug 29, 2019 •

edited by spadgett

Loading

yaacov commented Aug 29, 2019 •

edited

Loading

kyoto Aug 30, 2019 •

edited

Loading