Team Members
-| - | Username | -- | |
|---|---|---|---|
|
- |
- {{member.login}} | -{{member.email}} | -- - - - | -
-
- This team has no members yet.
-
-
+
+
+
+ This team has no members yet.
+
+
+
+
+
+
+
+
diff --git a/public/app/features/org/team_details_ctrl.ts b/public/app/features/org/team_details_ctrl.ts
index 3d193880635..6e0fddafa9d 100644
--- a/public/app/features/org/team_details_ctrl.ts
+++ b/public/app/features/org/team_details_ctrl.ts
@@ -1,15 +1,21 @@
import coreModule from 'app/core/core_module';
+import config from 'app/core/config';
export default class TeamDetailsCtrl {
team: Team;
teamMembers: User[] = [];
navModel: any;
+ teamGroups: TeamGroup[] = [];
+ newGroupId: string;
+ isMappingsEnabled: boolean;
/** @ngInject **/
constructor(private $scope, private backendSrv, private $routeParams, navModelSrv) {
this.navModel = navModelSrv.getNav('cfg', 'teams', 0);
this.userPicked = this.userPicked.bind(this);
this.get = this.get.bind(this);
+ this.newGroupId = '';
+ this.isMappingsEnabled = config.buildInfo.isEnterprise;
this.get();
}
@@ -18,9 +24,16 @@ export default class TeamDetailsCtrl {
this.backendSrv.get(`/api/teams/${this.$routeParams.id}`).then(result => {
this.team = result;
});
+
this.backendSrv.get(`/api/teams/${this.$routeParams.id}/members`).then(result => {
this.teamMembers = result;
});
+
+ if (this.isMappingsEnabled) {
+ this.backendSrv.get(`/api/teams/${this.$routeParams.id}/groups`).then(result => {
+ this.teamGroups = result;
+ });
+ }
}
}
@@ -57,6 +70,20 @@ export default class TeamDetailsCtrl {
this.get();
});
}
+
+ addGroup() {
+ this.backendSrv.post(`/api/teams/${this.$routeParams.id}/groups`, { groupId: this.newGroupId }).then(() => {
+ this.get();
+ });
+ }
+
+ removeGroup(group: TeamGroup) {
+ this.backendSrv.delete(`/api/teams/${this.$routeParams.id}/groups/${group.groupId}`).then(this.get);
+ }
+}
+
+export interface TeamGroup {
+ groupId: string;
}
export interface Team {
diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts
index 19bdf599ce1..b5e0316163c 100644
--- a/public/app/features/plugins/datasource_srv.ts
+++ b/public/app/features/plugins/datasource_srv.ts
@@ -91,10 +91,20 @@ export class DatasourceSrv {
_.each(config.datasources, function(value, key) {
if (value.meta && value.meta.metrics) {
- metricSources.push({ value: key, name: key, meta: value.meta });
+ let metricSource = { value: key, name: key, meta: value.meta, sort: key };
+
+ //Make sure grafana and mixed are sorted at the bottom
+ if (value.meta.id === 'grafana') {
+ metricSource.sort = String.fromCharCode(253);
+ } else if (value.meta.id === 'mixed') {
+ metricSource.sort = String.fromCharCode(254);
+ }
+
+ metricSources.push(metricSource);
if (key === config.defaultDatasource) {
- metricSources.push({ value: null, name: 'default', meta: value.meta });
+ metricSource = { value: null, name: 'default', meta: value.meta, sort: key };
+ metricSources.push(metricSource);
}
}
});
@@ -104,17 +114,10 @@ export class DatasourceSrv {
}
metricSources.sort(function(a, b) {
- // these two should always be at the bottom
- if (a.meta.id === 'mixed' || a.meta.id === 'grafana') {
+ if (a.sort.toLowerCase() > b.sort.toLowerCase()) {
return 1;
}
- if (b.meta.id === 'mixed' || b.meta.id === 'grafana') {
- return -1;
- }
- if (a.name.toLowerCase() > b.name.toLowerCase()) {
- return 1;
- }
- if (a.name.toLowerCase() < b.name.toLowerCase()) {
+ if (a.sort.toLowerCase() < b.sort.toLowerCase()) {
return -1;
}
return 0;
diff --git a/public/app/features/plugins/specs/datasource_srv.jest.ts b/public/app/features/plugins/specs/datasource_srv.jest.ts
new file mode 100644
index 00000000000..f261c4e2249
--- /dev/null
+++ b/public/app/features/plugins/specs/datasource_srv.jest.ts
@@ -0,0 +1,59 @@
+import config from 'app/core/config';
+import 'app/features/plugins/datasource_srv';
+import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
+
+describe('datasource_srv', function() {
+ let _datasourceSrv = new DatasourceSrv({}, {}, {}, {});
+ let metricSources;
+
+ describe('when loading metric sources', () => {
+ let unsortedDatasources = {
+ mmm: {
+ type: 'test-db',
+ meta: { metrics: { m: 1 } },
+ },
+ '--Grafana--': {
+ type: 'grafana',
+ meta: { builtIn: true, metrics: { m: 1 }, id: 'grafana' },
+ },
+ '--Mixed--': {
+ type: 'test-db',
+ meta: { builtIn: true, metrics: { m: 1 }, id: 'mixed' },
+ },
+ ZZZ: {
+ type: 'test-db',
+ meta: { metrics: { m: 1 } },
+ },
+ aaa: {
+ type: 'test-db',
+ meta: { metrics: { m: 1 } },
+ },
+ BBB: {
+ type: 'test-db',
+ meta: { metrics: { m: 1 } },
+ },
+ };
+ beforeEach(() => {
+ config.datasources = unsortedDatasources;
+ metricSources = _datasourceSrv.getMetricSources({ skipVariables: true });
+ });
+
+ it('should return a list of sources sorted case insensitively with builtin sources last', () => {
+ expect(metricSources[0].name).toBe('aaa');
+ expect(metricSources[1].name).toBe('BBB');
+ expect(metricSources[2].name).toBe('mmm');
+ expect(metricSources[3].name).toBe('ZZZ');
+ expect(metricSources[4].name).toBe('--Grafana--');
+ expect(metricSources[5].name).toBe('--Mixed--');
+ });
+
+ beforeEach(() => {
+ config.defaultDatasource = 'BBB';
+ });
+
+ it('should set default data source', () => {
+ expect(metricSources[2].name).toBe('default');
+ expect(metricSources[2].sort).toBe('BBB');
+ });
+ });
+});
diff --git a/public/app/features/plugins/specs/datasource_srv_specs.ts b/public/app/features/plugins/specs/datasource_srv_specs.ts
deleted file mode 100644
index 85a66b59ee7..00000000000
--- a/public/app/features/plugins/specs/datasource_srv_specs.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { describe, beforeEach, it, expect, angularMocks } from 'test/lib/common';
-import config from 'app/core/config';
-import 'app/features/plugins/datasource_srv';
-
-describe('datasource_srv', function() {
- var _datasourceSrv;
- var metricSources;
- var templateSrv = {};
-
- beforeEach(angularMocks.module('grafana.core'));
- beforeEach(
- angularMocks.module(function($provide) {
- $provide.value('templateSrv', templateSrv);
- })
- );
- beforeEach(angularMocks.module('grafana.services'));
- beforeEach(
- angularMocks.inject(function(datasourceSrv) {
- _datasourceSrv = datasourceSrv;
- })
- );
-
- describe('when loading metric sources', function() {
- var unsortedDatasources = {
- mmm: {
- type: 'test-db',
- meta: { metrics: { m: 1 } },
- },
- '--Grafana--': {
- type: 'grafana',
- meta: { builtIn: true, metrics: { m: 1 }, id: 'grafana' },
- },
- '--Mixed--': {
- type: 'test-db',
- meta: { builtIn: true, metrics: { m: 1 }, id: 'mixed' },
- },
- ZZZ: {
- type: 'test-db',
- meta: { metrics: { m: 1 } },
- },
- aaa: {
- type: 'test-db',
- meta: { metrics: { m: 1 } },
- },
- BBB: {
- type: 'test-db',
- meta: { metrics: { m: 1 } },
- },
- };
- beforeEach(function() {
- config.datasources = unsortedDatasources;
- metricSources = _datasourceSrv.getMetricSources({ skipVariables: true });
- });
-
- it('should return a list of sources sorted case insensitively with builtin sources last', function() {
- expect(metricSources[0].name).to.be('aaa');
- expect(metricSources[1].name).to.be('BBB');
- expect(metricSources[2].name).to.be('mmm');
- expect(metricSources[3].name).to.be('ZZZ');
- expect(metricSources[4].name).to.be('--Grafana--');
- expect(metricSources[5].name).to.be('--Mixed--');
- });
- });
-});
diff --git a/public/app/features/templating/variable_srv.ts b/public/app/features/templating/variable_srv.ts
index 8a096dd9ad2..8ad3c2845e2 100644
--- a/public/app/features/templating/variable_srv.ts
+++ b/public/app/features/templating/variable_srv.ts
@@ -38,7 +38,11 @@ export class VariableSrv {
});
}
- onDashboardRefresh() {
+ onDashboardRefresh(evt, payload) {
+ if (payload && payload.fromVariableValueUpdated) {
+ return Promise.resolve({});
+ }
+
var promises = this.variables.filter(variable => variable.refresh === 2).map(variable => {
var previousOptions = variable.options.slice();
@@ -130,7 +134,7 @@ export class VariableSrv {
return this.$q.all(promises).then(() => {
if (emitChangeEvents) {
this.$rootScope.$emit('template-variable-value-updated');
- this.$rootScope.$broadcast('refresh');
+ this.$rootScope.$broadcast('refresh', { fromVariableValueUpdated: true });
}
});
}
diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index 46431a08ab1..d7d33264c99 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -162,8 +162,8 @@ export class PrometheusDatasource {
format: activeTargets[index].format,
step: queries[index].step,
legendFormat: activeTargets[index].legendFormat,
- start: start,
- end: end,
+ start: queries[index].start,
+ end: queries[index].end,
query: queries[index].expr,
responseListLength: responseList.length,
responseIndex: index,
diff --git a/public/app/plugins/datasource/prometheus/specs/datasource.jest.ts b/public/app/plugins/datasource/prometheus/specs/datasource.jest.ts
index 0157322da58..219b990e5dd 100644
--- a/public/app/plugins/datasource/prometheus/specs/datasource.jest.ts
+++ b/public/app/plugins/datasource/prometheus/specs/datasource.jest.ts
@@ -68,7 +68,7 @@ describe('PrometheusDatasource', () => {
ctx.query = {
range: { from: moment(1443454528000), to: moment(1443454528000) },
targets: [{ expr: 'test{job="testjob"}', format: 'heatmap', legendFormat: '{{le}}' }],
- interval: '60s',
+ interval: '1s',
};
});
diff --git a/public/app/plugins/datasource/prometheus/specs/result_transformer.jest.ts b/public/app/plugins/datasource/prometheus/specs/result_transformer.jest.ts
index 56a05d5aedb..b94cca79059 100644
--- a/public/app/plugins/datasource/prometheus/specs/result_transformer.jest.ts
+++ b/public/app/plugins/datasource/prometheus/specs/result_transformer.jest.ts
@@ -127,4 +127,82 @@ describe('Prometheus Result Transformer', () => {
]);
});
});
+
+ describe('When resultFormat is time series', () => {
+ it('should transform matrix into timeseries', () => {
+ const response = {
+ status: 'success',
+ data: {
+ resultType: 'matrix',
+ result: [
+ {
+ metric: { __name__: 'test', job: 'testjob' },
+ values: [[0, '10'], [1, '10'], [2, '0']],
+ },
+ ],
+ },
+ };
+ let result = [];
+ let options = {
+ format: 'timeseries',
+ start: 0,
+ end: 2,
+ };
+
+ ctx.resultTransformer.transform(result, { data: response }, options);
+ expect(result).toEqual([{ target: 'test{job="testjob"}', datapoints: [[10, 0], [10, 1000], [0, 2000]] }]);
+ });
+
+ it('should fill timeseries with null values', () => {
+ const response = {
+ status: 'success',
+ data: {
+ resultType: 'matrix',
+ result: [
+ {
+ metric: { __name__: 'test', job: 'testjob' },
+ values: [[1, '10'], [2, '0']],
+ },
+ ],
+ },
+ };
+ let result = [];
+ let options = {
+ format: 'timeseries',
+ step: 1,
+ start: 0,
+ end: 2,
+ };
+
+ ctx.resultTransformer.transform(result, { data: response }, options);
+ expect(result).toEqual([{ target: 'test{job="testjob"}', datapoints: [[null, 0], [10, 1000], [0, 2000]] }]);
+ });
+
+ it('should align null values with step', () => {
+ const response = {
+ status: 'success',
+ data: {
+ resultType: 'matrix',
+ result: [
+ {
+ metric: { __name__: 'test', job: 'testjob' },
+ values: [[4, '10'], [8, '10']],
+ },
+ ],
+ },
+ };
+ let result = [];
+ let options = {
+ format: 'timeseries',
+ step: 2,
+ start: 0,
+ end: 8,
+ };
+
+ ctx.resultTransformer.transform(result, { data: response }, options);
+ expect(result).toEqual([
+ { target: 'test{job="testjob"}', datapoints: [[null, 0], [null, 2000], [10, 4000], [null, 6000], [10, 8000]] },
+ ]);
+ });
+ });
});
diff --git a/public/views/index.template.html b/public/views/index.template.html
index 79da1d7179c..4140321d633 100644
--- a/public/views/index.template.html
+++ b/public/views/index.template.html
@@ -65,7 +65,7 @@
Mappings to external groups
+ + +| Group | ++ |
|---|---|
| {{group.groupId}} | ++ + + + | +
+
+ This team has no associated groups yet.
+
+
+
+