* SingleStat: apply mappings to no data response (#19951) (cherry picked from commit8232659012) * DataLinks: Fix blur issues (#19883) (cherry picked from commita1e8157969) * Docker: makes it possible to parse timezones in the docker image (#20081) (cherry picked from commite940edc79f) * Backport: Bump crewjam/saml to the latest master Ref: #20126 * LDAP Debug: No longer shows incorrectly matching groups based on role (#20018) * LDAP Debug: No longer shows incorrectly matching groups based on role Org Role was used as a shortcut to figure out what groups were matching and which weren't. That lead to too all groups matching a specific role to show up for a user if that user got that role. * LDAP Debug: Fixes ordering of matches The order of groups in the ldap.toml file is important, only the first match for an organisation will be used. This means we have to iterate based on the config and stop matching when a match is found. We might want to think about showing further matches as potential matches that are shadowed by the first match. That would possibly make it easier to understand why one match is used instead of another one. * LDAP Debug: never display more than one match for the same LDAP group/mapping. * LDAP Debug: show all matches, even if they aren't used * Update public/app/features/admin/ldap/LdapUserGroups.tsx Co-Authored-By: gotjosh <josue.abreu@gmail.com> * Update public/app/features/admin/ldap/LdapUserGroups.tsx Co-Authored-By: gotjosh <josue.abreu@gmail.com> (cherry picked from commit730bedf36f) * LDAP: All LDAP servers should be tried even if one of them returns a connection error (#20077) All ldap servers are now being tried and the first one that gives back an answer is used if a previous one is failing. Applies to login and syncing (cherry picked from commitcce5557145) * mysql: fix encoding in connection string (#20192) (cherry picked from commit19dbd27c5c) * release 6.4.4 * Settings: fix deprecation error
Grafana frontend packages
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 & @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 latest tag on npm.
Alpha and beta releases
Alpha and beta releases are published under next tag on npm.
Automatic pre-releases
Every commit to master that has changes within packages directory is a subject of npm packages release.
ALL packages will be released under version from lerna.json file with commit SHA added to it:
<lerna.json version>-<COMMIT_SHA>
Automatic prereleases are published under canary dist tag.
Manual release
All of the steps below should 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 root directory. This will perform tests on the packages and prompt for 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 prelease number!!! i.e. 6.3.0-alpha.1
- Make sure you confirm the version bump when prompted!
- Commit changes (lerna.json & package.json files) - "Packages version update: <VERSION>"
- Run
yarn packages:buildscript that will prepare 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 prelease run
packages:publishNextto publish new versions. - When releasing a stable version run
packages:publishLatestto publish new versions.
- Push version commit to the release branch
Building individual packages
To build induvidual packages run grafana-toolkit package:build --scope=<ui|toolkit|runtime|data>