diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/assets/javascripts/grafana_integration | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/assets/javascripts/grafana_integration')
-rw-r--r-- | app/assets/javascripts/grafana_integration/components/grafana_integration.vue | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue index 7b029c6cf54..ab13450bb1e 100644 --- a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue +++ b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue @@ -1,6 +1,7 @@ <script> -import { GlButton, GlFormGroup, GlFormInput, GlFormCheckbox, GlIcon } from '@gitlab/ui'; +import { GlButton, GlFormGroup, GlFormInput, GlFormCheckbox, GlIcon, GlLink } from '@gitlab/ui'; import { mapState, mapActions } from 'vuex'; +import { helpPagePath } from '~/helpers/help_page_helper'; export default { components: { @@ -9,9 +10,15 @@ export default { GlFormGroup, GlFormInput, GlIcon, + GlLink, }, data() { - return { placeholderUrl: 'https://my-url.grafana.net/' }; + return { + helpUrl: helpPagePath('operations/metrics/embed_grafana', { + anchor: 'use-integration-with-grafana-api', + }), + placeholderUrl: 'https://my-grafana.example.com/', + }; }, computed: { ...mapState(['operationsSettingsEndpoint', 'grafanaToken', 'grafanaUrl', 'grafanaEnabled']), @@ -59,7 +66,12 @@ export default { </h4> <gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button> <p class="js-section-sub-header"> - {{ s__('GrafanaIntegration|Embed Grafana charts in GitLab issues.') }} + {{ + s__( + 'GrafanaIntegration|Set up Grafana authentication to embed Grafana panels in GitLab Flavored Markdown.', + ) + }} + <gl-link :href="helpUrl">{{ __('Learn more.') }}</gl-link> </p> </div> <div class="settings-content"> @@ -78,22 +90,22 @@ export default { > <gl-form-input id="grafana-url" v-model="localGrafanaUrl" :placeholder="placeholderUrl" /> </gl-form-group> - <gl-form-group :label="s__('GrafanaIntegration|API Token')" label-for="grafana-token"> + <gl-form-group :label="s__('GrafanaIntegration|API token')" label-for="grafana-token"> <gl-form-input id="grafana-token" v-model="localGrafanaToken" /> <p class="form-text text-muted"> - {{ s__('GrafanaIntegration|Enter the Grafana API Token.') }} + {{ s__('GrafanaIntegration|Enter the Grafana API token.') }} <a href="https://grafana.com/docs/http_api/auth/#create-api-token" target="_blank" rel="noopener noreferrer" > - {{ __('More information') }} + {{ __('More information.') }} <gl-icon name="external-link" class="vertical-align-middle" /> </a> </p> </gl-form-group> <gl-button variant="success" category="primary" @click="updateGrafanaIntegration"> - {{ __('Save Changes') }} + {{ __('Save changes') }} </gl-button> </form> </div> |