Skip to content

fixed invalid metric name and added scrape config for inmemory channel #1747

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

Merged
knative-prow-robot merged 4 commits into from
Aug 28, 2019
Merged

fixed invalid metric name and added scrape config for inmemory channel #1747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96d090e
fixed invalid metric name and added scrape config for inmemory channel
capri-xiyue Aug 28, 2019
3a35dd1
refined formatting and delete auto-generated files
capri-xiyue Aug 28, 2019
d045f9a
added trailing newline
capri-xiyue Aug 28, 2019
407c137
removed app label and use the original label to scrape
capri-xiyue Aug 28, 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/in_memory/channel_controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
)

func main() {
sharedmain.Main("inmemorychannel-controller",
sharedmain.Main("inmemorychannel_controller",
Comment thread
capri-xiyue marked this conversation as resolved.
inmemorychannel.NewController,
)
}
2 changes: 1 addition & 1 deletion cmd/in_memory/channel_dispatcher/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
)

func main() {
sharedmain.Main("inmemorychannel-dispatcher",
sharedmain.Main("inmemorychannel_dispatcher",
inmemorychannel.NewController,
)
}
2 changes: 1 addition & 1 deletion cmd/sources_controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
)

func main() {
sharedmain.Main("source-controller",
sharedmain.Main("source_controller",
apiserversource.NewController,
containersource.NewController,
cronjobsource.NewController,
Expand Down
3 changes: 3 additions & 0 deletions config/channels/in-memory-channel/500-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
ports:
- containerPort: 9090
name: metrics
volumeMounts:
- name: config-logging
mountPath: /etc/config-logging
Expand Down
3 changes: 3 additions & 0 deletions config/channels/in-memory-channel/500-dispatcher.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
ports:
- containerPort: 9090
name: metrics
volumeMounts:
- name: config-logging
mountPath: /etc/config-logging
Expand Down
39 changes: 39 additions & 0 deletions config/monitoring/metrics/prometheus/100-prometheus-scrape-kn-eventing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,42 @@
target_label: pod
- source_labels: [__meta_kubernetes_service_name]
target_label: service

# inmemorychannel-controller
- job_name: inmemorychannel-controller
scrape_interval: 3s
scrape_timeout: 3s
kubernetes_sd_configs:
- role: pod
relabel_configs:
# Scrape only the the targets matching the following metadata
- source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_pod_label_messaging_knative_dev_role, __meta_kubernetes_pod_label_messaging_knative_dev_channel, __meta_kubernetes_pod_container_port_name]
action: keep
regex: knative-eventing;controller;in-memory-channel;metrics
# Rename metadata labels to be reader friendly
- source_labels: [__meta_kubernetes_namespace]
target_label: namespace
- source_labels: [__meta_kubernetes_pod_name]
target_label: pod
- source_labels: [__meta_kubernetes_service_name]
target_label: service

# inmemorychannel-dispatcher
- job_name: inmemorychannel-dispatcher
scrape_interval: 3s
scrape_timeout: 3s
kubernetes_sd_configs:
- role: pod
relabel_configs:
# Scrape only the the targets matching the following metadata
- source_labels: [__meta_kubernetes_namespace,__meta_kubernetes_pod_label_messaging_knative_dev_role, __meta_kubernetes_pod_label_messaging_knative_dev_channel, __meta_kubernetes_pod_container_port_name]
action: keep
regex: knative-eventing;dispatcher;in-memory-channel;metrics
# Rename metadata labels to be reader friendly
- source_labels: [__meta_kubernetes_namespace]
target_label: namespace
- source_labels: [__meta_kubernetes_pod_name]
target_label: pod
- source_labels: [__meta_kubernetes_service_name]
target_label: service