diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/assets/javascripts/monitoring/components/dashboard.vue | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
download | gitlab-ce-a7b3560714b4d9cc4ab32dffcd1f74a284b93580.tar.gz |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/monitoring/components/dashboard.vue')
-rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 51 |
1 files changed, 49 insertions, 2 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index c9767330b73..6467d953500 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -1,5 +1,13 @@ <script> -import { GlButton, GlModalDirective, GlTooltipDirective, GlIcon } from '@gitlab/ui'; +import { + GlButton, + GlModalDirective, + GlTooltipDirective, + GlIcon, + GlAlert, + GlSprintf, + GlLink, +} from '@gitlab/ui'; import Mousetrap from 'mousetrap'; import VueDraggable from 'vuedraggable'; import { mapActions, mapState, mapGetters } from 'vuex'; @@ -38,6 +46,9 @@ export default { GroupEmptyState, VariablesSection, LinksSection, + GlAlert, + GlSprintf, + GlLink, }, directives: { GlModal: GlModalDirective, @@ -143,6 +154,7 @@ export default { isRearrangingPanels: false, originalDocumentTitle: document.title, hoveredPanel: '', + isDeprecationNoticeDismissed: false, }; }, computed: { @@ -392,9 +404,44 @@ export default { }, }; </script> - <template> <div class="prometheus-graphs" data-qa-selector="prometheus_graphs"> + <div> + <gl-alert + v-if="!isDeprecationNoticeDismissed" + :title="__('Feature deprecation and removal')" + class="mb-3" + variant="danger" + @dismiss="isDeprecationNoticeDismissed = true" + > + <gl-sprintf + :message=" + s__( + 'Deprecations|The metrics, logs and tracing features were deprecated in GitLab 14.7 and are %{epicStart} scheduled for removal %{epicEnd} in GitLab 15.0.', + ) + " + > + <template #epic="{ content }"> + <gl-link href="https://gitlab.com/groups/gitlab-org/-/epics/7188" target="_blank">{{ + content + }}</gl-link> + </template> + </gl-sprintf> + <gl-sprintf + :message=" + s__( + 'Deprecations|For information on a possible replacement %{epicStart} learn more about Opstrace %{epicEnd}.', + ) + " + > + <template #epic="{ content }"> + <gl-link href="https://gitlab.com/groups/gitlab-org/-/epics/6976" target="_blank">{{ + content + }}</gl-link> + </template> + </gl-sprintf> + </gl-alert> + </div> <dashboard-header v-if="showHeader" ref="prometheusGraphsHeader" |