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
c0e5c785
Commit
c0e5c785
authored
Apr 22, 2019
by
syasonik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sync EE with CE
parent
a7caf914
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
ee/lib/ee/gitlab/metrics_dashboard/processor.rb
ee/lib/ee/gitlab/metrics_dashboard/processor.rb
+8
-1
ee/lib/ee/gitlab/metrics_dashboard/stages/alerts_inserter.rb
ee/lib/ee/gitlab/metrics_dashboard/stages/alerts_inserter.rb
+2
-1
No files found.
ee/lib/ee/gitlab/metrics_dashboard/processor.rb
View file @
c0e5c785
...
@@ -4,8 +4,15 @@ module EE
...
@@ -4,8 +4,15 @@ module EE
module
Gitlab
module
Gitlab
module
MetricsDashboard
module
MetricsDashboard
module
Processor
module
Processor
extend
::
Gitlab
::
Utils
::
Override
EE_SEQUENCE
=
[
Stages
::
AlertsInserter
].
freeze
override
:sequence
def
sequence
def
sequence
super
+
[
Stages
::
AlertsInserter
]
super
+
EE_SEQUENCE
end
end
end
end
end
end
...
...
ee/lib/ee/gitlab/metrics_dashboard/stages/alerts_inserter.rb
View file @
c0e5c785
...
@@ -25,8 +25,9 @@ module EE
...
@@ -25,8 +25,9 @@ module EE
alerts
=
::
Projects
::
Prometheus
::
AlertsFinder
alerts
=
::
Projects
::
Prometheus
::
AlertsFinder
.
new
(
project:
project
,
environment:
environment
)
.
new
(
project:
project
,
environment:
environment
)
.
execute
.
execute
.
pluck
(
:prometheus_metric_id
)
@metrics_with_alerts
=
Set
.
new
(
alerts
.
map
(
&
:prometheus_metric_id
)
)
@metrics_with_alerts
=
Set
.
new
(
alerts
)
end
end
def
alert_path
(
metric_id
,
project
,
environment
)
def
alert_path
(
metric_id
,
project
,
environment
)
...
...
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