diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 21:23:54 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 21:23:54 +0900 |
| commit | bbdb0cf05141cdf9931e2aa673bf7a2ce5db0078 (patch) | |
| tree | cf0e3da342c5543d817484d5130bc1e69012359a /config | |
| parent | ce7b05f41d3941552320c23dc06f9f2b076099ed (diff) | |
| parent | 666ab4882f2c6d385c04afe269ddf5b11f795b19 (diff) | |
| download | gitlab-ce-bbdb0cf05141cdf9931e2aa673bf7a2ce5db0078.tar.gz | |
Merge branch 'master' into 38464-k8s-apps
Diffstat (limited to 'config')
| -rw-r--r-- | config/prometheus/additional_metrics.yml | 4 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml index 33b897f46e2..190eeb59a2c 100644 --- a/config/prometheus/additional_metrics.yml +++ b/config/prometheus/additional_metrics.yml @@ -145,7 +145,7 @@ - container_memory_usage_bytes weight: 1 queries: - - query_range: '(sum(container_memory_usage_bytes{container_name!="POD",%{environment_filter}}) / count(container_memory_usage_bytes{container_name!="POD",%{environment_filter}})) /1024/1024' + - query_range: '(sum(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"}) / count(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"})) /1024/1024' label: Average unit: MB - title: "CPU Utilization" @@ -154,7 +154,7 @@ - container_cpu_usage_seconds_total weight: 1 queries: - - query_range: 'sum(rate(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}}[2m])) by (cpu) * 100' + - query_range: 'sum(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}"}[2m])) * 100' label: CPU unit: "%" series: diff --git a/config/routes/project.rb b/config/routes/project.rb index a1e429e6c20..cb0e6078db0 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -186,6 +186,7 @@ constraints(ProjectUrlConstrainer.new) do resources :clusters, except: [:edit] do collection do get :login + get '/providers/gcp/new', action: :new_gcp end member do |