Graphite: Fixed issue switching to edit mode #23512
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aknuds1
pushed a commit
that referenced
this pull request
Apr 23, 2020
(cherry picked from commit 61460ea)
aknuds1
added a commit
that referenced
this pull request
Apr 23, 2020
* AuthProxy: Fixes bug where long username could not be cached (#22926) (cherry picked from commit 6c9d833) * Server: Exit with 0 if no error (#23312) Make grafana-server exit with 0 if no error occurred. (cherry picked from commit 5645d74) * Dashboard: Save json should preserve folderId (#23314) (cherry picked from commit 7e3b43e) * TimeSrv: Try to parse 8 and 15 digit numbers as timestamps if parsing as date fails (#21694) * Try to parse 8 and 15 digit numbers as timestamps if parsing as date fails Fixes #19738 * Add tests (cherry picked from commit c89ad9b) * BackendSrv: include credentials when withCredentials option is set (#23380) The fetch() API won't send cookies or other type of credentials unless you set the credentials init option. Some datasources like Prometheus and Elasticsearch have `withCredentials` option in Browser access mode, but this option is not currently getting passed in the fetch() API. Fixes #23338. (cherry picked from commit afd8ffd) * Dashlist: Fixed dashlist broken in edit mode (#23426) (cherry picked from commit 363bf75) * Admin: Fix Synced via LDAP message for non-LDAP external users (#23477) * UserAdmin: remove Synced via LDAP message for non-LDAP users * UserAdmin: show "Synced via <provider>" message for external users (cherry picked from commit 4d81cec) * Graphite: Fixed cannot read finally of undefiend (#23512) (cherry picked from commit 61460ea) * Hangouts: fixes notifications for alerts with empty message (#23559) * Hangouts: fixes notifications for alerts with empty message * Update pkg/services/alerting/notifiers/googlechat.go Co-Authored-By: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> (cherry picked from commit 2661054) * Variables: fixes error when setting adhoc variables values (#23580) (cherry picked from commit 0091885) * Release 6.7.3 Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * ci-metrics-publisher.sh: Fix linting issue Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * TablePanel: Fix XSS issue in header column rename (backport) (#23814) * escaping html when rendering table header alias. * fixed tooltip. Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com> * Security: Fix annotation popup XSS vulnerability (#23813) Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> (cherry picked from commit 3955e8c) Co-authored-by: Jon McKenzie <jcmcken@gmail.com> Co-authored-by: Peter Holmberg <peterholmberg@users.noreply.github.com> Co-authored-by: Jesse Tan <jessetan@users.noreply.github.com> Co-authored-by: Tuan Anh Hoang-Vu <hvtuananh@gmail.com> Co-authored-by: Torkel Ödegaard <torkel@grafana.com> Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #22927