From e2f74b55d20ebad1faf4e6e2ee47a057271b1667 Mon Sep 17 00:00:00 2001 From: Leonard Gram Date: Fri, 26 Oct 2018 14:23:30 +0200 Subject: [PATCH 1/4] build: grafana enterprise docker. (#13839) --- .circleci/config.yml | 4 ++++ packaging/docker/build-enterprise.sh | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100755 packaging/docker/build-enterprise.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index c293ea26a9d..79879b1a386 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -206,6 +206,9 @@ jobs: - run: docker info - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker - run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}" + - run: cp dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz + - run: cd packaging/docker && ./build-enterprise.sh "master" + grafana-docker-pr: docker: @@ -409,6 +412,7 @@ workflows: - grafana-docker-master: requires: - build-all + - build-all-enterprise - test-backend - test-frontend - codespell diff --git a/packaging/docker/build-enterprise.sh b/packaging/docker/build-enterprise.sh new file mode 100755 index 00000000000..f716a1f44f1 --- /dev/null +++ b/packaging/docker/build-enterprise.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +_grafana_tag=$1 +_docker_repo=${2:-grafana/grafana-enterprise} + +docker build \ + --tag "${_docker_repo}:${_grafana_tag}"\ + --no-cache=true \ + . From a80e2e1acd8cddfde5af521a5c1fed089e6e2c79 Mon Sep 17 00:00:00 2001 From: Leonard Gram Date: Fri, 26 Oct 2018 14:37:51 +0200 Subject: [PATCH 2/4] build: ge build fix. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 79879b1a386..ad40ad4e72f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -206,7 +206,7 @@ jobs: - run: docker info - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker - run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}" - - run: cp dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz + - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz - run: cd packaging/docker && ./build-enterprise.sh "master" From 58a567173ebd2f5515e1a27d53285672173a60cf Mon Sep 17 00:00:00 2001 From: Leonard Gram Date: Fri, 26 Oct 2018 15:19:53 +0200 Subject: [PATCH 3/4] build: builds grafana docker for enterprise at release. --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index ad40ad4e72f..28400fc6bd6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -206,6 +206,7 @@ jobs: - run: docker info - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker - run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}" + - run: rm packaging/docker/grafana-latest.linux-x64.tar.gz - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz - run: cd packaging/docker && ./build-enterprise.sh "master" @@ -233,6 +234,9 @@ jobs: - run: docker info - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker - run: cd packaging/docker && ./build-deploy.sh "${CIRCLE_TAG}" + - run: rm packaging/docker/grafana-latest.linux-x64.tar.gz + - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz + - run: cd packaging/docker && ./build-enterprise.sh "${CIRCLE_TAG}" build-enterprise: docker: From 10e5d725bc6afcda1c520972760c99fee71641a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 27 Oct 2018 15:13:15 +0200 Subject: [PATCH 4/4] updated singlestat logo --- .../singlestat/img/icn-singlestat-panel.svg | 102 +++++++++++++----- 1 file changed, 76 insertions(+), 26 deletions(-) diff --git a/public/app/plugins/panel/singlestat/img/icn-singlestat-panel.svg b/public/app/plugins/panel/singlestat/img/icn-singlestat-panel.svg index a1e15d4d58d..746687d360f 100644 --- a/public/app/plugins/panel/singlestat/img/icn-singlestat-panel.svg +++ b/public/app/plugins/panel/singlestat/img/icn-singlestat-panel.svg @@ -1,33 +1,83 @@ - - + + + + - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +