Skip to content
This repository was archived by the owner on Feb 22, 2022. It is now read-only.

[stable/traefik] Decouple prometheus metrics to dashboard#14946

Merged
k8s-ci-robot merged 1 commit into
helm:masterfrom
mazzy89:traefik-metrics
Oct 29, 2019
Merged

[stable/traefik] Decouple prometheus metrics to dashboard#14946
k8s-ci-robot merged 1 commit into
helm:masterfrom
mazzy89:traefik-metrics

Conversation

@mazzy89

@mazzy89 mazzy89 commented Jun 20, 2019

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

Before this PR, in case the dashboard was not enabled, the Prometheus metrics were disabled.

It is now possible to enable Prometheus metrics having at the same time the dashboard disabled.

I've fully tested the PR locally and it works as expected.

Signed-off-by: Salvatore Mazzarino dev@mazzarino.cz

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer:

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • DCO signed
  • Chart Version bumped
  • Variables are documented in the README.md
  • Title of the PR starts with chart name (e.g. [stable/chart])

@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 20, 2019
@k8s-ci-robot k8s-ci-robot requested review from juliens and nmengin June 20, 2019 18:54
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Hi @mazzy89. Thanks for your PR.

I'm waiting for a helm member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 20, 2019
@dtomcej

dtomcej commented Jun 23, 2019

Copy link
Copy Markdown
Collaborator

Hi @mazzy89, I like where this PR is going, but can you add a metrics.useOwnEntrypoint flag for this to maintain backwards compatability?

Thanks!

@mazzy89

mazzy89 commented Jun 23, 2019

Copy link
Copy Markdown
Contributor Author

@dtomcej So if I have understood correctly, you are proposing to not change the ConfigMap and introduce the config of the entry point for Prometheus via flags, right?

@mazzy89 mazzy89 force-pushed the traefik-metrics branch 2 times, most recently from db5b9a3 to 6d06f37 Compare June 28, 2019 17:01
@stale

stale Bot commented Jul 28, 2019

Copy link
Copy Markdown

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Any further update will cause the issue/pull request to no longer be considered stale. Thank you for your contributions.

@stale stale Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jul 28, 2019
@mazzy89

mazzy89 commented Aug 7, 2019

Copy link
Copy Markdown
Contributor Author

If anyone could take a look, I'd really appreciate it. thank you 🙏

@stale stale Bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Aug 7, 2019
Comment thread stable/traefik/templates/service.yaml
@chelnak

chelnak commented Sep 16, 2019 via email

Copy link
Copy Markdown

@stale

stale Bot commented Oct 16, 2019

Copy link
Copy Markdown

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Any further update will cause the issue/pull request to no longer be considered stale. Thank you for your contributions.

@stale stale Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Oct 16, 2019
@zanhsieh

Copy link
Copy Markdown
Collaborator

@mazzy89
Could you bump the chart to latest please? Thank you.

@stale stale Bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Oct 16, 2019
Before this PR, in case the dashboard was not enabled, the Prometheus metrics were disabled.

It is now possible to enable Prometheus metrics having at the same time the dashboard disabled.

Signed-off-by: Salvatore Mazzarino <dev@mazzarino.cz>
@helm-bot helm-bot 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 Oct 26, 2019
@mazzy89

mazzy89 commented Oct 26, 2019

Copy link
Copy Markdown
Contributor Author

@szamuboy Updated the PR by creating a separate Service for Prometheus metrics and @zanhsieh bumped the version here.

@zanhsieh

Copy link
Copy Markdown
Collaborator

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 26, 2019
@mazzy89

mazzy89 commented Oct 26, 2019

Copy link
Copy Markdown
Contributor Author

Thanks a lot @zanhsieh for the fast reaction ❤️

@zanhsieh

Copy link
Copy Markdown
Collaborator

@emilevauge
@dtomcej
@timoreimann
@vdemeester
@nmengin
@mmatur
@ldez
@juliens
@jbdoumenjou
@geraldcroes
@SantoDE
@errm
Would you guys LGTM this PR please? Thank you.

@mazzy89

mazzy89 commented Oct 28, 2019

Copy link
Copy Markdown
Contributor Author

🙏

@vdemeester vdemeester left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mazzy89, vdemeester

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:

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

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Oct 29, 2019
@k8s-ci-robot k8s-ci-robot merged commit 8e4efcd into helm:master Oct 29, 2019
@monotek

monotek commented Oct 29, 2019

Copy link
Copy Markdown
Collaborator

@mazzy89 & @vdemeester

This was a breaking change for us as all traefik metrics vanished after rollout :-(
Chart version should have been raised accordingly.

We had to change chart settings and switch from pod to service annotations.

Replace:

deployment:
  podAnnotations:
    prometheus.io/port: "8080"
    prometheus.io/scrape: "true"

With:

service:
  annotations:
    prometheus.io/port: "9100"
    prometheus.io/scrape: "true"

I also doubt that the pr made sense at all as we used metrics all the time but never used the dashboard.

@errm

errm commented Oct 31, 2019

Copy link
Copy Markdown
Contributor

I also doubt that the pr made sense at all as we used metrics all the time but never used the dashboard.

If I understand it correctly this point here was to be able to expose metrics without exposing the dashboard ... which sounds exactly like your use-case

eMCeee89 pushed a commit to eMCeee89/charts that referenced this pull request Nov 3, 2019
Before this PR, in case the dashboard was not enabled, the Prometheus metrics were disabled.

It is now possible to enable Prometheus metrics having at the same time the dashboard disabled.

Signed-off-by: Salvatore Mazzarino <dev@mazzarino.cz>
k8s-ci-robot pushed a commit that referenced this pull request Nov 6, 2019
…18380)

* [stable/traefik] Decouple prometheus metrics to dashboard (#14946)

Before this PR, in case the dashboard was not enabled, the Prometheus metrics were disabled.

It is now possible to enable Prometheus metrics having at the same time the dashboard disabled.

Signed-off-by: Salvatore Mazzarino <dev@mazzarino.cz>

Fix

Fix for Jobs.
Jobs also have `"helm.sh/hook": post-install` so they don't have this configmap after start. Pods won't start because of this.

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

Update Chart.yaml

version up

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

fix

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* added expire to values

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* add ability to set expire

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* remove blank line

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* Bump version

Co-Authored-By: Cédric de Saint Martin <cedric@desaintmartin.fr>
Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* Added new conf params to Readme

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>
JoseAlban pushed a commit to JoseAlban/charts that referenced this pull request Nov 22, 2019
…elm#18380)

* [stable/traefik] Decouple prometheus metrics to dashboard (helm#14946)

Before this PR, in case the dashboard was not enabled, the Prometheus metrics were disabled.

It is now possible to enable Prometheus metrics having at the same time the dashboard disabled.

Signed-off-by: Salvatore Mazzarino <dev@mazzarino.cz>

Fix

Fix for Jobs.
Jobs also have `"helm.sh/hook": post-install` so they don't have this configmap after start. Pods won't start because of this.

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

Update Chart.yaml

version up

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

fix

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* added expire to values

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* add ability to set expire

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* remove blank line

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* Bump version

Co-Authored-By: Cédric de Saint Martin <cedric@desaintmartin.fr>
Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* Added new conf params to Readme

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>
hakman pushed a commit to hakman/charts that referenced this pull request Dec 5, 2019
Before this PR, in case the dashboard was not enabled, the Prometheus metrics were disabled.

It is now possible to enable Prometheus metrics having at the same time the dashboard disabled.

Signed-off-by: Salvatore Mazzarino <dev@mazzarino.cz>
hakman pushed a commit to hakman/charts that referenced this pull request Dec 5, 2019
…elm#18380)

* [stable/traefik] Decouple prometheus metrics to dashboard (helm#14946)

Before this PR, in case the dashboard was not enabled, the Prometheus metrics were disabled.

It is now possible to enable Prometheus metrics having at the same time the dashboard disabled.

Signed-off-by: Salvatore Mazzarino <dev@mazzarino.cz>

Fix

Fix for Jobs.
Jobs also have `"helm.sh/hook": post-install` so they don't have this configmap after start. Pods won't start because of this.

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

Update Chart.yaml

version up

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

fix

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* added expire to values

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* add ability to set expire

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* remove blank line

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* Bump version

Co-Authored-By: Cédric de Saint Martin <cedric@desaintmartin.fr>
Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>

* Added new conf params to Readme

Signed-off-by: Nikita Massalitin <nmassalitin@pushwoosh.com>
@rehevkor5

Copy link
Copy Markdown

@monotek Wont scraping metrics from the Service only give you one random Pod's metrics each time? Wouldn't this change be better?

deployment:
  podAnnotations:
    prometheus.io/scrape: "true"
    prometheus.io/port: "9100"

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-to-test size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.