Commit 5d2e0323 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'vue-i18n-js-monitoring-directory' into 'master'

Vue-i18n: autofix for app/assets/javascripts/monitoring directory

See merge request gitlab-org/gitlab-ce!29971
parents f904971e 9599f7cd
<script> <script>
import { __ } from '~/locale';
import { GlAreaChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts'; import { GlAreaChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts';
import dateFormat from 'dateformat'; import dateFormat from 'dateformat';
import { debounceByAnimationFrame, roundOffFloat } from '~/lib/utils/common_utils'; import { debounceByAnimationFrame, roundOffFloat } from '~/lib/utils/common_utils';
...@@ -99,7 +100,7 @@ export default { ...@@ -99,7 +100,7 @@ export default {
chartOptions() { chartOptions() {
return { return {
xAxis: { xAxis: {
name: 'Time', name: __('Time'),
type: 'time', type: 'time',
axisLabel: { axisLabel: {
formatter: date => dateFormat(date, 'h:MM TT'), formatter: date => dateFormat(date, 'h:MM TT'),
......
<script> <script>
import { __ } from '~/locale';
export default { export default {
props: { props: {
documentationPath: { documentationPath: {
...@@ -41,35 +43,35 @@ export default { ...@@ -41,35 +43,35 @@ export default {
states: { states: {
gettingStarted: { gettingStarted: {
svgUrl: this.emptyGettingStartedSvgPath, svgUrl: this.emptyGettingStartedSvgPath,
title: 'Get started with performance monitoring', title: __('Get started with performance monitoring'),
description: `Stay updated about the performance and health description: __(`Stay updated about the performance and health
of your environment by configuring Prometheus to monitor your deployments.`, of your environment by configuring Prometheus to monitor your deployments.`),
buttonText: 'Install on clusters', buttonText: __('Install on clusters'),
buttonPath: this.clustersPath, buttonPath: this.clustersPath,
secondaryButtonText: 'Configure existing installation', secondaryButtonText: __('Configure existing installation'),
secondaryButtonPath: this.settingsPath, secondaryButtonPath: this.settingsPath,
}, },
loading: { loading: {
svgUrl: this.emptyLoadingSvgPath, svgUrl: this.emptyLoadingSvgPath,
title: 'Waiting for performance data', title: __('Waiting for performance data'),
description: `Creating graphs uses the data from the Prometheus server. description: __(`Creating graphs uses the data from the Prometheus server.
If this takes a long time, ensure that data is available.`, If this takes a long time, ensure that data is available.`),
buttonText: 'View documentation', buttonText: __('View documentation'),
buttonPath: this.documentationPath, buttonPath: this.documentationPath,
}, },
noData: { noData: {
svgUrl: this.emptyNoDataSvgPath, svgUrl: this.emptyNoDataSvgPath,
title: 'No data found', title: __('No data found'),
description: `You are connected to the Prometheus server, but there is currently description: __(`You are connected to the Prometheus server, but there is currently
no data to display.`, no data to display.`),
buttonText: 'Configure Prometheus', buttonText: __('Configure Prometheus'),
buttonPath: this.settingsPath, buttonPath: this.settingsPath,
}, },
unableToConnect: { unableToConnect: {
svgUrl: this.emptyUnableToConnectSvgPath, svgUrl: this.emptyUnableToConnectSvgPath,
title: 'Unable to connect to Prometheus server', title: __('Unable to connect to Prometheus server'),
description: 'Ensure connectivity is available from the GitLab server to the ', description: 'Ensure connectivity is available from the GitLab server to the ',
buttonText: 'View documentation', buttonText: __('View documentation'),
buttonPath: this.documentationPath, buttonPath: this.documentationPath,
}, },
}, },
...@@ -90,7 +92,9 @@ export default { ...@@ -90,7 +92,9 @@ export default {
<template> <template>
<div class="row empty-state js-empty-state"> <div class="row empty-state js-empty-state">
<div class="col-12"> <div class="col-12">
<div class="state-svg svg-content"><img :src="currentState.svgUrl" /></div> <div class="state-svg svg-content">
<img :src="currentState.svgUrl" />
</div>
</div> </div>
<div class="col-12"> <div class="col-12">
...@@ -98,20 +102,22 @@ export default { ...@@ -98,20 +102,22 @@ export default {
<h4 class="state-title text-center">{{ currentState.title }}</h4> <h4 class="state-title text-center">{{ currentState.title }}</h4>
<p class="state-description"> <p class="state-description">
{{ currentState.description }} {{ currentState.description }}
<a v-if="showButtonDescription" :href="settingsPath"> Prometheus server </a> <a v-if="showButtonDescription" :href="settingsPath">{{ __('Prometheus server') }}</a>
</p> </p>
<div class="text-center"> <div class="text-center">
<a v-if="currentState.buttonPath" :href="currentState.buttonPath" class="btn btn-success"> <a
{{ currentState.buttonText }} v-if="currentState.buttonPath"
</a> :href="currentState.buttonPath"
class="btn btn-success"
>{{ currentState.buttonText }}</a
>
<a <a
v-if="currentState.secondaryButtonPath" v-if="currentState.secondaryButtonPath"
:href="currentState.secondaryButtonPath" :href="currentState.secondaryButtonPath"
class="btn" class="btn"
>{{ currentState.secondaryButtonText }}</a
> >
{{ currentState.secondaryButtonText }}
</a>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -2789,9 +2789,15 @@ msgstr "" ...@@ -2789,9 +2789,15 @@ msgstr ""
msgid "Configure Let's Encrypt" msgid "Configure Let's Encrypt"
msgstr "" msgstr ""
msgid "Configure Prometheus"
msgstr ""
msgid "Configure automatic git checks and housekeeping on repositories." msgid "Configure automatic git checks and housekeeping on repositories."
msgstr "" msgstr ""
msgid "Configure existing installation"
msgstr ""
msgid "Configure limits for web and API requests." msgid "Configure limits for web and API requests."
msgstr "" msgstr ""
...@@ -3146,6 +3152,9 @@ msgstr "" ...@@ -3146,6 +3152,9 @@ msgstr ""
msgid "Creates branch '%{branch_name}' and a merge request to resolve this issue" msgid "Creates branch '%{branch_name}' and a merge request to resolve this issue"
msgstr "" msgstr ""
msgid "Creating graphs uses the data from the Prometheus server. If this takes a long time, ensure that data is available."
msgstr ""
msgid "Cron Timezone" msgid "Cron Timezone"
msgstr "" msgstr ""
...@@ -4656,6 +4665,9 @@ msgstr "" ...@@ -4656,6 +4665,9 @@ msgstr ""
msgid "Get started with error tracking" msgid "Get started with error tracking"
msgstr "" msgstr ""
msgid "Get started with performance monitoring"
msgstr ""
msgid "Getting started with releases" msgid "Getting started with releases"
msgstr "" msgstr ""
...@@ -5333,6 +5345,9 @@ msgstr "" ...@@ -5333,6 +5345,9 @@ msgstr ""
msgid "Install a soft token authenticator like %{free_otp_link} or Google Authenticator from your application repository and scan this QR code. More information is available in the %{help_link_start}documentation%{help_link_end}." msgid "Install a soft token authenticator like %{free_otp_link} or Google Authenticator from your application repository and scan this QR code. More information is available in the %{help_link_start}documentation%{help_link_end}."
msgstr "" msgstr ""
msgid "Install on clusters"
msgstr ""
msgid "Installed" msgid "Installed"
msgstr "" msgstr ""
...@@ -6584,6 +6599,9 @@ msgstr "" ...@@ -6584,6 +6599,9 @@ msgstr ""
msgid "No contributions were found" msgid "No contributions were found"
msgstr "" msgstr ""
msgid "No data found"
msgstr ""
msgid "No details available" msgid "No details available"
msgstr "" msgstr ""
...@@ -8071,6 +8089,9 @@ msgstr "" ...@@ -8071,6 +8089,9 @@ msgstr ""
msgid "ProjectsDropdown|This feature requires browser localStorage support" msgid "ProjectsDropdown|This feature requires browser localStorage support"
msgstr "" msgstr ""
msgid "Prometheus server"
msgstr ""
msgid "PrometheusService|%{exporters} with %{metrics} were found" msgid "PrometheusService|%{exporters} with %{metrics} were found"
msgstr "" msgstr ""
...@@ -9592,6 +9613,9 @@ msgstr "" ...@@ -9592,6 +9613,9 @@ msgstr ""
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
msgid "Stay updated about the performance and health of your environment by configuring Prometheus to monitor your deployments."
msgstr ""
msgid "Stop environment" msgid "Stop environment"
msgstr "" msgstr ""
...@@ -10503,6 +10527,9 @@ msgstr "" ...@@ -10503,6 +10527,9 @@ msgstr ""
msgid "Thursday" msgid "Thursday"
msgstr "" msgstr ""
msgid "Time"
msgstr ""
msgid "Time based: Yes" msgid "Time based: Yes"
msgstr "" msgstr ""
...@@ -10948,6 +10975,9 @@ msgstr "" ...@@ -10948,6 +10975,9 @@ msgstr ""
msgid "U2F only works with HTTPS-enabled websites. Contact your administrator for more details." msgid "U2F only works with HTTPS-enabled websites. Contact your administrator for more details."
msgstr "" msgstr ""
msgid "Unable to connect to Prometheus server"
msgstr ""
msgid "Unable to connect to server: %{error}" msgid "Unable to connect to server: %{error}"
msgstr "" msgstr ""
...@@ -11353,6 +11383,9 @@ msgstr "" ...@@ -11353,6 +11383,9 @@ msgstr ""
msgid "View details: %{details_url}" msgid "View details: %{details_url}"
msgstr "" msgstr ""
msgid "View documentation"
msgstr ""
msgid "View file @ " msgid "View file @ "
msgstr "" msgstr ""
...@@ -11428,6 +11461,9 @@ msgstr "" ...@@ -11428,6 +11461,9 @@ msgstr ""
msgid "Wait for the source to load to copy it to the clipboard" msgid "Wait for the source to load to copy it to the clipboard"
msgstr "" msgstr ""
msgid "Waiting for performance data"
msgstr ""
msgid "Want to see the data? Please ask an administrator for access." msgid "Want to see the data? Please ask an administrator for access."
msgstr "" msgstr ""
...@@ -11685,6 +11721,9 @@ msgstr "" ...@@ -11685,6 +11721,9 @@ msgstr ""
msgid "You are attempting to update a file that has changed since you started editing it." msgid "You are attempting to update a file that has changed since you started editing it."
msgstr "" msgstr ""
msgid "You are connected to the Prometheus server, but there is currently no data to display."
msgstr ""
msgid "You are going to remove %{group_name}, this will also remove all of its subgroups and projects. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?" msgid "You are going to remove %{group_name}, this will also remove all of its subgroups and projects. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment