Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Expose Prometheus over ingress #710

Merged
merged 4 commits into from
Jul 20, 2020
Merged

Expose Prometheus over ingress #710

merged 4 commits into from
Jul 20, 2020

Conversation

surajssd
Copy link
Member

@surajssd surajssd commented Jul 8, 2020

NOTE: See changes per commit.

@surajssd surajssd changed the title Expose Prometheus Expose Prometheus over ingress Jul 8, 2020
@surajssd surajssd force-pushed the surajssd/expose-prometheus branch from 20a7248 to 1ab88b3 Compare July 8, 2020 15:10
@surajssd surajssd requested a review from iaguis July 9, 2020 09:37
@surajssd
Copy link
Member Author

cc: @invidian @iaguis @ipochi

@surajssd
Copy link
Member Author

Can we move ahead with this change and work on setting up authentication for contour? WDYT @iaguis @invidian

Also this change is a voluntary change for the user and not a default one (which will compromise user clusters) so it is upto user's discretion to make the right choice?

@iaguis
Copy link
Contributor

iaguis commented Jul 17, 2020

Let's move ahead and create an issue to secure this.

@surajssd
Copy link
Member Author

@iaguis created an issue for this #725

Copy link
Member

@invidian invidian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some nits, otherwise LGTM.

* This commit moves all the params that are Prometheus specific to its
special block.

* This helps us organise all the Prometheus specific variables under the
`prometheus` block in the component config. Having these variables at
the root level does not delineate clearly. This change improves the UI
of the `prometheus-operator` component.

* Update docs to show the move of Prometheus specific configs to the
`prometheus` block.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
- Allow user to use ingress to expose Prometheus.

- Remove the variable `prometheus_external_url` since it is no longer
needed. This information can be extracted from the `ingress.host`
config.

- Add docs to `prometheus-operator` configuration reference about the
new block `ingress` inside the `prometheus` block.

- Add docs to `Setting up monitoring on Lokomotive` on how to access
Prometheus if exposed over the internet using Ingress.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
- Modify the existing ingress test to accomodate testing multiple
exposed ingresses.

- This commit adds a test to verify if Prometheus is accessible over
internet.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
* Adds a variable called `external_labels` which is helpful in federated
clusters. This helps us identify the metrics from the cluster being
queried with the help of these `external_labels`.

* Adds the docs about the variable `external_labels` in the `prometheus`
block in the `prometheus-operator` component.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
@surajssd surajssd requested a review from invidian July 20, 2020 08:58
@surajssd
Copy link
Member Author

cc: @iaguis @invidian PTAL.

Copy link
Member

@invidian invidian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@surajssd surajssd merged commit bbd688c into master Jul 20, 2020
@surajssd surajssd deleted the surajssd/expose-prometheus branch July 20, 2020 11:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants