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
Tatuya Kamada
gitlab-ce
Commits
8e983d33
Commit
8e983d33
authored
Dec 31, 2015
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'reduce-influxdb-tags' into 'master'
See merge request !2252
parents
7945cf41
c936e4e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
lib/gitlab/metrics/metric.rb
lib/gitlab/metrics/metric.rb
+2
-5
spec/lib/gitlab/metrics/metric_spec.rb
spec/lib/gitlab/metrics/metric_spec.rb
+0
-3
No files found.
lib/gitlab/metrics/metric.rb
View file @
8e983d33
...
...
@@ -19,11 +19,8 @@ module Gitlab
{
series:
@series
,
tags:
@tags
.
merge
(
hostname:
Metrics
.
hostname
,
ruby_engine:
RUBY_ENGINE
,
ruby_version:
RUBY_VERSION
,
gitlab_version:
Gitlab
::
VERSION
,
process_type:
Sidekiq
.
server?
?
'sidekiq'
:
'rails'
hostname:
Metrics
.
hostname
,
process_type:
Sidekiq
.
server?
?
'sidekiq'
:
'rails'
),
values:
@values
,
timestamp:
@created_at
.
to_i
*
1_000_000_000
...
...
spec/lib/gitlab/metrics/metric_spec.rb
View file @
8e983d33
...
...
@@ -39,9 +39,6 @@ describe Gitlab::Metrics::Metric do
expect
(
hash
[
:tags
]).
to
be_an_instance_of
(
Hash
)
expect
(
hash
[
:tags
][
:hostname
]).
to
be_an_instance_of
(
String
)
expect
(
hash
[
:tags
][
:ruby_engine
]).
to
be_an_instance_of
(
String
)
expect
(
hash
[
:tags
][
:ruby_version
]).
to
be_an_instance_of
(
String
)
expect
(
hash
[
:tags
][
:gitlab_version
]).
to
be_an_instance_of
(
String
)
expect
(
hash
[
:tags
][
:process_type
]).
to
be_an_instance_of
(
String
)
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