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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ae204cdb
Commit
ae204cdb
authored
Sep 17, 2020
by
Alper Akgun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable batch counting for "pipelines that have security jobs" metrics
parent
682ec79a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
ee/lib/ee/gitlab/usage_data.rb
ee/lib/ee/gitlab/usage_data.rb
+1
-3
No files found.
ee/lib/ee/gitlab/usage_data.rb
View file @
ae204cdb
...
@@ -338,7 +338,6 @@ module EE
...
@@ -338,7 +338,6 @@ module EE
# rubocop:disable CodeReuse/ActiveRecord
# rubocop:disable CodeReuse/ActiveRecord
# rubocop: disable UsageData/LargeTable
# rubocop: disable UsageData/LargeTable
# rubocop: disable UsageData/DistinctCountByLargeForeignKey
def
count_secure_jobs
(
time_period
)
def
count_secure_jobs
(
time_period
)
start
=
::
Security
::
Scan
.
minimum
(
:build_id
)
start
=
::
Security
::
Scan
.
minimum
(
:build_id
)
finish
=
::
Security
::
Scan
.
maximum
(
:build_id
)
finish
=
::
Security
::
Scan
.
maximum
(
:build_id
)
...
@@ -365,13 +364,12 @@ module EE
...
@@ -365,13 +364,12 @@ module EE
.
where
(
status:
'success'
,
retried:
[
nil
,
false
])
.
where
(
status:
'success'
,
retried:
[
nil
,
false
])
.
where
(
'security_scans.scan_type = ?'
,
scan_type
)
.
where
(
'security_scans.scan_type = ?'
,
scan_type
)
.
where
(
time_period
)
.
where
(
time_period
)
pipelines_with_secure_jobs
[
"
#{
name
}
_pipeline"
.
to_sym
]
=
distinct_count
(
relation
,
:commit_id
,
start:
start
,
finish:
finish
)
pipelines_with_secure_jobs
[
"
#{
name
}
_pipeline"
.
to_sym
]
=
distinct_count
(
relation
,
:commit_id
,
start:
start
,
finish:
finish
,
batch:
false
)
end
end
pipelines_with_secure_jobs
pipelines_with_secure_jobs
end
end
# rubocop: enable UsageData/LargeTable
# rubocop: enable UsageData/LargeTable
# rubocop: enable UsageData/DistinctCountByLargeForeignKey
def
approval_merge_request_rule_minimum_id
def
approval_merge_request_rule_minimum_id
strong_memoize
(
:approval_merge_request_rule_minimum_id
)
do
strong_memoize
(
:approval_merge_request_rule_minimum_id
)
do
...
...
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