Merge branch '52421-show-canary-no-canary-in-the-performance-bar' into 'master'
Resolve "Show canary / no-canary in the performance bar" Closes #52421 See merge request gitlab-org/gitlab-ce!22222
This commit is contained in:
commit
05dd7f9718
|
@ -1,5 +1,6 @@
|
|||
<script>
|
||||
import $ from 'jquery';
|
||||
import { glEmojiTag } from '~/emoji';
|
||||
|
||||
import detailedMetric from './detailed_metric.vue';
|
||||
import requestSelector from './request_selector.vue';
|
||||
|
@ -64,6 +65,16 @@ export default {
|
|||
lineProfileModal() {
|
||||
return $('#modal-peek-line-profile');
|
||||
},
|
||||
hasHost() {
|
||||
return this.currentRequest && this.currentRequest.details && this.currentRequest.details.host;
|
||||
},
|
||||
birdEmoji() {
|
||||
if (this.hasHost && this.currentRequest.details.host.canary) {
|
||||
return glEmojiTag('baby_chick');
|
||||
}
|
||||
|
||||
return '';
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.currentRequest = this.requestId;
|
||||
|
@ -93,9 +104,11 @@ export default {
|
|||
class="view"
|
||||
>
|
||||
<span
|
||||
v-if="currentRequest.details"
|
||||
v-if="hasHost"
|
||||
class="current-host"
|
||||
:class="{ 'canary' : currentRequest.details.host.canary }"
|
||||
>
|
||||
<span v-html="birdEmoji"></span>
|
||||
{{ currentRequest.details.host.hostname }}
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
@ -605,6 +605,7 @@ $perf-bar-development: #4c1210;
|
|||
$perf-bar-bucket-bg: #111;
|
||||
$perf-bar-bucket-box-shadow-from: rgba($white-light, 0.2);
|
||||
$perf-bar-bucket-box-shadow-to: rgba($black, 0.25);
|
||||
$perf-bar-canary-text: $orange-400;
|
||||
|
||||
/*
|
||||
Issuable warning
|
||||
|
|
|
@ -68,6 +68,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
.current-host.canary {
|
||||
color: $perf-bar-canary-text;
|
||||
}
|
||||
|
||||
strong {
|
||||
color: $white-light;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Show canary status in the performance bar
|
||||
merge_request: 22222
|
||||
author:
|
||||
type: changed
|
|
@ -4,7 +4,10 @@ module Peek
|
|||
module Views
|
||||
class Host < View
|
||||
def results
|
||||
{ hostname: Gitlab::Environment.hostname }
|
||||
{
|
||||
hostname: Gitlab::Environment.hostname,
|
||||
canary: Gitlab::Utils.to_boolean(ENV['CANARY'])
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue