diff --git a/public/app/features/profile/UserProfileEditForm.tsx b/public/app/features/profile/UserProfileEditForm.tsx
index 0c788577731..586bdffc491 100644
--- a/public/app/features/profile/UserProfileEditForm.tsx
+++ b/public/app/features/profile/UserProfileEditForm.tsx
@@ -94,7 +94,12 @@ export default UserProfileEditForm;
const InputSuffix = () => {
return disableLoginForm ? (
-
+
) : null;
diff --git a/public/app/features/serviceaccounts/components/ServiceAccountTokensTable.tsx b/public/app/features/serviceaccounts/components/ServiceAccountTokensTable.tsx
index 18cc5c21d80..db9abbfad6f 100644
--- a/public/app/features/serviceaccounts/components/ServiceAccountTokensTable.tsx
+++ b/public/app/features/serviceaccounts/components/ServiceAccountTokensTable.tsx
@@ -93,7 +93,12 @@ const TokenRevoked = () => {
Revoked
-
+
@@ -127,7 +132,9 @@ const TokenExpiration = ({ timeZone, token }: TokenExpirationProps) => {
Expired
-
+
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 0d1291a7644..483ba0d2b9c 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -21,7 +21,9 @@
"permission-list-item": {
"inherited": "Inherited from folder",
"locked-aria-label": "Locked permission indicator",
- "remove-aria-label": "Remove permission for {{identifier}}"
+ "remove-aria-label": "Remove permission for {{identifier}}",
+ "tooltip-inherited-permission": "Inherited permission",
+ "tooltip-provisioned-permission": "Provisioned permission"
},
"permissions": {
"add-label": "Add a permission",
@@ -70,6 +72,7 @@
"confirm-modal-body-2": "We advise understanding the implications of each feature change before making modifications.",
"get-stage-cell": {
"beta": "Beta",
+ "content-general-availability": "General availability",
"deprecated": "Deprecated",
"ga": "GA"
},
@@ -128,6 +131,12 @@
"test-mapping-heading": "Test user mapping",
"test-mapping-run-button": "Run"
},
+ "ldap-connection-status": {
+ "columns": {
+ "content-connection-is-available": "Connection is available",
+ "content-connection-is-not-available": "Connection is not available"
+ }
+ },
"ldap-error-box": {
"title-connection-error": "Connection error"
},
@@ -161,6 +170,9 @@
"title": "LDAP Synchronization"
},
"ldap-user-groups": {
+ "columns": {
+ "content-no-matching-organizations-found": "No matching organizations found"
+ },
"no-org-found": "No match"
},
"ldap-user-info": {
@@ -284,12 +296,14 @@
},
"users-table": {
"columns": {
+ "content-grafana-admin": "Grafana Admin",
"title-edit-user": "Edit user"
},
"edit-aria-label": "Edit user: {{name}}",
"edit-tooltip": "Edit user",
"last-seen-never": "Never",
- "no-licensed-roles": "Not assigned"
+ "no-licensed-roles": "Not assigned",
+ "tooltip-assigned-role": "A licensed role will be assigned when this user signs in"
}
},
"alert-labels": {
@@ -442,6 +456,7 @@
"unprocessed-the-alert-is-received": "Unprocessed: The alert is received but its notification has not been processed yet."
},
"alert-state-tag": {
+ "content-alert-evaluation-is-currently-paused": "Alert evaluation is currently paused",
"paused": "Paused"
},
"alert-warning": {
@@ -538,6 +553,9 @@
"warning-restore-manually": "You are manually restoring an old version of this alert rule. Please review the changes carefully before saving the rule definition.",
"warning-restore-manually-title": "Restoring rule manually"
},
+ "all-matches-indicator": {
+ "content-this-policy-matches-all-labels": "This policy matches all labels"
+ },
"am-root-route-form": {
"am-group-description-label": "The waiting time before sending the first notification for a new group of alerts. Default 30 seconds.",
"am-group-interval-description": "The wait time before sending a notification about changes in the alert group after the first notification has been sent. Default is 5 minutes.",
@@ -650,6 +668,9 @@
"of": "OF",
"when": "WHEN"
},
+ "clear-filter-button-object-renderer": {
+ "content-clear-filter": "Clear filter"
+ },
"clone-rule-button": {
"title-copy": "Copy"
},
@@ -776,6 +797,9 @@
"contactPointFilter": {
"label": "Contact point"
},
+ "continue-matching-indicator": {
+ "content-route-continue-matching-other-policies": "This route will continue matching other policies"
+ },
"copy-to-clipboard": "Copy \"{{label}}\" to clipboard",
"create-metadata": {
"view-dashboard": "View dashboard",
@@ -804,6 +828,10 @@
"current-selection-dashboard": "Dashboard: {{dashboardTitle}} ({{ dashboardUid }}) in folder {{ folderTitle }}",
"current-selection-panel": "Panel: {{ panelTitle }} ({{ panelId }})",
"fallback-dashboards-string": "Dashboards",
+ "panel-row": {
+ "content-panel-valid-identifier": "This panel does not have a valid identifier.",
+ "tooltip-alert-tab-support": "The alert tab and alert annotations are only supported on graph and timeseries panels."
+ },
"placeholder-search-dashboard": "Search dashboard",
"placeholder-search-panel": "Search panel",
"select-dashboard-available-panels": "Select a dashboard to get a list of available panels",
@@ -825,9 +853,11 @@
"update-datasource": "Update datasource"
},
"declare-incident-button": {
+ "content-grafana-incident-installed-configured-correctly": "Grafana Incident is not installed or is not configured correctly",
"declare-incident": "Declare Incident"
},
"declare-incident-menu-item": {
+ "content-grafana-incident-installed-configured-correctly": "Grafana Incident is not installed or is not configured correctly",
"label-declare-incident": "Declare incident"
},
"delete-rule-modal": {
@@ -863,6 +893,9 @@
},
"unknown": "Unknown"
},
+ "disabled-tooltip": {
+ "content-appear-compatible-datasources": "You do not appear to have any compatible datasources."
+ },
"draggable-rules-table": {
"evals-to-start-alerting": "Evaluations to start alerting",
"pending-period": "Pending period",
@@ -903,6 +936,9 @@
"failed-to-update-your-configuration": "Failed to update your configuration:",
"title-something-went-wrong": "Something went wrong"
},
+ "error-summary-button": {
+ "content-show-all-errors": "Show all errors"
+ },
"evaluation-behavior-summary": {
"evaluate": "Every {{interval}}",
"label-evaluate": "Evaluate",
@@ -1183,6 +1219,9 @@
"group-loader": {
"group-load-failed": "Failed to load rules from group {{ groupName }} in {{ namespaceName }}"
},
+ "group-status": {
+ "content-the-group-is-being-deleted": "The group is being deleted"
+ },
"header": {
"tooltip-remove": "Remove expression \"{{refId}}\""
},
@@ -1352,7 +1391,8 @@
"common-labels": "Common labels",
"error-unable-to-fetch": "Unable to fetch alert state history",
"loading": "Loading...",
- "title-error-fetching-the-state-history": "Error fetching the state history"
+ "title-error-fetching-the-state-history": "Error fetching the state history",
+ "tooltip-common-labels": "Common labels are the ones attached to all of the alert instances"
},
"manage-permissions": {
"button": "Manage permissions",
@@ -1445,6 +1485,7 @@
},
"mute-timing-time-range": {
"add-another-time-range": "Add another time range",
+ "content-this-time-interval-is-disabled": "This time interval is disabled",
"description-time-range": "The time inclusive of the start and exclusive of the end time (in UTC if no location has been selected, otherwise local time)",
"label-end-time": "End time",
"label-start-time": "Start time",
@@ -1600,6 +1641,9 @@
"plugin-integrations": {
"tailored-apps": "Speed up your alerts creation now by using one of our tailored apps"
},
+ "plugin-origin-badge": {
+ "tooltip-managed-by-plugin": "This rule is managed by the {{pluginName}} plugin"
+ },
"policies": {
"aria-label-collapse": "Collapse",
"aria-label-expand": "Expand",
@@ -1699,6 +1743,9 @@
"prometheus-consistency-check": {
"title-unable-to-check-the-rule-status": "Unable to check the rule status"
},
+ "provisioned-tooltip": {
+ "content-provisioned-items-cannot-edited": "Provisioned items cannot be edited in the UI"
+ },
"provisioning": {
"badge-tooltip-provenance": "This resource has been provisioned via {{provenance}} and cannot be edited through the UI",
"badge-tooltip-standard": "This resource has been provisioned and cannot be edited through the UI",
@@ -2041,7 +2088,10 @@
"for": "for {{duration}}",
"na": "n/a",
"paused": "Paused",
- "recording-rule": "Recording rule"
+ "recording-rule": "Recording rule",
+ "recording-rule-state": {
+ "content-recording-rule-evaluation-is-currently-paused": "Recording rule evaluation is currently paused"
+ }
},
"rule-stats": {
"error_one": "{{count}} error",
@@ -2285,6 +2335,8 @@
"refresh": "Refresh"
},
"template-row": {
+ "content-templatefiles": "template_files",
+ "content-templates": "templates",
"tooltip-copy-template-group": "Copy template group",
"tooltip-delete-template-group": "Delete template group",
"tooltip-edit-template-group": "Edit template group",
@@ -2308,7 +2360,7 @@
},
"misconfigured-badge-text": "Misconfigured",
"misconfigured-warning": "This template is misconfigured.",
- "misconfigured-warning-details": "Templates must be defined in both the <1>1> and <4>4> sections of your alertmanager configuration."
+ "misconfigured-warning-details": "Templates must be defined in both the <2>2> and <5>5> sections of your alertmanager configuration."
},
"templates-picker": {
"button-edit": "Edit {{name}}",
@@ -2457,6 +2509,7 @@
},
"api-keys-table": {
"aria-label-delete-api-key": "Delete API key",
+ "content-this-api-key-has-expired": "This API key has expired.",
"expires": "Expires",
"last-used-at": "Last used at",
"migrate-to-service-account": "Migrate to service account",
@@ -4161,7 +4214,9 @@
},
"variable-check-indicator": {
"aria-label-variable-referenced-dashboard": "This variable is not referenced by any variable or dashboard.",
- "aria-label-variable-referenced-other-variables-dashboard": "This variable is referenced by other variables or dashboard."
+ "aria-label-variable-referenced-other-variables-dashboard": "This variable is referenced by other variables or dashboard.",
+ "content-variable-not-referenced-other-variables-dashboard": "This variable is not referenced by other variables or dashboard.",
+ "content-variable-referenced-other-variables-dashboard": "This variable is referenced by other variables or dashboard."
},
"variable-editor-form": {
"aria-label-variable-editor-form": "Variable editor form",
@@ -4221,6 +4276,7 @@
},
"versions-history-buttons": {
"compare-versions": "Compare versions",
+ "content-select-two-versions-to-start-comparing": "Select two versions to start comparing",
"show-more-versions": "Show more versions"
},
"visualization-button": {
@@ -4574,6 +4630,7 @@
}
},
"correlation-editor-mode-bar": {
+ "content-correlations-editor-explore-experimental-feature": "Correlations editor in Explore is an experimental feature.",
"exit-correlation-editor": "Exit correlation editor",
"save": "Save"
},
@@ -4731,6 +4788,9 @@
"label-select-query": "Select query",
"tooltip-select-query-visualize-table": "Select a query to visualize in the table"
},
+ "logs-volume-panel": {
+ "content-streaming": "Streaming"
+ },
"logs-volume-panel-list": {
"label-reload-log-volume": "Reload log volume",
"loading": "Loading...",
@@ -4930,6 +4990,7 @@
"label-tags": "Tags",
"placeholder-all-service-names": "All service names",
"placeholder-all-span-names": "All span names",
+ "tooltip-collapse": "Filter your spans below. You can continue to apply filters until you have narrowed down your resulting spans to the select few you are most interested in.",
"tooltip-duration": "Filter by duration. Accepted units are {{units}}",
"tooltip-tags": "Filter by tags, process tags or log fields in your spans."
},
@@ -5008,7 +5069,8 @@
"label-show-paths": "Show critical path only switch"
},
"trace-view": {
- "no-data": "No data"
+ "no-data": "No data",
+ "tooltip-copy-icon": "Copied"
},
"trace-view-container": {
"title-trace": "Trace"
@@ -5122,7 +5184,8 @@
"default-password-alert": "Continuing to use the default password exposes you to security risks.",
"new-password-label": "New password",
"skip-button": "Skip",
- "submit-button": "Submit"
+ "submit-button": "Submit",
+ "tooltip-skip-button": "If you skip you will be prompted to change password next time you log in."
},
"contact-admin": "Did you forget your username or email? Contact your Grafana administrator.",
"email-sent": "An email with a reset link has been sent to the email address. You should receive it shortly.",
@@ -5386,7 +5449,11 @@
"previous-page": "previous page"
},
"panel-chrome": {
- "aria-label-toggle-collapse": "toggle collapse panel"
+ "aria-label-toggle-collapse": "toggle collapse panel",
+ "tooltip-cancel": "Cancel query",
+ "tooltip-cancel-loading": "Cancel query",
+ "tooltip-stop-streaming": "Stop streaming",
+ "tooltip-streaming": "Streaming"
},
"panel-menu": {
"label": "Menu for panel {{ title }}",
@@ -5968,7 +6035,8 @@
"log-row-message": {
"ellipsis": "… ",
"more": "more",
- "see-details": "See log details"
+ "see-details": "See log details",
+ "tooltip-error": "Error: {{errorMessage}}"
},
"log-rows": {
"disable-popover": {
@@ -6945,7 +7013,8 @@
"label-search": "Search",
"label-state": "State",
"label-type": "Type",
- "subtitle": "Extend the Grafana experience with panel plugins and apps. To find more data sources go to <2>Connections2>."
+ "subtitle": "Extend the Grafana experience with panel plugins and apps. To find more data sources go to <2>Connections2>.",
+ "tooltip-filter-disabled": "This filter has been disabled because the Grafana server cannot access grafana.com"
},
"catalog": {
"no-updates-available": "No updates available",
@@ -6954,7 +7023,7 @@
"available-header": "Available",
"button": "Update all ({{length}})",
"cloud-update-message": "* It may take a few minutes for the plugins to be available for usage.",
- "error": "Error updating plugin:",
+ "error": "Error updating plugin: {{errorMessage}}",
"error-status-text": "failed - see error messages",
"header": "The following plugins have update available",
"installed-header": "Installed",
@@ -7164,6 +7233,9 @@
"feature-toggles-age": {
"enable-in-config": "Enable profile in the Grafana config file."
},
+ "input-suffix": {
+ "content-login-details-locked-because-managed-another": "Login details locked because they are managed in another system."
+ },
"user-organizations": {
"text-loading-organizations": "Loading organizations..."
},
@@ -8097,10 +8169,12 @@
"title-disable-service-account": "Disable service account"
},
"token-expiration": {
+ "content-this-token-has-expired": "This token has expired",
"expired-label": "Expired",
"never": "Never"
},
"token-revoked": {
+ "content-token-publicly-exposed-please-rotate": "This token has been publicly exposed. Please rotate this token",
"revoked-label": "Revoked"
}
},
@@ -8506,7 +8580,7 @@
"range-content": {
"apply-button": "Apply time range",
"default-error": "Please enter a past date or \"{{now}}\"",
- "fiscal-year": "Fiscal year",
+ "fiscal-year": "Fiscal year: {{from}} - {{to}}",
"from-input": "From",
"open-input-calendar": "Open calendar",
"range-error": "\"From\" can't be after \"To\"",
@@ -8958,6 +9032,7 @@
"loading": "Loading...",
"no-unknowns": "No renamed or missing variables found.",
"renamed-or-missing-variables": "Renamed or missing variables",
+ "tooltip-renamed-or-missing-variables": "Click to expand a list with all variable references that have been renamed or are missing from the dashboard.",
"variable": "Variable"
},
"variable-check-indicator": {