Skip to content
This repository was archived by the owner on Jun 24, 2020. It is now read-only.

Add metrics port to operator #216

Merged
knative-prow-robot merged 7 commits into from
Nov 15, 2019
Merged

Add metrics port to operator #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac3c5fa
Added metrics port to operator yaml
jihuin Nov 1, 2019
1b8e709
Merge remote-tracking branch 'upstream/master'
jihuin Nov 2, 2019
86d46bd
Added stats reporter to emit metrics when reconciling knative serving
jihuin Nov 7, 2019
a75e3d4
Revert "Added stats reporter to emit metrics when reconciling knative…
jihuin Nov 13, 2019
885f020
Sync with upstream
jihuin Nov 13, 2019
b8e0c3a
Changed the component name from 'serving_operator' to 'operator'
jihuin Nov 13, 2019
568f225
Changed the component name to `serving_operator`
jihuin Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ func main() {
if err != nil {
log.Fatal("Error building kubeconfig", err)
}
sharedmain.MainWithConfig(signals.NewContext(), "serving-operator", cfg, knativeserving.NewController)
sharedmain.MainWithConfig(signals.NewContext(), "serving_operator", cfg, knativeserving.NewController)
}
7 changes: 7 additions & 0 deletions config/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,10 @@ spec:
fieldPath: metadata.namespace
- name: METRICS_DOMAIN
value: knative.dev/serving-operator
- name: CONFIG_LOGGING_NAME
value: config-logging
- name: CONFIG_OBSERVABILITY_NAME
value: config-observability
Copy link
Copy Markdown

@houshengbo houshengbo Nov 13, 2019

Choose a reason for hiding this comment

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

I do not think we need to add CONFIG_LOGGING_NAME and CONFIG_OBSERVABILITY_NAME, anymore.
By default, knative/pkg will pick config-logging and config-observability.

Copy link
Copy Markdown
Contributor Author

@jihuin jihuin Nov 13, 2019

Choose a reason for hiding this comment

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

It's true that knative/pkg will watch config-logging and config-observability configmaps by default if nothing is specified. Maybe it is meaningful to add here to let the users be aware of the purposes of these two configmaps.

Copy link
Copy Markdown
Contributor Author

@jihuin jihuin Nov 14, 2019

Choose a reason for hiding this comment

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

Though the configmap filenames are quite self-explaining, the users can not see if or where the configmaps are watched unless digging into knative/pkg

Copy link
Copy Markdown

@houshengbo houshengbo Nov 14, 2019

Choose a reason for hiding this comment

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

knative/pkg@9491151
I just had this PR merged. If config-logging and config-observability are missing, the controller should be launched without problem. With this PR, would it be fine, if config-logging and config-observability are missing??

Copy link
Copy Markdown
Member

@matzew matzew Nov 14, 2019

Choose a reason for hiding this comment

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

@jihuin again, you are correct here.

See knative/eventing@36058f4 for adding port (the CONFIG_XYZ_NAME were already in the yamls, eg:

https://github.com/knative/eventing/blob/master/config/channels/in-memory-channel/500-controller.yaml#L37-L40

Copy link
Copy Markdown
Contributor Author

@jihuin jihuin Nov 14, 2019

Choose a reason for hiding this comment

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

If the configmaps are missing and not watched, the exporter won't be set up and no metric is exported, but no information is provided in the logs. The configs here can be informative.

ports:
- name: metrics
containerPort: 9090