Skip to content

Commit

Permalink
Merge remote-tracking branch 'grafana/master' into timepicker-tooltip
Browse files Browse the repository at this point in the history
* grafana/master: (52 commits)
  Moved tooltip icon from input to label grafana#12945 (grafana#13059)
  added empty cta to playlist page + hid playlist table when empty (grafana#12841)
  Update provisioning.md
  changelog: add notes about closing grafana#12865
  fixed so validation of empty fields works again
  tslint: tslint to const fixes part3 (grafana#13036)
  tslint: more const fixes (grafana#13035)
  tslint: changing vars -> const (grafana#13034)
  tslint: autofix of let -> const (grafana#13033)
  WIP Update tslint (grafana#12922)
  changelog: add notes about closing grafana#12952 grafana#12965
  build: fixes rpm build when using defaults.
  changelog: add notes about closing grafana#12486
  docs: changes
  fixed so animation starts as soon as one pushes the button and animation stops if login failed
  added link to getting started to all, changed wording
  tests: fix missing tests (with .jest suffix)
  heatmap: fix tooltip bug in firefox
  Update notifications.md
  sql: added code migration type
  ...
  • Loading branch information
ryantxu committed Aug 29, 2018
2 parents 3afeddd + b6584f5 commit 01acba4
Show file tree
Hide file tree
Showing 346 changed files with 4,018 additions and 2,638 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ debug.test
/vendor/**/appengine*
*.orig

/devenv/dashboards/bulk-testing/*.json
/devenv/bulk-dashboards/*.json
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
* **Prometheus**: Heatmap - fix unhandled error when some points are missing [#12484](https://github.com/grafana/grafana/issues/12484)
* **Prometheus**: Add $__interval, $__interval_ms, $__range, $__range_s & $__range_ms support for dashboard and template queries [#12597](https://github.com/grafana/grafana/issues/12597) [#12882](https://github.com/grafana/grafana/issues/12882), thx [@roidelapluie](https://github.com/roidelapluie)
* **Variables**: Skip unneeded extra query request when de-selecting variable values used for repeated panels [#8186](https://github.com/grafana/grafana/issues/8186), thx [@mtanda](https://github.com/mtanda)
* **Variables**: Limit amount of queries executed when updating variable that other variable(s) are dependent on [#11890](https://github.com/grafana/grafana/issues/11890)
* **Variables**: Support query variable refresh when another variable referenced in `Regex` field change its value [#12952](https://github.com/grafana/grafana/issues/12952), thx [@franciscocpg](https://github.com/franciscocpg)
* **Variables**: Support variables in query variable `Custom all value` field [#12965](https://github.com/grafana/grafana/issues/12965), thx [@franciscocpg](https://github.com/franciscocpg)
* **Postgres/MySQL/MSSQL**: New $__unixEpochGroup and $__unixEpochGroupAlias macros [#12892](https://github.com/grafana/grafana/issues/12892), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Add previous fill mode to $__timeGroup macro which will fill in previously seen value when point is missing [#12756](https://github.com/grafana/grafana/issues/12756), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Use floor rounding in $__timeGroup macro function [#12460](https://github.com/grafana/grafana/issues/12460), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Use metric column as prefix when returning multiple value columns [#12727](https://github.com/grafana/grafana/issues/12727), thx [@svenklemm](https://github.com/svenklemm)
Expand Down Expand Up @@ -51,6 +55,9 @@ om/grafana/grafana/issues/12668)
* **Docker**: Make it possible to set a specific plugin url [#12861](https://github.com/grafana/grafana/pull/12861), thx [ClementGautier](https://github.com/ClementGautier)
* **Graphite**: Fix for quoting of int function parameters (when using variables) [#11927](https://github.com/grafana/grafana/pull/11927)
* **InfluxDB**: Support timeFilter in query templating for InfluxDB [#12598](https://github.com/grafana/grafana/pull/12598), thx [kichristensen](https://github.com/kichristensen)
* **Provisioning**: Should allow one default datasource per organisation [#12229](https://github.com/grafana/grafana/issues/12229)
* **Heatmap**: Fix broken tooltip and crosshair on Firefox [#12486](https://github.com/grafana/grafana/issues/12486)
* **Login**: Show loading animation while waiting for authentication response on login [#12865](https://github.com/grafana/grafana/issues/12865)

### Breaking changes

Expand Down
33 changes: 15 additions & 18 deletions build.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ func main() {

readVersionFromPackageJson()

if pkgArch == "" {
pkgArch = goarch
}

log.Printf("Version: %s, Linux Version: %s, Package Iteration: %s\n", version, linuxPackageVersion, linuxPackageIteration)

if flag.NArg() == 0 {
Expand Down Expand Up @@ -105,10 +109,17 @@ func main() {

case "package":
grunt(gruntBuildArg("build")...)
packageGrafana()
grunt(gruntBuildArg("package")...)
if goos == "linux" {
createLinuxPackages()
}

case "package-only":
packageGrafana()
grunt(gruntBuildArg("package")...)
if goos == "linux" {
createLinuxPackages()
}


case "pkg-rpm":
grunt(gruntBuildArg("release")...)
Expand All @@ -133,22 +144,6 @@ func main() {
}
}

func packageGrafana() {
platformArg := fmt.Sprintf("--platform=%v", goos)
previousPkgArch := pkgArch
if pkgArch == "" {
pkgArch = goarch
}
postProcessArgs := gruntBuildArg("package")
postProcessArgs = append(postProcessArgs, platformArg)
grunt(postProcessArgs...)
pkgArch = previousPkgArch

if goos == "linux" {
createLinuxPackages()
}
}

func makeLatestDistCopies() {
files, err := ioutil.ReadDir("dist")
if err != nil {
Expand Down Expand Up @@ -404,6 +399,8 @@ func gruntBuildArg(task string) []string {
if phjsToRelease != "" {
args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
}
args = append(args, fmt.Sprintf("--platform=%v", goos))

return args
}

Expand Down
2 changes: 1 addition & 1 deletion devenv/bulk-dashboards/bulk-dashboards.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ providers:
folder: 'Bulk dashboards'
type: file
options:
path: devenv/dashboards/bulk-testing
path: devenv/bulk-dashboards

Loading

0 comments on commit 01acba4

Please sign in to comment.