From e01e87ae2bbf6f44728bf3d70008d342bd0c18eb Mon Sep 17 00:00:00 2001 From: shaoshu Date: Wed, 13 Nov 2019 11:01:53 +0800 Subject: [PATCH 1/3] Add default request metrics backend in config --- pkg/metrics/config.go | 5 ++++- pkg/metrics/config_test.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/metrics/config.go b/pkg/metrics/config.go index 110240717ee7..8c847060aa9c 100644 --- a/pkg/metrics/config.go +++ b/pkg/metrics/config.go @@ -24,7 +24,8 @@ import ( ) const ( - defaultLogURLTemplate = "http://localhost:8001/api/v1/namespaces/knative-monitoring/services/kibana-logging/proxy/app/kibana#/discover?_a=(query:(match:(kubernetes.labels.knative-dev%2FrevisionUID:(query:'${REVISION_UID}',type:phrase))))" + defaultLogURLTemplate = "http://localhost:8001/api/v1/namespaces/knative-monitoring/services/kibana-logging/proxy/app/kibana#/discover?_a=(query:(match:(kubernetes.labels.knative-dev%2FrevisionUID:(query:'${REVISION_UID}',type:phrase))))" + defaultRequestMetricsBackend = "prometheus" ) // ObservabilityConfig contains the configuration defined in the observability ConfigMap. @@ -79,6 +80,8 @@ func NewObservabilityConfigFromConfigMap(configMap *corev1.ConfigMap) (*Observab if mb, ok := configMap.Data["metrics.request-metrics-backend-destination"]; ok { oc.RequestMetricsBackend = mb + } else { + oc.RequestMetricsBackend = defaultRequestMetricsBackend } if prof, ok := configMap.Data["profiling.enable"]; ok { diff --git a/pkg/metrics/config_test.go b/pkg/metrics/config_test.go index 7de4469e2f3f..b5318b40bc00 100644 --- a/pkg/metrics/config_test.go +++ b/pkg/metrics/config_test.go @@ -78,7 +78,7 @@ func TestObservabilityConfiguration(t *testing.T) { EnableVarLogCollection: false, LoggingURLTemplate: defaultLogURLTemplate, RequestLogTemplate: "", - RequestMetricsBackend: "", + RequestMetricsBackend: "prometheus", }, config: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ From 69577012ad779e6328a600c46bdbe08e13bf173b Mon Sep 17 00:00:00 2001 From: shaoshu Date: Wed, 13 Nov 2019 13:20:12 +0800 Subject: [PATCH 2/3] Update description in config-observability.yaml --- config/config-observability.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config-observability.yaml b/config/config-observability.yaml index 6b002ab0d727..13a87729b7e5 100644 --- a/config/config-observability.yaml +++ b/config/config-observability.yaml @@ -89,8 +89,8 @@ data: metrics.backend-destination: prometheus # metrics.request-metrics-backend-destination specifies the request metrics - # destination. If non-empty, it enables queue proxy to send request metrics. - # Currently supported values: prometheus, stackdriver. + # destination. It enables queue proxy to send request metrics. + # Currently supported values: prometheus (the default), stackdriver. metrics.request-metrics-backend-destination: prometheus # metrics.stackdriver-project-id field specifies the stackdriver project ID. This From 9eaccee590c0a7fb4fc51e9fe31e9485e8eaeefb Mon Sep 17 00:00:00 2001 From: shaoshu Date: Wed, 13 Nov 2019 13:28:44 +0800 Subject: [PATCH 3/3] Remove trailing whitespace --- config/config-observability.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config-observability.yaml b/config/config-observability.yaml index 13a87729b7e5..4d736ed12376 100644 --- a/config/config-observability.yaml +++ b/config/config-observability.yaml @@ -89,7 +89,7 @@ data: metrics.backend-destination: prometheus # metrics.request-metrics-backend-destination specifies the request metrics - # destination. It enables queue proxy to send request metrics. + # destination. It enables queue proxy to send request metrics. # Currently supported values: prometheus (the default), stackdriver. metrics.request-metrics-backend-destination: prometheus