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 Grafana to v5.4.3 #10

Merged
merged 2,991 commits into from
Feb 28, 2019
Merged

Conversation

simonpasquier
Copy link

@simonpasquier simonpasquier commented Feb 28, 2019

Differences with upstream v5.4.3:

grafana/grafana@v5.4.3...simonpasquier:bump-v5.4.3

cc @brancz

For later updates, here is how I've synced the upstream version:

git checkout openshift/master -b bump-v5.4.3
git merge origin/v5.4.3
# resolve conflicts by taking everything from upstream except
#  * Dockerfile
#  * .git
#  * .dockerignore
# 
# rebuild the Javascript code
make clean deps-js build-js
# commit the generated files in ./public/build

miqh and others added 30 commits November 9, 2018 21:09
A z-index value of less than 1020 is needed because the time selection
dropdown shares the latter value via inheritance. Arbitrarily picked
1015 because it is a notch down.

Related: grafana#14004
Preserve suffix text when applying function suggestion
…eck warning.

See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
scripts/build/release_publisher/publisher_test.go:14:2:warning: should merge variable declaration with assignment on next line (S1021) (megacheck)
…y terminated.

See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/tsdb/influxdb/influxdb.go:106:3:warning: the surrounding loop is unconditionally terminated (SA4004) (megacheck)
[Bugfix] Don't drop the value when it's equal to None
Remove Origin and Referer while proxying requests
See,
$ gometalinter --disable-all --enable=gofmt --deadline 10m --vendor ./...
build.go:1::warning: file is not gofmted with -s (gofmt)
scripts/build/release_publisher/externalrelease.go:1::warning: file is not gofmted with -s (gofmt)
scripts/build/release_publisher/localrelease.go:1::warning: file is not gofmted with -s (gofmt)
scripts/build/release_publisher/main.go:1::warning: file is not gofmted with -s (gofmt)
scripts/build/release_publisher/publisher_test.go:1::warning: file is not gofmted with -s (gofmt)
Tab completion gets in the way when constructing a query from the inside
out:

```
up| => |up => sum(|up)
```

At that point the language provider will not suggest anything.
Datasource selection triggers a connection test, on success
the DS is set in the Explore state. If the test takes long and user
selects a different DS, and just after that the first test succeeds,
then the first DS overwrites the state.

* when test returns check if datasource is still the requested one
Per discussion on grafana@154fbe2#r31238888 it seemed like this wording might be easier to understand.
Clarify wording of playlist protip
torkelo and others added 20 commits December 10, 2018 15:08
(cherry picked from commit 29bcdef)
Making the setting configurable thru environment variable

(cherry picked from commit b9e91ca)
(cherry picked from commit 17f8be9)
(cherry picked from commit f512220)
frequency set to zero causes division by zero
panics in the alert schedular.

closes grafana#14810

(cherry picked from commit fbb3ad5)
- docker for arm
- upgrade to latest golang
- automated repo deploy
release v5.4.3

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 28, 2019
@brancz
Copy link

brancz commented Feb 28, 2019

Thanks for taking care of this!

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 28, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brancz, 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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 28, 2019
@brancz
Copy link

brancz commented Feb 28, 2019

/retest

@openshift-merge-robot openshift-merge-robot merged commit 2ea5517 into openshift:master Feb 28, 2019
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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.