Commit 1ad1bcd5 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '358285-checkbox-migration-grafana' into 'master'

Migrate generic checkbox in grafana settings

See merge request gitlab-org/gitlab!84772
parents 75cc6b3d c523be21
= form_for @application_setting, url: metrics_and_profiling_admin_application_settings_path(anchor: 'js-grafana-settings'), html: { class: 'fieldset-form' } do |f| = gitlab_ui_form_for @application_setting, url: metrics_and_profiling_admin_application_settings_path(anchor: 'js-grafana-settings'), html: { class: 'fieldset-form' } do |f|
= form_errors(@application_setting) = form_errors(@application_setting)
%fieldset %fieldset
.form-group .form-group
.form-check = f.gitlab_ui_checkbox_component :grafana_enabled,
= f.check_box :grafana_enabled, class: 'form-check-input' s_('ApplicationSettings|Add a link to Grafana'),
= f.label :grafana_enabled, class: 'form-check-label' do help_text: s_('ApplicationSettings|A Metrics Dashboard menu item appears in the Monitoring section of the Admin Area.')
= _("Add a link to Grafana")
.form-text.text-muted
= _("A Metrics Dashboard menu item appears in the Monitoring section of the Admin Area.")
.form-group .form-group
= f.label :grafana_url, _('Grafana URL'), class: 'label-bold' = f.label :grafana_url, _('Grafana URL'), class: 'label-bold'
= f.text_field :grafana_url, class: 'form-control gl-form-input', placeholder: '/-/grafana' = f.text_field :grafana_url, class: 'form-control gl-form-input', placeholder: '/-/grafana'
......
...@@ -1557,9 +1557,6 @@ msgstr "" ...@@ -1557,9 +1557,6 @@ msgstr ""
msgid "A Let's Encrypt SSL certificate can not be obtained until your domain is verified." msgid "A Let's Encrypt SSL certificate can not be obtained until your domain is verified."
msgstr "" msgstr ""
msgid "A Metrics Dashboard menu item appears in the Monitoring section of the Admin Area."
msgstr ""
msgid "A basic page and serverless function that uses AWS Lambda, AWS API Gateway, and GitLab Pages" msgid "A basic page and serverless function that uses AWS Lambda, AWS API Gateway, and GitLab Pages"
msgstr "" msgstr ""
...@@ -2127,9 +2124,6 @@ msgstr "" ...@@ -2127,9 +2124,6 @@ msgstr ""
msgid "Add a link" msgid "Add a link"
msgstr "" msgstr ""
msgid "Add a link to Grafana"
msgstr ""
msgid "Add a new issue" msgid "Add a new issue"
msgstr "" msgstr ""
...@@ -4340,6 +4334,12 @@ msgstr "" ...@@ -4340,6 +4334,12 @@ msgstr ""
msgid "Application: %{name}" msgid "Application: %{name}"
msgstr "" msgstr ""
msgid "ApplicationSettings|A Metrics Dashboard menu item appears in the Monitoring section of the Admin Area."
msgstr ""
msgid "ApplicationSettings|Add a link to Grafana"
msgstr ""
msgid "ApplicationSettings|After sign up text" msgid "ApplicationSettings|After sign up text"
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