diff --git a/cmd/in_memory/channel_controller/main.go b/cmd/in_memory/channel_controller/main.go index bbc666f5f79..66e9efac636 100644 --- a/cmd/in_memory/channel_controller/main.go +++ b/cmd/in_memory/channel_controller/main.go @@ -26,7 +26,7 @@ import ( ) func main() { - sharedmain.Main("inmemorychannel-controller", + sharedmain.Main("inmemorychannel_controller", inmemorychannel.NewController, ) } diff --git a/cmd/in_memory/channel_dispatcher/main.go b/cmd/in_memory/channel_dispatcher/main.go index f1b83eea519..bb6d8dbbb5f 100644 --- a/cmd/in_memory/channel_dispatcher/main.go +++ b/cmd/in_memory/channel_dispatcher/main.go @@ -26,7 +26,7 @@ import ( ) func main() { - sharedmain.Main("inmemorychannel-dispatcher", + sharedmain.Main("inmemorychannel_dispatcher", inmemorychannel.NewController, ) } diff --git a/cmd/sources_controller/main.go b/cmd/sources_controller/main.go index 03a5ce688cb..cabed7b5b37 100644 --- a/cmd/sources_controller/main.go +++ b/cmd/sources_controller/main.go @@ -27,7 +27,7 @@ import ( ) func main() { - sharedmain.Main("source-controller", + sharedmain.Main("source_controller", apiserversource.NewController, containersource.NewController, cronjobsource.NewController, diff --git a/config/channels/in-memory-channel/500-controller.yaml b/config/channels/in-memory-channel/500-controller.yaml index 591bca32bdd..a47a1544f9f 100644 --- a/config/channels/in-memory-channel/500-controller.yaml +++ b/config/channels/in-memory-channel/500-controller.yaml @@ -44,6 +44,9 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + ports: + - containerPort: 9090 + name: metrics volumeMounts: - name: config-logging mountPath: /etc/config-logging diff --git a/config/channels/in-memory-channel/500-dispatcher.yaml b/config/channels/in-memory-channel/500-dispatcher.yaml index 731251be20a..7e4422c9dde 100644 --- a/config/channels/in-memory-channel/500-dispatcher.yaml +++ b/config/channels/in-memory-channel/500-dispatcher.yaml @@ -44,6 +44,9 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + ports: + - containerPort: 9090 + name: metrics volumeMounts: - name: config-logging mountPath: /etc/config-logging diff --git a/config/monitoring/metrics/prometheus/100-prometheus-scrape-kn-eventing.yaml b/config/monitoring/metrics/prometheus/100-prometheus-scrape-kn-eventing.yaml index 6da335b6235..02641e717f9 100644 --- a/config/monitoring/metrics/prometheus/100-prometheus-scrape-kn-eventing.yaml +++ b/config/monitoring/metrics/prometheus/100-prometheus-scrape-kn-eventing.yaml @@ -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 +