248 Commits (2efcd11c12ee0e624e5b51fddcf2d31290b8b57c)

Author	SHA1	Message	Date
kennytm	ed054c205d	grafana-toolkit: avoid path.resolve with globby in moveStaticFiles (#27670)	5 years ago
Jorge Vallecillo	9e3def4214	Fix typos (#27711)	5 years ago
Ryan McKinley	b3b72b8ae6	Toolkit: clean node_modules/@grafana/data/node_modules in prepare (#27554)	5 years ago
Marcus Andersson	d75758071b	Chore: bumped to next version 7.3.0-pre (#27476) ... * bumped version to the next minor. * bumped packages version to the next minor.	5 years ago
Arve Knudsen	c7b8d85ce5	Chore: Upgrade grabpl (#27470) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	029278faeb	CI: Add Google Cloud SDK to plugin CI Docker images (#27444) ... * grafana-plugin-ci-alpine: Upgrading Go,golangci-lint, adding gcloud Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * grafana-plugin-ci: Upgrading Go,golangci-lint, adding gcloud Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * grafana-plugin-ci-alpine: Minor cleanup Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Don't specify depth when cloning Mage Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * grafana-plugin-ci-e2e: Upgrading Go, golangci-lint Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * ci-deploy: Upgrading gcloud Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Update packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/README.md Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> * grafana-plugin-ci-alpine: Install Python Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	5 years ago
Pratik Raj	cfc618ef44	Use git clone --depth (#26976) ... Signed-off-by: Pratik Raj <rajpratik71@gmail.com>	5 years ago
Arve Knudsen	fb1f2746aa	Chore: Upgrade build pipeline tool in scripts (#27433) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	19c8097595	Chore: Upgrade to Go 1.15.1 (#27326) ... * Chore: Upgrade to Go 1.15.1	5 years ago
Steven Vachon	7c49d6d944	Fix core E2E CI (#27254)	5 years ago
Arve Knudsen	d823b26b06	Drone/CircleCI: Upgrade build pipeline tool (#26854) ... * Drone/CircleCI: Upgrade build pipeline tool Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Upgrade build pipeline tool in Docker scripts Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Zoltán Bedi	ae30482465	Chore: MEGA - Make Eslint Great Again 💅 (#26094) ... * Fix lint error in types.ts * Bump eslint and its deps to latest * Add eslintignore and remove not needed eslintrcs * Change webpack configs eslint config * Update package.jsons and removed unused eslintrc files * Chore yarn lint --fix 💅 * Add devenv to eslintignore * Remove eslint disable comments for rules that are not used * Remaining eslint fixes 💅 * Bump grafana/eslint-config 💥 * Modify package.json No need for duplicate checks. * Modify eslintignore to ignore data and dist folders * Revert removing .eslintrc to make sure not to use certain packages * Modify package.json to remove not needed command * Use gitignore for ignoring paths	5 years ago
Levente Balogh	6b1a80675f	Grafana Toolkit: add an option for signing plugins as admin (#26817) ... * feat(grafana-toolkit): add a flag to the plugin:ci-package command * docs(grafana-toolkit): add a short comment above the flag * fix(grafana-toolkit): fix option for signing a plugin with the admin endpoint	5 years ago
dependabot[bot]	49c4edb2cb	Chore(deps): Bump lodash from 4.17.15 to 4.17.19 (#26417) ... Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
Levente Balogh	bdbea6d1f2	fix(Toolkit/Plugin): throw an Error instead of a string (#26618)	5 years ago
Josh Soref	7d08a8497a	Chore: fix spelling of GitHub (#26182) ... Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>	6 years ago
Arve Knudsen	d28d495235	Chore: Enable PR testing in Drone (#26189) ... * Add Drone configuration Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Add more steps Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Add more steps Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Build front-end before testing it Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Upgrade grafana/build-container Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Add packaging step Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Trigger on push Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove some steps Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Enable steps Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Install Dockerize Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Use node image for test-frontend Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Increase number of test workers Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Make plugin installation depend on frontend tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Make integration tests depend on frontend tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Use grafana/build-container also for front-end tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Upgrade dependencies in order to fix front-end tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Depend on es-check Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Dont' depend on tests before building front-end Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Add more steps Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix packaging Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Simplify Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Try to build images Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix e2e tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove steps Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Install netcat Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Include golangci-lint with grafana/build-container Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Build storybook and docs website Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix e2e tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Use build image with root user Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Drop CircleCI dependencies Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix e2e tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix e2e under Drone Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Execute e2e server separately Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Use own plugin for building Docker images Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Use Starlark to configure Drone Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Add enterprise steps to pipeline Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Add more enterprise steps to pipeline Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Maintain Yarn cache Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Build enterprise Docker images Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Build Ubuntu Docker images Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Refactor Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Add Postgres integration test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Add MySQL integration test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Parameterize integration test DB connections Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Categorize integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Use grabpl integration-tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove unintended change Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Drone: Disable Ubuntu Docker images for PR pipeline Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Regenerate yarn.lock Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Upgrade grabpl Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Restore Yarn cache before installing in grafana-enterprise Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Use separate pipelines for OSS and enterprise Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Let OSS builds depend on tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Restore Go cache before building back-end Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Reduce number of variants built for PRs Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix building of Docker images Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Drone: Simplify logic Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Drone: Use Starlark Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Drone: Fix syntax error Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Convert .drone.star to YAML Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Upgrade AWS Go SDK Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Drone: Fix Go linting Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Undo irrelevant changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Revert "Undo irrelevant changes" This reverts commit 5152f65972. * Undo irrelevant changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * e2e: Support Circle Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove unused script Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * TypeScript fixes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * TypeScript fixes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove unused script Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * More Drone support Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove unused script Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix build on Circle Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove TODO comment Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	ba4a8256a4	Chore: Rename plugin CI image as grafana/grafana-plugin-ci:latest-alpine (#26106) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	c711b792fe	Plugin CI image: Pin Alpine version, don't use apk cache (#26095) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Marcus Andersson	700ab8f3d8	Chore: bumped version to next minor. (#25971)	6 years ago
Ryan McKinley	1a711e7df0	Panel Inspect: use monaco for json display (#25251)	6 years ago
Dominik Prokop	75706a4a8b	Toolkit: fix grafana-toolkit binary path so toolkit is not run in linked mode (#25860)	6 years ago
Dominik Prokop	a8b660d919	Improve yarn start output (#25773)	6 years ago
Ryan McKinley	d1b230f84a	Chore: upgrade to Typescript 3.9.3 (#25154) ... * upgrade to typescript 3.9.3 * Fix errors that surfaced with update * Null check fixs * FIx null checks Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>	6 years ago
Alex Khomenko	03f241a674	Grafana UI: Add FieldSet component (#25348) ... * Grafana UI: Add FieldSet * Grafana UI: Add story * Grafana UI: Add docs * Grafana UI: Export FieldSet * Grafana UI: Fix issues	6 years ago
Josh Soref	ed92b41d47	Chore: spelling - misc (#24438) ... * Chore: spelling - misc * fix master merge	6 years ago
Sofia Papagiannaki	139be3d7ba	grafana/toolkit: Modify close milestone task to remove label from more than 100 pull requests and add dry run option (#25108) ... * Fix close milestone to remove label from all the required pull requests There used to be a limit to 100 pull requests. * Add dry run option in close-milestone task	6 years ago
Stephanie Closson	b7d5912ca8	Chore: Toolkit fixes to use toolkit for release (#24951) ... * Various fixes and requests for toolkit: 1) Added toolkit to the alpine docker image, so we can get latest fixes without having to re-release 2) Removed cp from e2d docker image 3) Change github client to allow to specify an owner so it's not "grafana" only 4) Toolkit refers to grafana-ui and grafana-data "next", rather than canary * added toolkit to e2e docker image * Added tools to the e2e image for building/deploying oracle * added shasum * removing toolkit from images	6 years ago
Ryan McKinley	9edd8b7c7e	Toolkit: update the artifact download calculation (#24828)	6 years ago
Andrew Rodgers	ce7b142d64	Toolkit: Update tsconfig to clear linter errors (#24824)	6 years ago
Marcus Efraimsson	44fae66bc0	Grafana v7.0 changelog update (#24737) ... * Grafana v7.0 changelog update * enterprise changelog * docs: white-labeling login title and subtitle * Add backend plugins breaking change regarding plugin signing * Update CHANGELOG.md Co-authored-by: Kyle Brandt <kyle@grafana.com> * Update docs/sources/installation/upgrading.md Co-authored-by: Kyle Brandt <kyle@grafana.com> * Update docs/sources/installation/upgrading.md Co-authored-by: Leonard Gram <leo@xlson.com> Co-authored-by: Kyle Brandt <kyle@grafana.com>	6 years ago
Zoltán Bedi	660f2b4e99	Fallback to process.cwd() when PWD is not present (#24677) ... Fixes #24582 - Error running yarn dev command	6 years ago
Tobias Skarhed	85ae144a87	Changelog and Readme: Update packages to beta and add Select breaking change (#24670)	6 years ago
Dominik Prokop	c5fc18ac02	grafana/toolkit: Support paging in cherrypick task (#24402) ... * Support paging in cherrypick task * Update packages/grafana-toolkit/src/cli/tasks/cherrypick.ts Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update packages/grafana-toolkit/src/cli/tasks/cherrypick.ts Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Do not cherry pick closed PRs Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Ryan McKinley	b34a5b5648	Toolkit: use grabpl for manifest (#24319)	6 years ago
Stephanie Closson	21bd9dacd6	Toolkit: Docker images/Add grabpl tool for deploys (#24309) ... * Add grabpl tool for deploys * Rest of the files	6 years ago
Dominik Prokop	97c0285543	Enable svg bundle with rollup (#24258)	6 years ago
Marcus Efraimsson	64aba38f49	Update changelog for v7.0.0-beta1 (#24007) ... Co-Authored-By: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-Authored-By: Andrej Ocenas <mr.ocenas@gmail.com> Co-Authored-By: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>	6 years ago
Marcus Efraimsson	7c43dca9bb	Fix pagination of issues/PR's in changelog generator (#23997) ... Fix pagination of issues/PR's in changelog generator	6 years ago
Arve Knudsen	154dc18809	Chore: Update Grafana version (#23985) ... * Update Grafana version	6 years ago
Hugo Häggmark	b09b49fb37	e2e: creates a separate package for selectors (#23858) ... * Initial commit * Chore: fixes after merge * Chore: removes todos * Chore: uncomment test * Chore: adds missing externals to rollup config * Refactor: selectors is master for everything * Docs: updates Docs * Chore: adds e2e-selectors to publish	6 years ago
Dominik Prokop	6dfad3b352	grafana/toolkit: Do not suggest Angular panel anymore, add note about Grafana tutorials (#23902)	6 years ago
Carl Bergquist	78566de75a	adds template for backend datasource (#23864)	6 years ago
Stephanie Closson	e35f27ea8f	Toolkit: fixes for security and publishing (#23749) ... * Fixes and security patches: 1. Always keep the source directory, just don't package the source 2. Do not publish the SSH key for common plugin tasks. Changed to environment variable * env variable renamed. * Re-added the src remove * touch config.yml for rebuild	6 years ago
Torkel Ödegaard	017767ae39	InputDatasource: Fixed prettier errors (#23679) ... * InputDatasource: Fixed prettier errors * Fixed prettier config in toolkit to make it consistent with grafana core prettier config	6 years ago
Dominik Prokop	d2a13c4715	FieldOverride: Support data links via field overrides (#23590) ... * Move xss and sanitize packages to grafana-data * Move text, url and location utils to grafana-data * Move grafana config types to grafana-data * Move field display value proxy to grafana-data * Fix * Move data links built in vars to grafana-data * Attach links supplier to when applying field overrides * Prep tests * Use links suppliers attached via field overrides * locationUtil dependencies type * Move sanitize-url declaration to grafana-data * Revert "Move sanitize-url declaration to grafana-data" This reverts commit 11db9f5e55. * Fix typo * fix ts vol1 * Remove import from runtime in data.... Make TS happy at the same time ;) * Lovely TS, please shut up * Lovely TS, please shut up vol2 * fix tests * Fixes * minor refactor * Attach get links to FieldDisplayValue for seamless usage * Update packages/grafana-data/src/field/fieldOverrides.ts * Make storybook build	6 years ago
Ryan McKinley	1e03bb2895	Bundled Plugins: fix build issues with DirectInput (#23640) ... * pass query error * and the root * not optional * building bundled plugin * missing file * remove other branch * fix prettier	6 years ago
Stephanie Closson	4e521a84b4	Tweaks and comments for ci-improvements, stability, and readibility (#23658) ... * Tweaks and comments for ci-improvements, stability, and readibility - Made naming more obvious and intuitive - CI supports grafana e2e plus more granular design (side effect that it takes slightly longer, but negligable) - disable strict e2e errors through environment variable - Added tools for linting and for building plugin-ci * feedback from stevev - remove version. Causes problems	6 years ago
Stephanie Closson	336ab8990e	Toolkit: Update slim debian image for e2e testing (#23629) ... * Because alpine uses musl instead of libc, the e2e/cypress was not compatible So: - Created new VM based on debian-slim - Could also be used as a build VM Fixes: - ginstall issue with merge somewhere. - Trimmed down the alpine VM since we don't need the extra libraries for cypress * Fix: Don't need cp on debian Fix: Don't use /bin/sh on debian. Only for alpine. Use /bin/bash on debian Fix: Missing dependencies to e2e tests	6 years ago
Alex Khomenko	89c8855f9d	Search: migrate manage dashboards (#23530) ... * Search: add search wrapper * Search: add DashboardSearch.tsx * Search: enable search * Search: update types * Search: useReducer for saving search results * Search: use default query * Search: add toggle custom action * Search: add onQueryChange * Search: debounce search * Search: pas dispatch as a prop * Search: add tag filter * Search: Fix types * Search: revert changes * Search: close overlay on esc * Search: enable tag filtering * Search: clear query * Search: add autofocus to search field * Search: Rename close to closeSearch * Search: Add no results message * Search: Add loading state * Search: Remove Select from Forms namespace * Remove Add selectedIndex * Remove Add getFlattenedSections * Remove Enable selecting items * Search: add hasId * Search: preselect first item * Search: Add utils tests * Search: Fix moving selection down * Search: Add findSelected * Search: Add type to section * Search: Handle Enter key press on item highlight * Search: Move reducer et al. to separate files * Search: Remove redundant render check * Search: Close overlay on Esc and ArrowLeft press * Search: Add close button * Search: Document utils * Search: use Icon for remove icon * Search: Add DashboardSearch.test.tsx * Search: Move test data to a separate file * Search: Finalise DashboardSearch.test.tsx * Add search reducer tests * Search: Add search results loading indicator * Search: Remove inline function * Search: Do not mutate item * Search: Tweak utils * Search: Do not clear query on tag clear * Search: Fix folder:current search * Search: Fix results scroll * Search: Update tests * Search: Close overlay on cog icon click * Add mobile styles for close button * Search: Use CustomScrollbar * Search: Memoize TagList.tsx * Search: Fix type errors * Search: More strictNullChecks fixes * Search: Add ManageDashboards.tsx * Search: Add mergeReducers * Search: Use mergeReducers * Search: remove default state from reducers * Search: Fix recent and starred icons * Search: Enable search * Search: Add markup * Search: Separate manageDashboardsReducer * Search: Add DashboardActions.tsx * Use new Select for TagFilter * Search: Use TagFilter for search filters * Search: Use TagList * Search: Add toggleSection * Search: Add more actions * Search add manageDashboards.test.ts * Search: Add getCheckedUids * Search: Add modify and toggle checked actions * Search: Update tests * Search: Update component template * Search: Enable section toggle * Search: Derive canMove and canDelete * Search: Handle delete items * Search: Fix tests * Search: Enable toggle items * Search: Add confirm modal subtitle * Search: Use theme vars * Search: Add getCheckedDashboardsUids * Search: Add MoveToFolderModal * Search: Enable moving dashboards * Search: Fix strict null checks errors * Search: Fix strict null checks errors[2] * Search: Enable filters * Search: Add useSearchQuery.ts * Search: Toggle items when toggling all * Search: Update useSearchQuery to accept custom params * Search: Add useSearchQuery to dashboard search * Search: use SearchField for manage dashboards * Search: Remove event param from query change * Search: Add base search hooks * Search: refactor useSearch to accept reducer * Search: use useDashboardSearch hook * Search: Fix useSearchQuery params * Search: Enable folder search * Search: Update tests * Search: Pass the props to manage-dashboards * Search: Add search filters margin * Search: Remove search-field-wrapper class and hide logic for it * Search: Adjust SearchField styles * Search: Move search-results-container inside SearchResults * Search: Fix type errors * Search: Add EmptyListCTA * Search: Update move message * Search: Cleanup * Search: Add todo * Search: Fix action type * Search: Use React wrapper vs FolderDashboardsCtrl and DashboardListCtrl * Search: DashboardList => DashboardListPage * Search: Remove ManageDashboards from angular_wrappers * Minor style tweaks * Search: Use LinkButton Co-authored-by: Torkel Ödegaard <torkel@grafana.com>	6 years ago