Commit Graph
100 Commits
Author SHA1 Message Date
Arve Knudsen 0dd2db8540 CircleCI: Upgrade the build pipeline tool (#23595)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-04-15 17:41:12 +02:00
Arve Knudsen 941cd59894 grafana-build-container: Update armv7 musl compiler (#23558)
* grafana-build-container: Update armv7 musl compiler

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* grafana-build-container: Bump version

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* CircleCI: Use newer grafana/build-container image

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-04-14 16:59:45 +02:00
Arve Knudsen 3dde8585ff Docs: Document default limit of /api/folders (#23435)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-04-10 17:43:00 +02:00
Arve Knudsen 7799dd84c1 Chore: Upgrade to Go 1.14 (#23371)
* Chore: Upgrade to Go 1.14
* Chore: Bump version of grafana/grafana-ci-deploy Docker image
* Chore: Fix/bump version of grafana/build-container Docker image
* CircleCI: Upgrade build Docker images
2020-04-08 14:13:05 +02:00
Arve Knudsen 0fd6edab64 services/sqlstore: Order results in UserSearch by username/email (#23328)
* services/sqlstore: Order results in UserSearch by username/email
* Add index (login,email) on user table
2020-04-03 19:15:10 +02:00
Arve Knudsen 5645d74cbc Server: Exit with 0 if no error (#23312)
Make grafana-server exit with 0 if no error occurred.
2020-04-03 11:34:18 +02:00
Arve Knudsen 3cf82df8b3 CircleCI: Revert to using shared workspace instead of GCS (#23190)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-03-30 13:16:15 +02:00
Arve Knudsen 8103c3e2c8 CircleCI: Fix cross platform Docker builds (#23192) 2020-03-30 12:01:45 +02:00
Arve Knudsen 8d2db9af7b CircleCI: Reduce dependency on workspace (#23159) 2020-03-28 13:06:21 +01:00
Arve Knudsen c344e1f6b2 CircleCI: Replace machine executors (#23151)
* CircleCI: Get rid of machine executors
* CircleCI: Use new Circle images
* CircleCI: Tweak dependency graph
2020-03-28 10:43:20 +01:00
Arve Knudsen 1a5bd30329 CircleCI: Cache packages in GCS instead of in workspace (#23130)
* CircleCI: Cache packages in GCS instead of workspace
* CircleCI: Cache yarn packages
* CircleCI: Consolidate on --frozen-lockfile
2020-03-27 14:47:42 +01:00
Arve Knudsen 660a453f74 CircleCI: Tweak concurrency when packaging (#23129) 2020-03-27 12:25:54 +01:00
Arve Knudsen c191bf64aa CircleCI: Build and publish Docker images in same job (#23092)
* CircleCI: Build and publish Docker images in same job
* CircleCI: Adjust dependency graph
* CircleCI: Specify grabpl concurrency
* CircleCI: Adjust resource classes
2020-03-26 17:25:01 +01:00
Arve Knudsen 52cd6068d1 CircleCI: Make k8s deployment depend on enterprise Docker image (#23078)
* CircleCI: Make k8s deployment depend on enterprise Docker image
* CircleCI: Upgrade grabpl
2020-03-25 18:35:38 +01:00
Arve Knudsen c813fc7871 CircleCI: Upgrade build pipeline tool (#23076) 2020-03-25 17:33:08 +01:00
Arve Knudsen 14b169d62b CircleCI: Fix deploying to k8s (#23068) 2020-03-25 15:42:56 +01:00
Arve Knudsen 35ecf79ae5 CircleCI: Deploy master builds to Kubernetes (#23034) 2020-03-25 14:45:55 +01:00
Arve Knudsen b6f73e35a5 Chore: Typecheck TypeScript in CI pipelines (#23052)
* circle-test-frontend.sh: Typecheck TypeScript
* Chore: fixes type errors
Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
2020-03-25 12:19:21 +01:00
Arve Knudsen 3b134998b9 CircleCI: Increase memory/CPU for some jobs (#23035)
* CircleCI: Increase resource class for some jobs
2020-03-24 18:23:58 +01:00
15455ab593 CircleCI: Run golangci-lint in two batches (#23021)
* CircleCI: Run golangci-lint in two batches

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* CircleCI: Fix typo

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: adds fallback value to time series class

* Chore: changes fallback value from null to empty string in FilterInput component

* Update public/app/core/time_series2.ts

Co-Authored-By: Hugo Häggmark <hugo.haggmark@grafana.com>

* Chore: updates || to ?? operators

Co-authored-by: Lukas Siatka <lukasz.siatka@grafana.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
2020-03-24 13:50:05 +01:00
Arve Knudsen 289a5fb862 Chore: Fix golangci-lint timeout config, disable govet (#23015)
* golangci-lint: Fix timeout config; disable govet
* CircleCI: Use official golangci-lint binary
2020-03-24 11:57:22 +01:00
Arve Knudsen a43e31fbf9 CircleCI: Reduce memory usage of golangci-lint (#22970)
* CircleCI: Fix golangci-lint OOM by reducing concurrency and tweaking GC
2020-03-23 17:33:06 +01:00
Arve Knudsen 9b32f9d3f4 CircleCI: Pin grabpl to v0.2.0 (#22906) 2020-03-23 09:42:12 +01:00
Arve Knudsen 28d2d2ae12 Chore: Update latest.json (#22903) 2020-03-19 17:50:35 +01:00
Arve Knudsen 777246dd3f Changelog: Update for v6.7.0 (#22900) 2020-03-19 17:07:38 +01:00
Arve Knudsen bb05989e43 SQLStore: Add migration for adding index on annotation.alert_id (#22876) 2020-03-18 17:59:42 +01:00
Arve Knudsen 3fcbc18002 Chore: Support Volta in package.json (#22849) 2020-03-17 22:08:32 +01:00
Arve Knudsen 756ad3142c CircleCI: Skip enterprise builds for forked PRs (#22851)
* CircleCI: Skip enterprise builds for forked PRs
2020-03-17 21:39:02 +01:00
Arve Knudsen e38e08dfb3 CircleCI: Don't publish storybook for PRs (#22845) 2020-03-17 15:56:08 +01:00
Arve Knudsen 85b1742805 CircleCI: Install build pipeline tool from GitHub repo (#22837) 2020-03-17 12:50:35 +01:00
Arve Knudsen 67fc251fef CircleCI: Download grabpl from GCS (#22828)
* CircleCI: Download grabpl from GCS

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* CircleCI: Fix installation of grabpl

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-03-17 11:00:23 +01:00
Arve Knudsen 5413521030 Build: Migrate PR pipeline (#22788)
Implement new PR pipeline

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-03-16 11:08:27 +01:00
Arve Knudsen d813204546 Update latest.json (#22761)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-03-12 16:41:34 +01:00
Arve Knudsen da787c1a38 Update changelog (#22755)
* Update changelog
2020-03-12 15:28:59 +01:00
Arve Knudsen 9c5020d53f Increment Grafana version (#22728)
* Increment Grafana version to 7.0.0-pre
2020-03-11 17:20:56 +01:00
Arve Knudsen 9bcccd7574 CircleCI: Implement new release pipeline (#22625)
* CircleCI: Adapt build-pipeline to implement also release pipeline
2020-03-11 15:45:52 +01:00
Arve Knudsen eb98d9c15b grafana-cli: Upgrade to urfave/cli v2 (#22402)
* grafana-cli: Upgrade to urfave/cli v2
2020-02-26 12:27:31 +01:00
Arve Knudsen bf908424a7 Alerting: Don't include image_url field with Slack message if empty (#22372) 2020-02-21 15:43:54 +01:00
Arve Knudsen 9154d7013f CircleCI: Fix publishing of releases (#22342) 2020-02-20 17:24:57 +01:00
Arve Knudsen 9baec83600 CircleCI: Switch to new master build pipeline (#22158) 2020-02-20 16:09:28 +01:00
Arve Knudsen 8d1bef3769 OAuth: Enforce auto_assign_org_id setting when role mapping enabled using Generic OAuth (#22268)
* OAuth: Make use of auto_assign_org_id setting
2020-02-19 17:38:53 +01:00
Arve Knudsen 4c282c538a CircleCI: Upgrade Ubuntu base image to 19.10 also for enterprise (#22315) 2020-02-19 17:06:02 +01:00
Arve Knudsen b148b306e2 Docker: Upgrade Ubuntu to 19.10 (#22306) 2020-02-19 15:23:54 +01:00
Arve Knudsen d03075b811 CircleCI: Push master Docker images without revision in tag (#22218) 2020-02-14 17:28:30 +01:00
Arve Knudsen 019834ae12 Alerting: Update the types of recipient supported by the Slack notifier (#22205)
* Alerting: Update types of supported Slack recipients
* Document Slack recipient requirements
2020-02-14 17:11:23 +01:00
Arve Knudsen cece9547ae Docs: Fix port config list formatting (#22113)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-02-12 12:05:37 -08:00
Arve Knudsen 6f09bc9fb4 Fix mentioning Slack users/groups (#21734)
* alerting/slack: Allow mentioning users, groups, and channels separately
2020-02-11 21:43:28 +01:00
Arve Knudsen 3b86bc97ea CircleCI: Publish enterprise Docker dev image for new master pipeline (#22091) 2020-02-11 12:55:38 +01:00
Arve Knudsen ffdbe60da0 CircleCI: Include build ID in version for new master pipeline (#22013)
* CircleCI: Include build ID in version for new master pipeline
2020-02-11 09:19:34 +01:00
Arve Knudsen bc412b48ea CircleCI: Publish enterprise ARM variants from master pipeline (#22011)
* CircleCI: Publish ARM Docker images for enterprise
2020-02-10 16:45:17 +01:00
Arve Knudsen b84e651eac Publish from new master pipeline (#21813)
* CircleCI: Move postgres/mysql integration tests to step after linting
* CircleCI: Implement publishing of packages and Docker images for new master pipeline
2020-02-05 12:22:13 +01:00
Arve Knudsen 57a0f0fe92 docs/cli: Fix documentation of reset-admin-password with --homepath (#21840) 2020-01-30 11:58:38 +01:00
Arve Knudsen 089162b0be Docs: Fix getting started links on Windows installation page (#21724) 2020-01-24 19:33:11 +01:00
Arve Knudsen f91a495875 CircleCI: Add workflow for building with Grafana Build Pipeline (#21449)
* CircleCI: Add workflow for building with grabpl
2020-01-24 09:49:02 +01:00
Arve Knudsen d26075644c ImportDashboardCommand: Validate JSON fields (#21350)
* ImportDashboardCommand: Validate JSON fields
2020-01-14 16:26:54 +01:00
Arve Knudsen 653e427433 Changelog: Add PagerDuty breaking change (#21170) 2019-12-18 15:00:43 +01:00
Arve Knudsen abc7893fdc Server: Return 404 when non-pending invite is requested (#20863)
Server API: Return 404 when non-pending invite is requested
2019-12-04 13:01:37 +01:00
Arve Knudsen b1af28122b Server: Fail when unable to create log directory (#20804) 2019-12-02 15:40:32 +01:00
Arve Knudsen 3c7cfbebe8 Server: Defer wg.Done call to ensure it's called (#20700) 2019-11-27 13:42:15 +01:00
Arve Knudsen 29d27fbaf0 Server: Clean up startup logic/error checking (#20679)
* Server: Clean up startup logic/error checking
2019-11-27 12:07:21 +01:00
Arve Knudsen fc3be40bc0 Build: Update latest.json (#20638) 2019-11-25 17:01:07 +01:00
Arve Knudsen b028ffa21e Changelog: Add v6.3.7 (#20602) 2019-11-23 00:02:59 +01:00
Arve Knudsen 37051cd844 Build: Verify checksums when downloading PhantomJS (#20558)
* Build: Supply curl -f when downloading phantomjs
* Build: Verify checksums of downloaded PhantomJS zips
2019-11-21 15:19:48 +01:00
Arve Knudsen 4f4898a782 Document required Go version in developer guide (#20546)
* Docs: Document required Go version in developer guide
2019-11-21 12:05:29 +01:00
Arve Knudsen cc21e3efbe Build: Clean up scripts/grunt/options/phantomjs.js (#20503) 2019-11-20 15:17:55 +01:00
Arve Knudsen 4b8249341c Build: Fix RPM verification (#20460) 2019-11-19 09:22:51 +01:00
Arve Knudsen 90b41e86f2 Fix package signing (#20451)
* Build: Fix package signing
2019-11-18 21:23:32 +01:00
Arve Knudsen 5ecc12505f Build: Fix signing (#20450)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2019-11-18 18:50:47 +01:00
Arve Knudsen e7e416cf8a Build: Upgrade build-container Docker image version (#20443)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2019-11-18 16:12:06 +01:00
Arve Knudsen 4f6b49bc70 Upgrade build-container image (#20438)
* grafana/build-container: Upgrade to Ubuntu 18.04 base image
* grafana/build-container: Upgrade to Go 1.13.4
* grafana/build-container: Upgrade to Node 10.17.0
2019-11-18 15:07:08 +01:00
Arve Knudsen 82f4fc2783 Fail when server is unable to bind port (#20409)
* Server: Return error when unable to bind port
* Server: Exit if a service fails
* Build: Remove graceful kill from Bra config
2019-11-18 09:49:08 +01:00
Arve Knudsen 3a8cd7b76c Avatar: Don't log failure to add existing item to cache (#19947)
Checks if avatar was found in cache before trying to add it to cache.

Fixes #19946
2019-11-12 18:49:09 +01:00
Arve Knudsen 08fcff107d Build: Fix Docker builds (#20312) 2019-11-11 21:49:53 +01:00
Arve Knudsen ceb7f51b40 Devenv: Add nginx_proxy_mac/nginx_login_only.conf (#20310)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2019-11-11 20:05:16 +01:00
Arve Knudsen ff47238b26 Build: Build Ubuntu based Docker images also for ARM (#20267)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2019-11-11 18:05:46 +01:00
Arve Knudsen f0ccfd9ed6 Update version (#20271)
Update version to 6.6.
2019-11-08 12:02:47 +01:00
Arve Knudsen e487c68156 Add Dockerfiles for Ubuntu (#20196)
* Build: Add /Dockerfile.ubuntu
* Build: Add packaging/docker/Dockerfile.ubuntu
* Build: Add grafana-docker-ubuntu-pr CircleCI job
* Build: Add CircleCI jobs for building master/release Ubuntu based Docker images
2019-11-07 16:36:40 +01:00
Arve Knudsen f9774acc4c Enable errcheck for golangci-lint (#19976)
* Enable `errcheck` for golangci-lint
* Fix linting errors
* pkg/plugins: Fix tests
* pkg/plugins: Add test
2019-10-28 17:25:35 +01:00
Arve Knudsen b0198e7c9c build: Fix building of Enterprise Docker images (#19992) 2019-10-24 15:49:42 +02:00
Arve Knudsen b3c00e4c32 Docker: Build and use musl-based binaries in alpine images to resolve glibc incompatibility issues (#19798)
* build: Install musl cross compilers as part of build Docker image
* build: Build also musl packages in scripts/build/build.sh
* scripts/build/build-all.sh: Build musl Linux targets
* build: Upgrade build-container to 1.2.11
* build.go: De-duplicate code
* build: Base Docker images on musl binaries
2019-10-24 14:34:14 +02:00
Arve Knudsen 35e0e078b7 pkg/util: Check errors (#19832)
* pkg/util: Check errors
* pkg/services: DRY up code
2019-10-23 10:40:12 +02:00
Arve Knudsen 9843a886f7 pkg/models: Check errors (#19839)
Check errors in pkg/models.
2019-10-22 16:18:36 +02:00
Arve Knudsen 8ba5509614 pkg/setting: Check errors (#19838)
Check errors in pkg/setting.
2019-10-22 16:17:49 +02:00
Arve Knudsen bb50fc5965 pkg/tsdb: Check errors (#19837)
Check errors in pkg/tsdb.
2019-10-22 16:16:53 +02:00
Arve Knudsen 2a78d2a61c pkg/services: Check errors (#19712)
* pkg/services: Check errors
* pkg/services: Don't treat context.Canceled|context.DeadlineExceeded as error
2019-10-22 14:08:18 +02:00
Arve Knudsen 31735422ef pkg/plugins: Only warn if plugins fail to load. Fixes #19846 (#19859)
pkg/plugins: Only warn if plugins fail to load. Fixes #19846
2019-10-18 14:39:38 +02:00
Arve Knudsen 6e7c18fc1c pkg/middleware: Check errors (#19749)
* pkg/middleware: Check errors
* pkg/middleware: Log when gzip middleware handler fails
2019-10-15 18:08:06 +02:00
Arve Knudsen 573e78feeb pkg/cmd: Check errors (#19700)
* pkg/cmd: Check errors
* pkg/cmd: Make sure server waits on services, even in case of error
* pkg/cmd: Inform of error to show help
* pkg/cmd: Only warn on failure to send systemd notification
* pkg/cmd: Don't log errors stemming from context cancelation
* pkg/cmd: Don't fail if unable to write to systemd
2019-10-15 16:44:15 +02:00
Arve Knudsen 08f01a6c4f pkg/bus: Check errors (#19748)
* pkg/bus: Check errors
* pkg/bus: Convert tests to testify
2019-10-14 17:23:31 +02:00
Arve Knudsen 0b1913af6f pkg/plugins: Check errors (#19715)
* pkg/plugins: Check errors
2019-10-11 21:02:15 +02:00
Arve KnudsenandMarcus Efraimsson 7349a6b96c pkg/infra: Check errors (#19705)
* pkg/infra: Check errors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* pkg/infra: Handle errors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/infra/usagestats/usage_stats.go

Co-Authored-By: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2019-10-10 16:42:11 +02:00
Arve Knudsen fe8d0d27d2 pkg/components: Check errors (#19703)
* pkg/components: Check errors
2019-10-10 09:06:55 +02:00
Arve KnudsenandMarcus Efraimsson f7ad580356 pkg/login: Check errors (#19714)
* pkg/login: Check errors
* pkg/login: Introduce "login" logger

Co-Authored-By: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2019-10-09 12:57:44 +02:00
Arve Knudsen b858a5f496 Don't truncate IPv6 addresses (#19573)
* Bugfix: Fix parsing of IPv6 addresses

Make sure that IPv6 addresses aren't truncated when parsing. Fixes #18924
* util: Change network address parsing funcs to return error
* pkg/api: Return NetworkAddress instead of host/port
2019-10-09 08:58:45 +02:00
Arve Knudsen 0a2d5e16dd pkg/api: Check errors (#19657)
* pkg/api: Check errors
* pkg/api: Remove unused function HashEmail
2019-10-08 18:57:53 +02:00
Arve Knudsen d8b6a873d8 Chore: Upgrade Docker images to Go 1.13.1 (#19576)
* Chore: Upgrade Docker image/CI to Go 1.13.1

Fixes #18878

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Use golangci-lint master revision
2019-10-08 08:32:18 +02:00
Arve Knudsen 6024260ffc De-duplicate lint-go step (#19675)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2019-10-07 16:40:08 +02:00
Arve Knudsen 92765a6c6f ci-build: Improve build-deploy script (#19653)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2019-10-07 14:17:17 +02:00
Arve Knudsen 39d8e73412 Chore: Upgrade to Go 1.13 (#19502)
* Chore: Upgrade to Go 1.13

Fixes: #18878

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: Upgrade lint tools in order to work with Go 1.13

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: Fix Go linting issues

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2019-10-02 13:59:05 +02:00
Arve Knudsen fc2282009e Build: Fix building when $LDFLAGS is set (#19509)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2019-10-01 09:31:25 +02:00