Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Backend: Merge master into the backend branch (#845)

Browse Source 
* CI: fix shellcheck issues (#789)

Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>

* annotations: fix options in grafana 6.x, fix #813

* fix function editor in Grafana 6.4, closes #810

* add typings for grafana packages

* Add $__range_series variable for calculating function over the whole series, #531

* fix tests

* Don't set alert styles for react panels, fix #823

* docs: add range variables

* docs: percentile reference

* fix codespell

Co-authored-by: Mario Trangoni <mario@mariotrangoni.de>
Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
This commit is contained in:
vignesh-reddy
2019-12-30 01:45:47 -06:00
committed by Alexander Zobnin
parent b4b0c5b8f4
commit c300debe35
15 changed files with 499 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.circleci/deploy-docs.sh
View File

@@ -10,15 +10,15 @@ set -o pipefail
echo "current dir: $(pwd)"
# Setup git env
git config --global user.email $CI_GIT_EMAIL
git config --global user.name $CI_GIT_USER
git config --global user.email "$CI_GIT_EMAIL"
git config --global user.name "$CI_GIT_USER"
echo "git user is $CI_GIT_USER ($CI_GIT_EMAIL)"
git checkout -b $GH_PAGES_BRANCH
rm -rf * || true
git checkout -b "$GH_PAGES_BRANCH"
rm -rf ./* || true
mv ../gh-pages/docs/site/* ./
git add --force .
git commit -m "build docs from commit ${CIRCLE_SHA1:0:7} (branch $CIRCLE_BRANCH)"
git log -n 3
git push origin $GH_PAGES_BRANCH --force
git push origin "$GH_PAGES_BRANCH" --force

12
.circleci/make-release.sh
View File

@@ -8,13 +8,13 @@ set -o errexit
set -o pipefail
# Setup git env
git config --global user.email $CI_GIT_EMAIL
git config --global user.name $CI_GIT_USER
git config --global user.email "$CI_GIT_EMAIL"
git config --global user.name "$CI_GIT_USER"
echo "git user is $CI_GIT_USER ($CI_GIT_EMAIL)"
RELEASE_VER=$(echo $CIRCLE_TAG | grep -Po "(?<=v)[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)")
RELEASE_VER=$(echo "$CIRCLE_TAG" | grep -Po "(?<=v)[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)")
if [ -z $RELEASE_VER ]; then
if [ -z "$RELEASE_VER" ]; then
echo "No release version provided"
exit 1
fi
@@ -36,7 +36,7 @@ git add --force dist/
git commit -m "release $RELEASE_VER"
RELEASE_COMMIT_HASH=$(git log -n 1 | grep -Po "(?<=commit )[0-9a-z]{40}")
echo $RELEASE_COMMIT_HASH
echo "$RELEASE_COMMIT_HASH"
# Push release branch
git push origin $RELEASE_BRANCH
git push origin "$RELEASE_BRANCH"