diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 09:06:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 09:06:08 +0000 |
| commit | c157f963db87a40a3ba7b94b339530ee83194bc8 (patch) | |
| tree | 9f8f9468daf727cce39bc7487af8bd9a53b8c59d /config | |
| parent | bd1e1afde56a9bd97e03ca24298e260dc071999e (diff) | |
| download | gitlab-ce-c157f963db87a40a3ba7b94b339530ee83194bc8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/knative/api_resources.yml | 8 | ||||
| -rw-r--r-- | config/prometheus/common_metrics.yml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/config/knative/api_resources.yml b/config/knative/api_resources.yml index 43427b730db..095f44ed799 100644 --- a/config/knative/api_resources.yml +++ b/config/knative/api_resources.yml @@ -61,4 +61,10 @@ - virtualservices.networking.istio.io - rbacconfigs.rbac.istio.io - servicerolebindings.rbac.istio.io -- serviceroles.rbac.istio.io
\ No newline at end of file +- serviceroles.rbac.istio.io +- cloudwatches.config.istio.io +- clusterrbacconfigs.rbac.istio.io +- dogstatsds.config.istio.io +- ingresses.networking.internal.knative.dev +- sidecars.networking.istio.io +- zipkins.config.istio.io diff --git a/config/prometheus/common_metrics.yml b/config/prometheus/common_metrics.yml index 08504d6f7d5..795243fab49 100644 --- a/config/prometheus/common_metrics.yml +++ b/config/prometheus/common_metrics.yml @@ -209,6 +209,6 @@ panel_groups: weight: 1 metrics: - id: system_metrics_knative_function_invocation_count - query_range: 'floor(sum(rate(istio_revision_request_count{destination_configuration="%{function_name}", destination_namespace="%{kube_namespace}"}[1m])/3))' + query_range: 'sum(ceil(rate(istio_requests_total{destination_service_namespace="%{kube_namespace}", destination_app=~"%{function_name}.*"}[1m])*60))' label: invocations / minute unit: requests |