Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump v6.7.4 #37

Merged
merged 1,082 commits into from
Jun 24, 2020
Merged

Bump v6.7.4 #37

merged 1,082 commits into from
Jun 24, 2020

Conversation

simonpasquier
Copy link

No description provided.

secustor and others added 30 commits February 18, 2020 16:10
* NewPanelEditor: Add back data links

* Made custom table options work in table panel
Put the cipher suites with Forward Secrecy at or nearer the top, keeping any TLS v1.3 suites at the top, following best practice guides for the ordering of the rest. There is no change to the selection of suites only reordering.
* Update enhanced_ldap.md

* Update ldap.md

* Minor fixes
…rafana#22256)

Suppresses stacktrace in recovery middleware if error is
http.ErrAbortHandler.
Skips writing response error in recovery middleware if
resoonse have already been written.
Skips try rotate of auth token if response have already
been written.
Skips adding default response headers if response have
already been written.

Fixes grafana#15728
Ref grafana#18082

Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>
* Update TestData docs

Fixes TestData docs by correcting name, installation instructions, etc. Should prevent issues like grafana#16386.

- Fix name: `Grafana TestData` -> `TestData DB`
- Fix "Enable" section instructions
- Fix "Dashboard" section instructions
- Fix grammar

* Bold clickable items, list step-by-step instrs.

* Apply suggestions from code review

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
…anel (grafana#22274)

* FieldConfigs: Added string select field config

* FieldConfigs: Added string select field config

* Changed to generic select type
Minor format edits
* Increase nodejs max memory

* Indentation

* Update .circleci/config.yml

Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>

* Update .circleci/config.yml

Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
…a#22283)

... so that they get installed within consumer projects
* CI: check ubuntu and alpine images with trivy

* CI: clear trivy cache before running
…sing Generic OAuth (grafana#22268)

* OAuth: Make use of auto_assign_org_id setting
Add gauge for requests currently in flight.

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
* Add basic layout components

* Add some love to data links in new panel edit

* fix prettier
Properly provides plugin configs to backend plugins.
Uses v0.16.0 of grafana-plugin-sdk-go-

Ref grafana#21512
Ref grafana#19667
By storing render key in remote cache it will enable
image renderer to use public facing url or load
balancer url to render images and thereby remove
the requirement of image renderer having to use the
url of the originating Grafana instance when running
HA setup (multiple Grafana instances).

Fixes grafana#17704
Ref grafana/grafana-image-renderer#91
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* Couple of changes to the document

Correcting a typo in line 53
Line 226 should be re-written as "To easily configure"

* Update docs/sources/auth/generic-oauth.md

Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add new form and functionality

* Add new files

* Connect to Redux and add navigation stuff

* Add required login/name

* Remove import

* Fix feedback

* Replace direct button spacing with HorizontalGroup

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
robbymilo and others added 21 commits March 20, 2020 14:13
…stead of panel options object [BREAKING] (grafana#22754)

This changes PanelModel's API to support PanelModel API updates when changing panel type. Primary useful when changing panel type between Angular and React panels, as other migrations can be handled via DashboardMigrator.

API change: https://github.com/grafana/grafana/pull/22754/files#diff-d9e3f91dc7d5697f6d85ada008003b4b

(cherry picked from commit 1256d9e)
…ns null value. (grafana#22981)

* Fix to make sure we have the correct dataIndex when using data links.

* fixed strict null errors.

* decreased number of errors.

(cherry picked from commit 41bc1aa)
…this (grafana#23032)

* BackendSrv: Added config to response

* QueryInspector: Removing config from showing up

* Replace config with request and make it be the unmodified params sent in

(cherry picked from commit 40d195e)
grafana#23069)

* Removed namespace declaration to prevent issues with external plugins.

* fixed imports and tests.

(cherry picked from commit f75387b)
…Model instead of panel options object [BREAKING] (grafana#22754)"

This reverts commit 16f3fe7.
…ina (grafana#21803) (grafana#22753)

Something funky going on with GitHub - the build has passed.
* AuthProxy: Fixes bug where long username could not be cached (grafana#22926)

(cherry picked from commit 6c9d833)

* Server: Exit with 0 if no error (grafana#23312)

Make grafana-server exit with 0 if no error occurred.

(cherry picked from commit 5645d74)

* Dashboard: Save json should preserve folderId (grafana#23314)

(cherry picked from commit 7e3b43e)

* TimeSrv: Try to parse 8 and 15 digit numbers as timestamps if parsing as date fails (grafana#21694)

* Try to parse 8 and 15 digit numbers as timestamps if parsing as date fails

Fixes grafana#19738

* Add tests

(cherry picked from commit c89ad9b)

* BackendSrv: include credentials when withCredentials option is set (grafana#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 grafana#23338.

(cherry picked from commit afd8ffd)

* Dashlist: Fixed dashlist broken in edit mode (grafana#23426)

(cherry picked from commit 363bf75)

* Admin: Fix Synced via LDAP message for non-LDAP external users (grafana#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 (grafana#23512)

(cherry picked from commit 61460ea)

* Hangouts: fixes notifications for alerts with empty message (grafana#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 (grafana#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) (grafana#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 (grafana#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>
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 24, 2020
Copy link

@lilic lilic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 24, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lilic, simonpasquier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 5288214 into openshift:master Jun 24, 2020
@simonpasquier simonpasquier deleted the bump-v6.7.4 branch June 24, 2020 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.