* fix viz * add datasource picker on query rows in mixed mode * add timerange, handle add/remove queryrunners * multiqueryrunner test * trying things out. * adding another test to verify running a induvidual query runner will update multirunner. * cleaned up tests a bit. * draft version working ok. * fixing so we base the refId from request targets. * reenable adding expression * layout fixes for alerting page * some cleanup * cleaning up code that we won't use * changed so we don't display the time range if params not passed. * remove unused things in querygroup * changed button to type button. * removed timerange from dataQuery and removed multiquery runner. * minor refactoring. * renamed callback function to make it more clear what it does. * renamed droppable area. * changed so we only display the query editor when selecting threshold. * removed the refresh picker. * revert * wip * extending with data query. * timerange fixes * it is now possible to add grafana queries. * removed unused type. * removed expect import. * added docs. * moved range converting methods to rangeUtil. * clean up some typings, remove file * making sure we don't blow up on component being unmounted. Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
Grafana frontend packages
This document contains information about Grafana frontend package versioning and releases.
Versioning
We use Lerna for packages versioning and releases.
All packages are versioned according to the current Grafana version:
- Grafana v6.3.0-alpha1 -> @grafana/* packages @ 6.3.0-alpha.1
- Grafana v6.2.5 -> @grafana/* packages @ 6.2.5
- Grafana - master branch version (based on package.json, i.e. 6.4.0-pre) -> @grafana/* packages @ 6.4.0-pre- (see details below about packages publishing channels)
Please note that @grafana/toolkit, @grafana/ui, @grafana/data, and @grafana/runtime packages are considered ALPHA even though they are not released as alpha versions.
Stable releases
Even though packages are released under a stable version, they are considered ALPHA until further notice!
Stable releases are published under the latest tag on npm. If there was alpha/beta version released previously, the next tag is updated to stable version.
Alpha and beta releases
Alpha and beta releases are published under the next tag on npm.
Automatic prereleases
Every commit to master that has changes within the packages directory is a subject of npm packages release. ALL packages must be released under version from lerna.json file with commit SHA added to it:
<lerna.json version>-<COMMIT_SHA>
Automatic prereleases are published under the canary dist tag to the github package registry.
Consuming prereleases
As mentioned above the canary releases are published to the Github package registry rather than the NPM registry. If you wish to make use of these prereleases please follow these steps:
- You must use a personal access token to install packages from Github. To create an access token click here and create a token with the
read:packagesscope. Make a copy of the token. - Create / modify your
~/.npmrcfile with the following:
@grafana:registry=https://npm.pkg.github.com
//npm.pkg.github.com/:_authToken={INSERT_GH_TOKEN_HERE}
- Update the package.json of your project to use either the
canarychannel or a version of thecanarychannel
// plugin's package.json
{
...
"@grafana/data": "canary"
}
Manual release
All of the steps below must be performed on a release branch, according to Grafana Release Guide.
Make sure you are logged in to npm in your terminal and that you are a part of Grafana org on npm.
-
Run
yarn packages:preparescript from the root directory. This performs tests on the packages and prompts for the version of the packages. The version should be the same as the one being released.- Make sure you use semver convention. So, place a dot between prerelease id and prerelease number, i.e. 6.3.0-alpha.1
- Make sure you confirm the version bump when prompted!
-
Commit changes (lerna.json and package.json files) - "Packages version update: <VERSION>"
-
Run
yarn packages:buildscript that prepares distribution packages inpackages/grafana-*/dist. These directories are going to be published to npm. -
Depending whether or not it's a prerelease:
- When releasing a prerelease run
packages:publishNextto publish new versions. - When releasing a stable version run
packages:publishLatestto publish new versions.
- When releasing a prerelease run
-
Push version commit to the release branch.
Building individual packages
To build individual packages, run:
grafana-toolkit package:build --scope=<ui|toolkit|runtime|data>
Setting up @grafana/* packages for local development
A known issue with @grafana/* packages is that a lot of times we discover problems on canary channel(see versioning overview) when the version was already pushed to npm.
We can easily avoid that by setting up a local packages registry and test the packages before actually publishing to npm.
In this guide you will set up Verdaccio registry locally to fake npm registry. This will enable testing @grafana/* packages without the need for pushing to master.
Setting up local npm registry
From your terminal:
- Modify
/etc/hostsfile and add the following entry:127.0.0.1 grafana-npm.local - Navigate to
devenv/local-npmdirectory. - Run
docker-compose up. This will start your local npm registry, available at http://grafana-npm.local:4873/ - Run
npm login --registry=http://grafana-npm.local:4873 --scope=@grafana. This will allow you to publish any @grafana/* package into the local registry. - Run
npm config set @grafana:registry http://grafana-npm.local:4873. This will config your npm to install @grafana scoped packages from your local registry.
Publishing packages to local npm registry
You need to follow manual packages release procedure. The only difference is you need to run yarn packages:publishDev task in order to publish to you local registry.
From your terminal:
- Run
yarn packages:prepare. - Commit changes in package.json and lerna.json files
- Build packages:
yarn packages:build - Run
yarn packages:publishDev. - Navigate to http://grafana-npm.local:4873 and verify that version was published
Locally published packages will be published under dev channel, so in your plugin package.json file you can use that channel. For example:
// plugin's package.json
{
...
"@grafana/data": "dev"
}