Make eventing components observable #1722

sayanh · 2019-08-22T12:21:38Z

Fix the following components and make them scrapable:

For the following sources, I'll create a separate PR:

cronjobsource
containersource
apiserversource

See #1693

Related PR in Serving.

Proposed Changes

Make eventing controller scrappable
Add dashboard for reconciler

Release Note

NONE

- Enable scrapping of eventing-controller - Add eventing reconciler dasshboard

knative-prow-robot · 2019-08-22T12:21:54Z

Hi @sayanh. Thanks for your PR.

I'm waiting for a knative 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.

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.

n3wscott · 2019-08-22T15:15:16Z

config/monitoring/metrics/grafana/100-grafana-dash-eventing.yaml

@@ -17,6 +17,608 @@
 # --patch "$(cat 100-grafana-dash-eventing.yaml)" -n knative-monitoring
 ---
 data:
+  knative-eventing-reconciler-dashboard.json: |+


The eventing controllers will show up in the Knative Serving Controller dashboards from my testing.

True that. I removed this dashboard completely. We'll use Knative Serving - Reconciler dashboard but I've changed the name to Knative - ReconcilerPR. And of course, we'll take all of the monitoring components out of serving as in here. By the way, where can I find Knative Serving Controller dashboard? I just see the following dashboards.

daisy-ycguo · 2019-08-23T07:05:08Z

docs/metrics.md

+   rm tmp.prometheus-scrape-kn-eventing.yaml
+   rm tmp.prometheus-scrape-config.yaml
+   ```
+


I think you are going to add a new scrap job eventing-controller to Prometheus scrap configuration. But the instructions look very complicated. Do you want to try "kubectl patch configmap prometheus-scrape-config ..." ?

An example is that how we add the eventing dashboard to the configmap grafana-dashboard-definition-knative :
kubectl patch configmap grafana-dashboard-definition-knative --patch "$(cat config/monitoring/metrics/grafana/100-grafana-dash-eventing.yaml)" -n knative-monitoring

@daisy-ycguo The problem here is the scrapping config needs to be a part of the same file(key) in the configmap and we can't patch like the example you posted. Hence this complicated way of doing things.

@sayanh Thank you for clarify. I understand now, but still feel complicated. I wonder if kubectl patch configmap --type json ... could help. Here is a reference to json patch

I think this is just a workaround until we get the prometheus operator in. So I'm fine with it.

- Refer prometheus-operator/kube-prometheus#16

knative-prow-robot · 2019-08-26T09:36:54Z

@sayanh: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/ok-to-test

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.

n3wscott · 2019-08-26T15:23:41Z

/ok-to-test

nachocano · 2019-08-26T16:04:34Z

pkg/reconciler/broker/broker_test.go

@@ -283,7 +283,7 @@ func TestReconcileCRD(t *testing.T) {
 			WantCreates: []runtime.Object{
 				NewService(filterServiceName, testNS,
 					WithServiceOwnerReferences(ownerReferences()),
-					WithServiceAnnotations(resources.FilterAnnotations()),
+					WithServiceAnnotations(map[string]string{}),


I think this call to WithServiceAnnotations can be removed

nachocano · 2019-08-26T16:04:41Z

pkg/reconciler/broker/broker_test.go

@@ -459,7 +459,7 @@ func TestReconcileCRD(t *testing.T) {
 			WantCreates: []runtime.Object{
 				NewService(ingressServiceName, testNS,
 					WithServiceOwnerReferences(ownerReferences()),
-					WithServiceAnnotations(resources.IngressAnnotations()),
+					WithServiceAnnotations(map[string]string{}),


nachocano · 2019-08-26T16:13:03Z

@capri-xiyue this will fix the infra issue you were having.

nachocano · 2019-08-26T18:19:53Z

/lgtm

nachocano · 2019-08-26T18:20:46Z

@n3wscott for approval

n3wscott · 2019-08-27T14:42:04Z

/approve

Thanks!

knative-prow-robot · 2019-08-27T14:42:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: n3wscott, sayanh

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:

~~OWNERS~~ [n3wscott]

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

* Make eventing controller observable - Enable scrapping of eventing-controller - Add eventing reconciler dasshboard * Retain vendor license * Removed eventing reconciler dashboard * Make broker filter and ingress scrapeable * Removed hard coded annotation for prometheus - Refer prometheus-operator/kube-prometheus#16 * Made sources-controller observable * Remove sources metrics service * Fixed as per PR comments

…t-proxy-some-headers Do not proxy some headers from reply

Make eventing controller observable

3a1f116

- Enable scrapping of eventing-controller - Add eventing reconciler dasshboard

knative-prow-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 22, 2019

googlebot added the cla: yes Indicates the PR's author has signed the CLA. label Aug 22, 2019

knative-prow-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 22, 2019

knative-prow-robot requested review from grantr and vaikas August 22, 2019 12:21

knative-prow-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 22, 2019

Retain vendor license

d816b97

knative-prow-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 22, 2019

n3wscott reviewed Aug 22, 2019

View reviewed changes

daisy-ycguo reviewed Aug 23, 2019

View reviewed changes

Removed eventing reconciler dashboard

e4aaca2

knative-prow-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 23, 2019

sayanh changed the title ~~Make eventing controller observable~~ Make eventing components observable Aug 23, 2019

Make broker filter and ingress scrapeable

9b13d62

knative-prow-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 26, 2019

sayanh added 2 commits August 26, 2019 10:53

Removed hard coded annotation for prometheus

33ba3bb

- Refer prometheus-operator/kube-prometheus#16

Made sources-controller observable

9ba49b4

sayanh marked this pull request as ready for review August 26, 2019 09:03

knative-prow-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 26, 2019

Remove sources metrics service

1d65ebc

sayanh mentioned this pull request Aug 26, 2019

[Knative-observability sub-group] Enable metrics for some components in Knative-eventing using Prometheus kyma-project/kyma#5378

Closed

knative-prow-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 26, 2019

nachocano reviewed Aug 26, 2019

View reviewed changes

Fixed as per PR comments

ca3fa5b

knative-prow-robot assigned nachocano Aug 26, 2019

knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2019

knative-prow-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 27, 2019

knative-prow-robot merged commit 359776f into knative:master Aug 27, 2019

sayanh deleted the set-up-prometheus-infra branch August 27, 2019 15:24

matzew added a commit to matzew/eventing that referenced this pull request May 3, 2022

Merge pull request knative#1722 from aliok/2022-04-27-release12-do-no…

5a779a5

…t-proxy-some-headers Do not proxy some headers from reply

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make eventing components observable #1722

Make eventing components observable #1722

sayanh commented Aug 22, 2019 •

edited

Loading

knative-prow-robot commented Aug 22, 2019

n3wscott Aug 22, 2019

sayanh Aug 23, 2019 •

edited

Loading

daisy-ycguo Aug 23, 2019

sayanh Aug 23, 2019

daisy-ycguo Aug 23, 2019

nachocano Aug 26, 2019

knative-prow-robot commented Aug 26, 2019

n3wscott commented Aug 26, 2019

nachocano Aug 26, 2019

sayanh Aug 26, 2019

nachocano Aug 26, 2019

sayanh Aug 26, 2019

nachocano commented Aug 26, 2019

nachocano commented Aug 26, 2019

nachocano commented Aug 26, 2019

n3wscott commented Aug 27, 2019

knative-prow-robot commented Aug 27, 2019

Make eventing components observable #1722

Make eventing components observable #1722

Conversation

sayanh commented Aug 22, 2019 • edited Loading

Proposed Changes

knative-prow-robot commented Aug 22, 2019

Choose a reason for hiding this comment

sayanh Aug 23, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

knative-prow-robot commented Aug 26, 2019

n3wscott commented Aug 26, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nachocano commented Aug 26, 2019

nachocano commented Aug 26, 2019

nachocano commented Aug 26, 2019

n3wscott commented Aug 27, 2019

knative-prow-robot commented Aug 27, 2019

sayanh commented Aug 22, 2019 •

edited

Loading

sayanh Aug 23, 2019 •

edited

Loading