Skip to content

Commit dcb7f0d

Browse files
torkelotorkelo
committed
Merge branch 'master' into react-panels-ux-idea2
2 parents 5b52225 + 019d0ee commit dcb7f0d

File tree

354 files changed

+15911
-1651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

354 files changed

+15911
-1651
lines changed

‎.circleci/config.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,14 @@ jobs:
8383
- checkout
8484
- run: 'go get -u github.com/alecthomas/gometalinter'
8585
- run: 'go get -u github.com/tsenart/deadcode'
86+
- run: 'go get -u github.com/jgautheron/goconst/cmd/goconst'
8687
- run: 'go get -u github.com/gordonklaus/ineffassign'
8788
- run: 'go get -u github.com/opennota/check/cmd/structcheck'
8889
- run: 'go get -u github.com/mdempsky/unconvert'
8990
- run: 'go get -u github.com/opennota/check/cmd/varcheck'
9091
- run:
9192
name: run linters
92-
command: 'gometalinter --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=ineffassign --enable=structcheck --enable=unconvert --enable=varcheck ./...'
93+
command: 'gometalinter --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=goconst --enable=ineffassign --enable=structcheck --enable=unconvert --enable=varcheck ./...'
9394
- run:
9495
name: run go vet
9596
command: 'go vet ./pkg/...'
@@ -157,14 +158,18 @@ jobs:
157158
name: sha-sum packages
158159
command: 'go run build.go sha-dist'
159160
- run:
160-
name: Build Grafana.com publisher
161+
name: Build Grafana.com master publisher
161162
command: 'go build -o scripts/publish scripts/build/publish.go'
163+
- run:
164+
name: Build Grafana.com release publisher
165+
command: 'cd scripts/build/release_publisher && go build -o release_publisher .'
162166
- persist_to_workspace:
163167
root: .
164168
paths:
165169
- dist/grafana*
166170
- scripts/*.sh
167171
- scripts/publish
172+
- scripts/build/release_publisher/release_publisher
168173

169174
build:
170175
docker:
@@ -298,8 +303,8 @@ jobs:
298303
name: deploy to s3
299304
command: 'aws s3 sync ./dist s3://$BUCKET_NAME/release'
300305
- run:
301-
name: Trigger Windows build
302-
command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} release'
306+
name: Deploy to Grafana.com
307+
command: './scripts/build/publish.sh'
303308

304309
workflows:
305310
version: 2

‎.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public/css/*.min.css
4040

4141
conf/custom.ini
4242
fig.yml
43-
docker-compose.yml
44-
docker-compose.yaml
43+
devenv/docker-compose.yml
44+
devenv/docker-compose.yaml
4545
/conf/provisioning/**/custom.yaml
4646
/conf/provisioning/**/dev.yaml
4747
/conf/ldap_dev.toml
@@ -72,3 +72,6 @@ debug.test
7272
*.orig
7373

7474
/devenv/bulk-dashboards/*.json
75+
/devenv/bulk_alerting_dashboards/*.json
76+
77+
/scripts/build/release_publisher/release_publisher

‎CHANGELOG.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
1-
# 5.4.0 (unreleased)
1+
# 5.3.0 (unreleased)
2+
3+
# 5.3.0-beta3 (2018-10-03)
4+
5+
* **Stackdriver**: Fix for missing ngInject [#13511](https://github.com/grafana/grafana/pull/13511)
6+
* **Permissions**: Fix for broken permissions selector [#13507](https://github.com/grafana/grafana/issues/13507)
7+
* **Alerting**: Alert reminders deduping not working as expected when running multiple Grafana instances [#13492](https://github.com/grafana/grafana/issues/13492)
8+
9+
# 5.3.0-beta2 (2018-10-01)
210

311
### New Features
412

513
* **Annotations**: Enable template variables in tagged annotations queries [#9735](https://github.com/grafana/grafana/issues/9735)
14+
* **Stackdriver**: Support for Google Stackdriver Datasource [#13289](https://github.com/grafana/grafana/pull/13289)
615

716
### Minor
817

18+
* **Provisioning**: Dashboard Provisioning now support symlinks that changes target [#12534](https://github.com/grafana/grafana/issues/12534), thx [@auhlig](https://github.com/auhlig)
919
* **OAuth**: Allow oauth email attribute name to be configurable [#12986](https://github.com/grafana/grafana/issues/12986), thx [@bobmshannon](https://github.com/bobmshannon)
1020
* **Tags**: Default sort order for GetDashboardTags [#11681](https://github.com/grafana/grafana/pull/11681), thx [@Jonnymcc](https://github.com/Jonnymcc)
1121
* **Prometheus**: Label completion queries respect dashboard time range [#12251](https://github.com/grafana/grafana/pull/12251), thx [@mtanda](https://github.com/mtanda)
1222
* **Prometheus**: Allow to display annotations based on Prometheus series value [#10159](https://github.com/grafana/grafana/issues/10159), thx [@mtanda](https://github.com/mtanda)
1323
* **Prometheus**: Adhoc-filtering for Prometheus dashboards [#13212](https://github.com/grafana/grafana/issues/13212)
1424
* **Singlestat**: Fix gauge display accuracy for percents [#13270](https://github.com/grafana/grafana/issues/13270), thx [@tianon](https://github.com/tianon)
15-
16-
# 5.3.0 (unreleased)
17-
18-
### Minor
19-
25+
* **Dashboard**: Prevent auto refresh from starting when loading dashboard with absolute time range [#12030](https://github.com/grafana/grafana/issues/12030)
26+
* **Templating**: New templating variable type `Text box` that allows free text input [#3173](https://github.com/grafana/grafana/issues/3173)
2027
* **Alerting**: Link to view full size image in Microsoft Teams alert notifier [#13121](https://github.com/grafana/grafana/issues/13121), thx [@holiiveira](https://github.com/holiiveira)
28+
* **Alerting**: Fixes a bug where all alerts would send reminders after upgrade & restart [#13402](https://github.com/grafana/grafana/pull/13402)
29+
* **Alerting**: Concurrent render limit for graphs used in notifications [#13401](https://github.com/grafana/grafana/pull/13401)
2130
* **Postgres/MySQL/MSSQL**: Add support for replacing $__interval and $__interval_ms in alert queries [#11555](https://github.com/grafana/grafana/issues/11555), thx [@svenklemm](https://github.com/svenklemm)
2231

2332
# 5.3.0-beta1 (2018-09-06)
@@ -318,7 +327,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
318327
* **Dashboard**: Sizing and positioning of settings menu icons [#11572](https://github.com/grafana/grafana/pull/11572)
319328
* **Dashboard**: Add search filter/tabs to new panel control [#10427](https://github.com/grafana/grafana/issues/10427)
320329
* **Folders**: User with org viewer role should not be able to save/move dashboards in/to general folder [#11553](https://github.com/grafana/grafana/issues/11553)
321-
* **Influxdb**: Dont assume the first column in table response is time. [#11476](https://github.com/grafana/grafana/issues/11476), thx [@hahnjo](https://github.com/hahnjo)
330+
* **Influxdb**: Don't assume the first column in table response is time. [#11476](https://github.com/grafana/grafana/issues/11476), thx [@hahnjo](https://github.com/hahnjo)
322331

323332
### Tech
324333
* Backend code simplification [#11613](https://github.com/grafana/grafana/pull/11613), thx [@knweiss](https://github.com/knweiss)
@@ -505,7 +514,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
505514
# 4.6.2 (2017-11-16)
506515

507516
## Important
508-
* **Prometheus**: Fixes bug with new prometheus alerts in Grafana. Make sure to download this version if your using Prometheus for alerting. More details in the issue. [#9777](https://github.com/grafana/grafana/issues/9777)
517+
* **Prometheus**: Fixes bug with new prometheus alerts in Grafana. Make sure to download this version if you're using Prometheus for alerting. More details in the issue. [#9777](https://github.com/grafana/grafana/issues/9777)
509518

510519
## Fixes
511520
* **Color picker**: Bug after using textbox input field to change/paste color string [#9769](https://github.com/grafana/grafana/issues/9769)
@@ -1464,7 +1473,7 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated
14641473

14651474
**New features**
14661475
- [Issue #1623](https://github.com/grafana/grafana/issues/1623). Share Dashboard: Dashboard snapshot sharing (dash and data snapshot), save to local or save to public snapshot dashboard snapshots.raintank.io site
1467-
- [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embedd a single graph on another web site
1476+
- [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embed a single graph on another web site
14681477
- [Issue #718](https://github.com/grafana/grafana/issues/718). Dashboard: When saving a dashboard and another user has made changes in between the user is prompted with a warning if he really wants to overwrite the other's changes
14691478
- [Issue #1331](https://github.com/grafana/grafana/issues/1331). Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule, Watt, eV), and new design for graph axis & grid tab and single stat options tab views
14701479
- [Issue #1241](https://github.com/grafana/grafana/issues/1242). Timepicker: New option in timepicker (under dashboard settings), to change ``now`` to be for example ``now-1m``, useful when you want to ignore last minute because it contains incomplete data

‎Gopkg.lock

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,7 @@ ignored = [
203203
[[constraint]]
204204
name = "github.com/denisenkom/go-mssqldb"
205205
revision = "270bc3860bb94dd3a3ffd047377d746c5e276726"
206+
207+
[[constraint]]
208+
name = "github.com/VividCortex/mysqlerr"
209+
branch = "master"

‎Gruntfile.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module.exports = function (grunt) {
2525
}
2626
}
2727

28-
config.coverage = grunt.option('coverage');
2928
config.phjs = grunt.option('phjsToRelease');
3029
config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
3130

‎build.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ import (
2222
"time"
2323
)
2424

25+
const (
26+
windows = "windows"
27+
linux = "linux"
28+
)
29+
2530
var (
2631
//versionRe = regexp.MustCompile(`-[0-9]{1,3}-g[0-9a-f]{5,10}`)
2732
goarch string
@@ -110,17 +115,16 @@ func main() {
110115
case "package":
111116
grunt(gruntBuildArg("build")...)
112117
grunt(gruntBuildArg("package")...)
113-
if goos == "linux" {
118+
if goos == linux {
114119
createLinuxPackages()
115120
}
116121

117122
case "package-only":
118123
grunt(gruntBuildArg("package")...)
119-
if goos == "linux" {
124+
if goos == linux {
120125
createLinuxPackages()
121126
}
122127

123-
124128
case "pkg-rpm":
125129
grunt(gruntBuildArg("release")...)
126130
createRpmPackages()
@@ -379,7 +383,7 @@ func ensureGoPath() {
379383
}
380384

381385
func grunt(params ...string) {
382-
if runtime.GOOS == "windows" {
386+
if runtime.GOOS == windows {
383387
runPrint(`.\node_modules\.bin\grunt`, params...)
384388
} else {
385389
runPrint("./node_modules/.bin/grunt", params...)
@@ -417,11 +421,11 @@ func test(pkg string) {
417421
func build(binaryName, pkg string, tags []string) {
418422
binary := fmt.Sprintf("./bin/%s-%s/%s", goos, goarch, binaryName)
419423
if isDev {
420-
//dont include os and arch in output path in dev environment
424+
//don't include os and arch in output path in dev environment
421425
binary = fmt.Sprintf("./bin/%s", binaryName)
422426
}
423427

424-
if goos == "windows" {
428+
if goos == windows {
425429
binary += ".exe"
426430
}
427431

@@ -485,11 +489,11 @@ func clean() {
485489

486490
func setBuildEnv() {
487491
os.Setenv("GOOS", goos)
488-
if goos == "windows" {
492+
if goos == windows {
489493
// require windows >=7
490494
os.Setenv("CGO_CFLAGS", "-D_WIN32_WINNT=0x0601")
491495
}
492-
if goarch != "amd64" || goos != "linux" {
496+
if goarch != "amd64" || goos != linux {
493497
// needed for all other archs
494498
cgo = true
495499
}

‎codecov.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎conf/defaults.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,10 @@ error_or_timeout = alerting
474474
# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
475475
nodata_or_nullvalues = no_data
476476

477+
# Alert notifications can include images, but rendering many images at the same time can overload the server
478+
# This limit will protect the server from render overloading and make sure notifications are sent out quickly
479+
concurrent_render_limit = 5
480+
477481
#################################### Explore #############################
478482
[explore]
479483
# Enable the Explore section

‎conf/sample.ini

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,10 @@ log_queries =
393393
# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
394394
;nodata_or_nullvalues = no_data
395395

396+
# Alert notifications can include images, but rendering many images at the same time can overload the server
397+
# This limit will protect the server from render overloading and make sure notifications are sent out quickly
398+
;concurrent_render_limit = 5
399+
396400
#################################### Explore #############################
397401
[explore]
398402
# Enable the Explore section
@@ -431,7 +435,7 @@ log_queries =
431435
;sampler_param = 1
432436

433437
#################################### Grafana.com integration ##########################
434-
# Url used to to import dashboards directly from Grafana.com
438+
# Url used to import dashboards directly from Grafana.com
435439
[grafana_com]
436440
;url = https://grafana.com
437441

0 commit comments

Comments
 (0)