Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(metrics): add service monitor config #682

Merged
merged 6 commits into from
Mar 26, 2019
Merged

fix(metrics): add service monitor config #682

merged 6 commits into from
Mar 26, 2019

Conversation

jpeeler
Copy link

@jpeeler jpeeler commented Jan 23, 2019 •
edited
Loading

Please review @openshift/sig-monitoring. <-- I guess that doesn't work since this repo isn't in the openshift namespace?

There are no alerts as the OLM metrics are mostly informational. The metrics are reported without TLS, that's ok right? (Edit: metrics are served over TLS.) And lastly, just in case the intent is not clear the goal is to scrape two separate endpoints.

(This will need a make release done after final review I believe.)

@openshift-ci-robot 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 Jan 23, 2019
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 23, 2019
@jpeeler jpeeler force-pushed the metrics-add-servicemonitor branch from 2d9b879 to 581c8b5 Compare January 23, 2019 23:23
@sichvoge
Copy link
Collaborator

@jpeeler i asked the monitoring team for a review.

@mxinden
Copy link

mxinden commented Jan 24, 2019

The metrics are reported without TLS, that's ok right?

We are trying to secure all metrics endpoints in the monitoring stack. You can find two examples similar to your use case in the node-exporter and kube-state-metrics manifests. I am not sure this would be a show-stopper though.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 18, 2019
@ecordell
Copy link
Member

@jpeeler I think this just needs a rebase and it's good to go, right?

@ecordell ecordell added the kind/feature Categorizes issue or PR as related to a new feature. label Mar 19, 2019
@jpeeler jpeeler force-pushed the metrics-add-servicemonitor branch from 581c8b5 to 3abfeab Compare March 21, 2019 22:51
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 21, 2019
ecordell
ecordell requested changes Mar 22, 2019
View reviewed changes
Copy link
Member

@ecordell ecordell left a comment

Choose a reason for hiding this comment

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

Everything looks great! I just don't think we want this to be part of our upstream release.

deploy/chart/templates/0000_50_olm_00-namespace.yaml Show resolved Hide resolved
deploy/chart/templates/0000_50_olm_02-services.yaml Show resolved Hide resolved
deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml Show resolved Hide resolved
deploy/chart/templates/0000_50_olm_18-upstream-operators.catalogsource.yaml
@@ -1,3 +1,5 @@
#! validate-crd: ./deploy/chart/templates/06-catalogsource.crd.yaml
#! parse-kind: CatalogSource
Copy link
Member

Choose a reason for hiding this comment

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

I seem to remember these caused problems with the release artifacts, so we removed them.

Copy link
Author

Choose a reason for hiding this comment

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

As far as I understand it, these lines will get stripped when a release is made. These lines were already there.

deploy/chart/templates/0000_50_olm_19-service-monitor.yaml Show resolved Hide resolved
@jpeeler jpeeler force-pushed the metrics-add-servicemonitor branch from 3abfeab to f097e51 Compare March 22, 2019 20:05
@jpeeler
Copy link
Author

jpeeler commented Mar 22, 2019

I really hate it when github doesn't display the commit order in the order I've specified and uses date order.
If you review by commit:
b60eb07
57d0196
0887aa7
cee4a28
91003b6
f097e51

@jpeeler jpeeler changed the title WIP fix(metrics): add service monitor config fix(metrics): add service monitor config Mar 22, 2019
@openshift-ci-robot 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 Mar 22, 2019
@jpeeler
Copy link
Author

jpeeler commented Mar 23, 2019

/retest

Jeff Peeler added 6 commits March 25, 2019 14:37
chore(deploy): renumber files from 02* onwards
fb9a5b8 
This is to make room for a new file that needs to be loaded near the
beginning.
feat(olm,catalog): add TLS support for metrics
3d2317f 
Two new command line arguments are added to pass the paths to the certificate
and private key, "tls-cert" and "tls-key".
feat(templates): make use of TLS options in deployments
d8996f1
fix(metrics): add service monitor config
85776e9
fix(deploy): move service creation to new file
de0c3d2 
This allows the certificates to be created before the deployments that
reference them.
chore(deploy): don't include openshift stuff in upstream
888b81c
@jpeeler jpeeler force-pushed the metrics-add-servicemonitor branch from f097e51 to 888b81c Compare March 25, 2019 18:54
@jpeeler
Copy link
Author

jpeeler commented Mar 25, 2019

/retest

1 similar comment
@jpeeler
Copy link
Author

jpeeler commented Mar 26, 2019

/retest

@ecordell
Copy link
Member

/lgtm

Looks good! Thanks!

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2019
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell, jpeeler

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

The pull request process is described here

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

@openshift-merge-robot openshift-merge-robot merged commit 280c674 into operator-framework:master Mar 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mxinden mxinden mxinden left review comments

@ecordell ecordell ecordell requested changes

@alecmerdler alecmerdler Awaiting requested review from alecmerdler

@njhale njhale Awaiting requested review from njhale

Assignees

@ecordell ecordell

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jpeeler @sichvoge @mxinden @ecordell @openshift-ci-robot @openshift-merge-robot