Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
bafe3a6d
Commit
bafe3a6d
authored
Sep 06, 2018
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix common_metrics.yml
parent
1d0f0cc0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
config/prometheus/common_metrics.yml
config/prometheus/common_metrics.yml
+1
-0
spec/db/importers/common_metrics_importer_spec.rb
spec/db/importers/common_metrics_importer_spec.rb
+1
-1
No files found.
config/prometheus/common_metrics.yml
View file @
bafe3a6d
...
@@ -207,6 +207,7 @@
...
@@ -207,6 +207,7 @@
required_metrics
:
required_metrics
:
-
container_cpu_usage_seconds_total
-
container_cpu_usage_seconds_total
weight
:
1
weight
:
1
queries
:
-
id
:
system_metrics_kubernetes_container_core_usage_canary
-
id
:
system_metrics_kubernetes_container_core_usage_canary
query_range
:
'
avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m]))
by
(job))
without
(job)
/
count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m]))
by
(pod_name))'
query_range
:
'
avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m]))
by
(job))
without
(job)
/
count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m]))
by
(pod_name))'
label
:
Pod average
label
:
Pod average
...
...
spec/db/importers/common_metrics_importer_spec.rb
View file @
bafe3a6d
...
@@ -43,7 +43,7 @@ describe Importers::CommonMetricsImporter do
...
@@ -43,7 +43,7 @@ describe Importers::CommonMetricsImporter do
end
end
it
"imports all IDs"
do
it
"imports all IDs"
do
expect
(
PrometheusMetric
.
common
.
pluck
(
:identifier
)).
to
eq
(
query_ids
)
expect
(
PrometheusMetric
.
common
.
pluck
(
:identifier
)).
to
contain_exactly
(
*
query_ids
)
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment