IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-09-05 04:40:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
25,227 Commits 892 Branches 731 Tags
ce8b5030c11be00a85dd3fc95384c3d451a1e971
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Arve Knudsen 0860dfe45d CloudWatch: Fix variable naming (#24650) 
* CloudWatch: Fix variable naming
 2020-05-13 21:17:06 +02:00
Arve Knudsen 8e5a3a578a CloudWatch: Don't assume that errors are awserr.Error instances (#24641) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-05-13 18:57:23 +02:00
Arve Knudsen 03940c8471 CircleCI: Upgrade grabpl in order to fix package publishing (#24609) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-05-13 10:46:29 +02:00
Arve Knudsen 824eb94efe CircleCI: Update grabpl to 0.4.5 in order to include manifest with GEL (#24577) 
* CircleCI: Update grabpl to 0.4.5
* GEL: Upgrade version
 2020-05-12 21:06:24 +02:00
Arve Knudsen 892f9f789c Plugins: Fix manifest verification (#24573) 2020-05-12 15:48:24 +02:00
Arve Knudsen 164242f5fd Data sources: Don't fail if URL doesn't specify protocol (#24497) 2020-05-12 13:04:18 +02:00
Arve Knudsen 0475f96347 CircleCI: Speed up by testing and building in parallel (#24575) 2020-05-12 12:55:42 +02:00
Arve Knudsen c6bba9019d Chore: Update latest.json (#24424) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-05-08 12:50:44 +02:00
Arve KnudsenandTobias Skarhed a86639356e Chore: Update changelog (#24421) 
* Update changelog
Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
 2020-05-08 12:28:18 +02:00
Arve Knudsen 980b930641 Inspect: Fix typo (#24311) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-05-06 07:40:52 +02:00
Arve Knudsen a87381ece6 CircleCI: Enable plug-in signing (#24240) 
* CircleCI: Include signed manifest when building plug-ins
 2020-05-05 19:38:09 +02:00
Arve Knudsen 1ff0d9f612 CircleCI: Temporarily ignore publishing of master Docker images (#24280) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-05-05 13:14:42 +02:00
Arve Knudsen b4570de92d Docker: Remove another Alpine edge channel usage (#24136) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-05-05 11:16:03 +02:00
Arve KnudsenandMarcus Efraimsson 2fc2a7c3f5 Plugins: Only load transform plug-ins if expressions feature on (#24110) 
* PluginManager: Only load transform plugins if expressions feature on

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2020-05-04 17:39:20 +02:00
Arve Knudsen 6fb7a60a2b Dockerfile: Move Go step after JS step, since it's faster (#24221) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-05-04 11:59:10 +02:00
Arve KnudsenMarcus EfraimssonDiana Payton
 		96ffcaa134 Plugins: Require signing of external back-end plugins (#24075) 
* PluginManager: Require signing of external plugins

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2020-05-04 10:57:55 +02:00
Arve Knudsen 22840241ed scripts/tag_release.sh: Push only tag, not branch (#24055) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-30 17:24:21 +02:00
Arve Knudsen 9939d3bb38 Upgrade build pipeline tool (#24093) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-30 14:24:20 +02:00
Arve Knudsen dda8caf48c Docker: Upgrade to Alpine 3.11 (#24056) 
* Docker: Upgrade to Alpine 3.11
 2020-04-30 13:42:06 +02:00
Arve Knudsen 11eca387a0 CircleCI: Unpin grafana/docs-base (#24054) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-29 16:16:46 +02:00
Arve Knudsen edf5a2cec1 Changelog: Add a breaking change (#24051) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-29 15:47:21 +02:00
Arve Knudsen 8d8d9aac64 CircleCI: Bump grafana/build-container revision (#24043) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-29 14:47:31 +02:00
Arve Knudsen 670c96a1db latest.json: Update testing version (#24038) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-29 12:44:22 +02:00
Arve Knudsen f2e37b79dc CircleCI: Upgrade build pipeline tool (#24021) 
* CircleCI: Upgrade build pipeline tool
 2020-04-29 10:42:23 +02:00
Arve Knudsen 33ba9bb21b verify-repo-update: Fix Dockerfile.deb (#24030) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-29 10:14:35 +02:00
Arve Knudsen 2a57e1108c Chore: Put what's new and release notes URLs in package.json (#24006) 
* Put what's new and release notes URLs in package.json
* Upgrade build pipeline tool
 2020-04-28 21:26:36 +02:00
Arve Knudsen c24ca8ce41 CircleCI: Fix triggering of jobs for releases (#23999) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-28 16:05:35 +02:00
Arve Knudsen 154dc18809 Chore: Update Grafana version (#23985) 
* Update Grafana version
 2020-04-28 12:29:28 +02:00
Arve Knudsen 5442b0ab4f Docs: Fix building of docs (#23923) 
* Docs: Fix building of docs
* CircleCI: Fixate grafana/docs-base image revision in job for building docs
 2020-04-28 09:27:46 +02:00
Arve Knudsen d6cefafa12 Docs: Mark macro examples as code (#23932) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-27 21:43:32 +02:00
Arve Knudsen 295e15246e Fix Dockerfile* (#23954) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-27 18:13:27 +02:00
Arve Knudsen 76b184b93c Packages: Bundle plugins (#23787) 
* Add manifest for external plugins
* CircleCI: Build internal plug-ins
* CircleCI: Package internal and external plug-ins

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-24 19:01:34 +02:00
Arve KnudsenandMarcus Efraimsson 51c19da98d Docker: Upgrade to Ubuntu 20.04 in Dockerfiles (#23852) 
* Chore: Upgrade to Ubuntu 20.04
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2020-04-24 14:03:18 +02:00
Arve Knudsen bf6a488a33 Update latest.json (#23833) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-23 19:33:05 +02:00
Arve Knudsen ffdef9e771 CHANGELOG.md: Update (#23831) 
* CHANGELOG.md: Update
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2020-04-23 19:32:38 +02:00
Arve Knudsen f4d40224f2 CircleCI: Upgrade shellcheck to v0.7.1 and pin version (#23815) 
* CircleCI: Upgrade shellcheck to v0.7.1 and pin version

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-23 12:22:51 +02:00
Arve Knudsen 49a90cd764 Dockerfile: Copy in the tools directory, to fix build (#23773) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-22 11:11:19 +02:00
Arve Knudsen 7d88018531 DataSourceProxy: Handle URL parsing error (#23731) 
* pluginproxy: Handle URL parsing error
* pkg/api: Validate data source URLs
* pkg/api: Return 400 for URL validation error
 2020-04-22 10:30:06 +02:00
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
Arve KnudsenHugo HäggmarkLukas Siatka
 		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