From e794951087043783655d8e4ab811a0edf89f559e Mon Sep 17 00:00:00 2001 From: Patrick O'Carroll Date: Wed, 18 Apr 2018 10:21:48 +0200 Subject: [PATCH 1/7] removed padding and moved carrot --- public/sass/components/_gf-form.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index 6603cfa072b..7a3046444fe 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -341,19 +341,19 @@ $input-border: 1px solid $input-border-color; margin-right: $gf-form-margin; position: relative; background-color: $input-bg; - padding-right: $input-padding-x; border: $input-border; border-radius: $input-border-radius; &::after { position: absolute; top: 35%; - right: $input-padding-x/2; + right: $input-padding-x; background-color: transparent; color: $input-color; font: normal normal normal $font-size-sm/1 FontAwesome; content: '\f0d7'; pointer-events: none; + font-size: 11px; } .gf-form-input { From 03a9650c575cb641f4923007f0348aa6a0142d0f Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 20 Apr 2018 09:52:25 +0200 Subject: [PATCH 2/7] cli: adds os and arch headers this makes it possible for the plugin repo to provide the correct package if arch and os matters --- pkg/cmd/grafana-cli/services/services.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go index 3745dbff90e..e743d42022c 100644 --- a/pkg/cmd/grafana-cli/services/services.go +++ b/pkg/cmd/grafana-cli/services/services.go @@ -10,6 +10,7 @@ import ( "net/http" "net/url" "path" + "runtime" "time" "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger" @@ -155,6 +156,8 @@ func sendRequest(repoUrl string, subPaths ...string) ([]byte, error) { req, err := http.NewRequest(http.MethodGet, u.String(), nil) req.Header.Set("grafana-version", grafanaVersion) + req.Header.Set("grafana-os", runtime.GOOS) + req.Header.Set("grafana-arch", runtime.GOARCH) req.Header.Set("User-Agent", "grafana "+grafanaVersion) if err != nil { From 98bbb0189892980e8d05b81e50a7ab73132cd790 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 20 Apr 2018 10:35:15 +0200 Subject: [PATCH 3/7] build: removes gometalinter for some reason the linter lints files in /vendor which it should not. So we have to remove it until it works as expected ref #10381 --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 603c5fe0720..e7f40419402 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,10 +139,6 @@ workflows: filters: tags: only: /.*/ - - gometalinter: - filters: - tags: - only: /.*/ - build: filters: tags: From cdbd4e0fc0539293e3949e0a34f3ddafa413cda7 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 18 Apr 2018 15:54:42 +0200 Subject: [PATCH 4/7] graphite: convert ds test to jest --- ...datasource_specs.ts => datasource.jest.ts} | 156 ++++++++---------- 1 file changed, 68 insertions(+), 88 deletions(-) rename public/app/plugins/datasource/graphite/specs/{datasource_specs.ts => datasource.jest.ts} (57%) diff --git a/public/app/plugins/datasource/graphite/specs/datasource_specs.ts b/public/app/plugins/datasource/graphite/specs/datasource.jest.ts similarity index 57% rename from public/app/plugins/datasource/graphite/specs/datasource_specs.ts rename to public/app/plugins/datasource/graphite/specs/datasource.jest.ts index 0fb68d06498..dac6c2252d8 100644 --- a/public/app/plugins/datasource/graphite/specs/datasource_specs.ts +++ b/public/app/plugins/datasource/graphite/specs/datasource.jest.ts @@ -1,30 +1,19 @@ -import { describe, beforeEach, it, expect, angularMocks } from 'test/lib/common'; -import helpers from 'test/specs/helpers'; import { GraphiteDatasource } from '../datasource'; import moment from 'moment'; import _ from 'lodash'; +import $q from 'q'; +import { TemplateSrvStub } from 'test/specs/helpers'; -describe('graphiteDatasource', function() { - let ctx = new helpers.ServiceTestContext(); - let instanceSettings: any = { url: [''], name: 'graphiteProd', jsonData: {} }; - - beforeEach(angularMocks.module('grafana.core')); - beforeEach(angularMocks.module('grafana.services')); - beforeEach(ctx.providePhase(['backendSrv', 'templateSrv'])); - beforeEach( - angularMocks.inject(function($q, $rootScope, $httpBackend, $injector) { - ctx.$q = $q; - ctx.$httpBackend = $httpBackend; - ctx.$rootScope = $rootScope; - ctx.$injector = $injector; - $httpBackend.when('GET', /\.html$/).respond(''); - }) - ); +describe('graphiteDatasource', () => { + let ctx: any = { + backendSrv: {}, + $q: $q, + templateSrv: new TemplateSrvStub(), + }; beforeEach(function() { - ctx.ds = ctx.$injector.instantiate(GraphiteDatasource, { - instanceSettings: instanceSettings, - }); + ctx.instanceSettings = { url: [''], name: 'graphiteProd', jsonData: {} }; + ctx.ds = new GraphiteDatasource(ctx.instanceSettings, ctx.$q, ctx.backendSrv, ctx.templateSrv); }); describe('When querying graphite with one target using query editor target spec', function() { @@ -38,7 +27,7 @@ describe('graphiteDatasource', function() { let results; let requestOptions; - beforeEach(function() { + beforeEach(async () => { ctx.backendSrv.datasourceRequest = function(options) { requestOptions = options; return ctx.$q.when({ @@ -46,40 +35,39 @@ describe('graphiteDatasource', function() { }); }; - ctx.ds.query(query).then(function(data) { + await ctx.ds.query(query).then(function(data) { results = data; }); - ctx.$rootScope.$apply(); }); it('should generate the correct query', function() { - expect(requestOptions.url).to.be('/render'); + expect(requestOptions.url).toBe('/render'); }); it('should set unique requestId', function() { - expect(requestOptions.requestId).to.be('graphiteProd.panelId.3'); + expect(requestOptions.requestId).toBe('graphiteProd.panelId.3'); }); it('should query correctly', function() { let params = requestOptions.data.split('&'); - expect(params).to.contain('target=prod1.count'); - expect(params).to.contain('target=prod2.count'); - expect(params).to.contain('from=-1h'); - expect(params).to.contain('until=now'); + expect(params).toContain('target=prod1.count'); + expect(params).toContain('target=prod2.count'); + expect(params).toContain('from=-1h'); + expect(params).toContain('until=now'); }); it('should exclude undefined params', function() { let params = requestOptions.data.split('&'); - expect(params).to.not.contain('cacheTimeout=undefined'); + expect(params).not.toContain('cacheTimeout=undefined'); }); it('should return series list', function() { - expect(results.data.length).to.be(1); - expect(results.data[0].target).to.be('prod1.count'); + expect(results.data.length).toBe(1); + expect(results.data[0].target).toBe('prod1.count'); }); it('should convert to millisecond resolution', function() { - expect(results.data[0].datapoints[0][0]).to.be(10); + expect(results.data[0].datapoints[0][0]).toBe(10); }); }); @@ -110,22 +98,21 @@ describe('graphiteDatasource', function() { ], }; - beforeEach(() => { + beforeEach(async () => { ctx.backendSrv.datasourceRequest = function(options) { return ctx.$q.when(response); }; - ctx.ds.annotationQuery(options).then(function(data) { + await ctx.ds.annotationQuery(options).then(function(data) { results = data; }); - ctx.$rootScope.$apply(); }); it('should parse the tags string into an array', () => { - expect(_.isArray(results[0].tags)).to.eql(true); - expect(results[0].tags.length).to.eql(2); - expect(results[0].tags[0]).to.eql('tag1'); - expect(results[0].tags[1]).to.eql('tag2'); + expect(_.isArray(results[0].tags)).toEqual(true); + expect(results[0].tags.length).toEqual(2); + expect(results[0].tags[0]).toEqual('tag1'); + expect(results[0].tags[1]).toEqual('tag2'); }); }); @@ -149,14 +136,14 @@ describe('graphiteDatasource', function() { ctx.ds.annotationQuery(options).then(function(data) { results = data; }); - ctx.$rootScope.$apply(); + // ctx.$rootScope.$apply(); }); it('should parse the tags string into an array', () => { - expect(_.isArray(results[0].tags)).to.eql(true); - expect(results[0].tags.length).to.eql(2); - expect(results[0].tags[0]).to.eql('tag1'); - expect(results[0].tags[1]).to.eql('tag2'); + expect(_.isArray(results[0].tags)).toEqual(true); + expect(results[0].tags.length).toEqual(2); + expect(results[0].tags[0]).toEqual('tag1'); + expect(results[0].tags[1]).toEqual('tag2'); }); }); }); @@ -166,21 +153,21 @@ describe('graphiteDatasource', function() { let results = ctx.ds.buildGraphiteParams({ targets: [{}], }); - expect(results.length).to.be(0); + expect(results.length).toBe(0); }); it('should uri escape targets', function() { let results = ctx.ds.buildGraphiteParams({ targets: [{ target: 'prod1.{test,test2}' }, { target: 'prod2.count' }], }); - expect(results).to.contain('target=prod1.%7Btest%2Ctest2%7D'); + expect(results).toContain('target=prod1.%7Btest%2Ctest2%7D'); }); it('should replace target placeholder', function() { let results = ctx.ds.buildGraphiteParams({ targets: [{ target: 'series1' }, { target: 'series2' }, { target: 'asPercent(#A,#B)' }], }); - expect(results[2]).to.be('target=asPercent(series1%2Cseries2)'); + expect(results[2]).toBe('target=asPercent(series1%2Cseries2)'); }); it('should replace target placeholder for hidden series', function() { @@ -191,35 +178,35 @@ describe('graphiteDatasource', function() { { target: 'asPercent(#A,#B)' }, ], }); - expect(results[0]).to.be('target=' + encodeURIComponent('asPercent(series1,sumSeries(series1))')); + expect(results[0]).toBe('target=' + encodeURIComponent('asPercent(series1,sumSeries(series1))')); }); it('should replace target placeholder when nesting query references', function() { let results = ctx.ds.buildGraphiteParams({ targets: [{ target: 'series1' }, { target: 'sumSeries(#A)' }, { target: 'asPercent(#A,#B)' }], }); - expect(results[2]).to.be('target=' + encodeURIComponent('asPercent(series1,sumSeries(series1))')); + expect(results[2]).toBe('target=' + encodeURIComponent('asPercent(series1,sumSeries(series1))')); }); it('should fix wrong minute interval parameters', function() { let results = ctx.ds.buildGraphiteParams({ targets: [{ target: "summarize(prod.25m.count, '25m', 'sum')" }], }); - expect(results[0]).to.be('target=' + encodeURIComponent("summarize(prod.25m.count, '25min', 'sum')")); + expect(results[0]).toBe('target=' + encodeURIComponent("summarize(prod.25m.count, '25min', 'sum')")); }); it('should fix wrong month interval parameters', function() { let results = ctx.ds.buildGraphiteParams({ targets: [{ target: "summarize(prod.5M.count, '5M', 'sum')" }], }); - expect(results[0]).to.be('target=' + encodeURIComponent("summarize(prod.5M.count, '5mon', 'sum')")); + expect(results[0]).toBe('target=' + encodeURIComponent("summarize(prod.5M.count, '5mon', 'sum')")); }); it('should ignore empty targets', function() { let results = ctx.ds.buildGraphiteParams({ targets: [{ target: 'series1' }, { target: '' }], }); - expect(results.length).to.be(2); + expect(results.length).toBe(2); }); }); @@ -231,7 +218,7 @@ describe('graphiteDatasource', function() { ctx.backendSrv.datasourceRequest = function(options) { requestOptions = options; return ctx.$q.when({ - data: [{ target: 'prod1.count', datapoints: [[10, 1], [12, 1]] }], + data: ['backend_01', 'backend_02'], }); }; }); @@ -241,10 +228,9 @@ describe('graphiteDatasource', function() { results = data; }); - ctx.$rootScope.$apply(); - expect(requestOptions.url).to.be('/tags/autoComplete/tags'); - expect(requestOptions.params.expr).to.eql([]); - expect(results).not.to.be(null); + expect(requestOptions.url).toBe('/tags/autoComplete/tags'); + expect(requestOptions.params.expr).toEqual([]); + expect(results).not.toBe(null); }); it('should generate tags query with a filter expression', () => { @@ -252,21 +238,19 @@ describe('graphiteDatasource', function() { results = data; }); - ctx.$rootScope.$apply(); - expect(requestOptions.url).to.be('/tags/autoComplete/tags'); - expect(requestOptions.params.expr).to.eql(['server=backend_01']); - expect(results).not.to.be(null); + expect(requestOptions.url).toBe('/tags/autoComplete/tags'); + expect(requestOptions.params.expr).toEqual(['server=backend_01']); + expect(results).not.toBe(null); }); - it('should generate tag query for an expression with whitespace after', () => { + it('should generate tags query for an expression with whitespace after', () => { ctx.ds.metricFindQuery('tags(server=backend_01 )').then(data => { results = data; }); - ctx.$rootScope.$apply(); - expect(requestOptions.url).to.be('/tags/autoComplete/tags'); - expect(requestOptions.params.expr).to.eql(['server=backend_01']); - expect(results).not.to.be(null); + expect(requestOptions.url).toBe('/tags/autoComplete/tags'); + expect(requestOptions.params.expr).toEqual(['server=backend_01']); + expect(results).not.toBe(null); }); it('should generate tag values query for one tag', () => { @@ -274,11 +258,10 @@ describe('graphiteDatasource', function() { results = data; }); - ctx.$rootScope.$apply(); - expect(requestOptions.url).to.be('/tags/autoComplete/values'); - expect(requestOptions.params.tag).to.be('server'); - expect(requestOptions.params.expr).to.eql([]); - expect(results).not.to.be(null); + expect(requestOptions.url).toBe('/tags/autoComplete/values'); + expect(requestOptions.params.tag).toBe('server'); + expect(requestOptions.params.expr).toEqual([]); + expect(results).not.toBe(null); }); it('should generate tag values query for a tag and expression', () => { @@ -286,11 +269,10 @@ describe('graphiteDatasource', function() { results = data; }); - ctx.$rootScope.$apply(); - expect(requestOptions.url).to.be('/tags/autoComplete/values'); - expect(requestOptions.params.tag).to.be('server'); - expect(requestOptions.params.expr).to.eql(['server=~backend*']); - expect(results).not.to.be(null); + expect(requestOptions.url).toBe('/tags/autoComplete/values'); + expect(requestOptions.params.tag).toBe('server'); + expect(requestOptions.params.expr).toEqual(['server=~backend*']); + expect(results).not.toBe(null); }); it('should generate tag values query for a tag with whitespace after', () => { @@ -298,11 +280,10 @@ describe('graphiteDatasource', function() { results = data; }); - ctx.$rootScope.$apply(); - expect(requestOptions.url).to.be('/tags/autoComplete/values'); - expect(requestOptions.params.tag).to.be('server'); - expect(requestOptions.params.expr).to.eql([]); - expect(results).not.to.be(null); + expect(requestOptions.url).toBe('/tags/autoComplete/values'); + expect(requestOptions.params.tag).toBe('server'); + expect(requestOptions.params.expr).toEqual([]); + expect(results).not.toBe(null); }); it('should generate tag values query for a tag and expression with whitespace after', () => { @@ -310,11 +291,10 @@ describe('graphiteDatasource', function() { results = data; }); - ctx.$rootScope.$apply(); - expect(requestOptions.url).to.be('/tags/autoComplete/values'); - expect(requestOptions.params.tag).to.be('server'); - expect(requestOptions.params.expr).to.eql(['server=~backend*']); - expect(results).not.to.be(null); + expect(requestOptions.url).toBe('/tags/autoComplete/values'); + expect(requestOptions.params.tag).toBe('server'); + expect(requestOptions.params.expr).toEqual(['server=~backend*']); + expect(results).not.toBe(null); }); }); }); From d7f58d74d353bec310467d2dee4976a16b7c335c Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 20 Apr 2018 11:14:33 +0200 Subject: [PATCH 5/7] changelog: adds releaste date for 5.1.0-beta1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5edc8397412..63ec1965098 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 5.1.0 (unreleased) +# 5.1.0-beta1 (2018-04-20) * **MSSQL**: New Microsoft SQL Server data source [#10093](https://github.com/grafana/grafana/pull/10093), [#11298](https://github.com/grafana/grafana/pull/11298), thx [@linuxchips](https://github.com/linuxchips) * **Prometheus**: The heatmap panel now support Prometheus histograms [#10009](https://github.com/grafana/grafana/issues/10009) From 177220e2fe3bc96eb0a34ce9ca47bfdefb589a9e Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 20 Apr 2018 12:59:44 +0200 Subject: [PATCH 6/7] build: fixes release deploy --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e7f40419402..b6514c4cb47 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -117,7 +117,7 @@ jobs: - image: circleci/python:2.7-stretch steps: - attach_workspace: - at: dist + at: . - run: name: install awscli command: 'sudo pip install awscli' From e168bfe03e03afdc4f49fd3d2b20b9ae2ca07f91 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 20 Apr 2018 13:23:45 +0200 Subject: [PATCH 7/7] docs: release 5.1.0-beta1 --- docs/sources/installation/debian.md | 8 ++++++++ docs/sources/installation/rpm.md | 7 +++++++ docs/sources/installation/windows.md | 1 + packaging/publish/publish_testing.sh | 4 ++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 8b51a75a826..8b2e15ad124 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -16,6 +16,7 @@ weight = 1 Description | Download ------------ | ------------- Stable for Debian-based Linux | [grafana_5.0.4_amd64.deb](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.0.4_amd64.deb) +Beta for Debian-based Linux | [grafana_5.1.0-beta1_amd64.deb](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.1.0-beta1_amd64.deb) Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing installation. @@ -29,6 +30,13 @@ sudo apt-get install -y adduser libfontconfig sudo dpkg -i grafana_5.0.4_amd64.deb ``` +## Install Latest Beta +```bash +wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.1.0-beta1_amd64.deb +sudo apt-get install -y adduser libfontconfig +sudo dpkg -i grafana_5.1.0-beta1_amd64.deb +``` + ## APT Repository Add the following line to your `/etc/apt/sources.list` file. diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index 05192512e5a..3650560d5cf 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -16,6 +16,7 @@ weight = 2 Description | Download ------------ | ------------- Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [5.0.4 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4-1.x86_64.rpm) +Latest Beta for CentOS / Fedora / OpenSuse / Redhat Linux | [5.1.0-beta1 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.0-beta1.x86_64.rpm) Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing @@ -29,6 +30,12 @@ You can install Grafana using Yum directly. $ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4-1.x86_64.rpm ``` +## Install Beta + +```bash +$ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.0-beta1.x86_64.rpm +``` + Or install manually using `rpm`. #### On CentOS / Fedora / Redhat: diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index 4f8d7696b57..31fe243c01d 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -13,6 +13,7 @@ weight = 3 Description | Download ------------ | ------------- Latest stable package for Windows | [grafana-5.0.4.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4.windows-x64.zip) +Latest beta package for Windows | [grafana.5.1.0-beta1.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.0-beta5.windows-x64.zip) Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing installation. diff --git a/packaging/publish/publish_testing.sh b/packaging/publish/publish_testing.sh index 08ba2a89dd9..9fd4e1f93b9 100755 --- a/packaging/publish/publish_testing.sh +++ b/packaging/publish/publish_testing.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash -deb_ver=5.0.0-beta5 -rpm_ver=5.0.0-beta5 +deb_ver=5.1.0-beta1 +rpm_ver=5.1.0-beta1 wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${deb_ver}_amd64.deb