IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12716 from Bigtalljosh/patch-1

Browse Source 
Update Configuration.md
This commit is contained in:
Marcus Efraimsson 2018-09-21 17:47:52 +02:00 committed by GitHub
commit 9fe0dcec0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/auth/generic-oauth.md
View File

@ -174,6 +174,8 @@ allowed_organizations =
allowed_organizations = allowed_organizations =
``` ```
> Note: It's important to ensure that the [root_url](/installation/configuration/#root-url) in Grafana is set in your Azure Application Reply URLs (App -> Settings -> Reply URLs)
## Set up OAuth2 with Centrify ## Set up OAuth2 with Centrify
1. Create a new Custom OpenID Connect application configuration in the Centrify dashboard. 1. Create a new Custom OpenID Connect application configuration in the Centrify dashboard.

26
public/app/plugins/datasource/grafana/specs/datasource.test.ts
View File

@ -1,4 +1,4 @@
import {GrafanaDatasource} from "../datasource"; import { GrafanaDatasource } from '../datasource';
import q from 'q'; import q from 'q';
import moment from 'moment'; import moment from 'moment';
@ -9,23 +9,19 @@ describe('grafana data source', () => {
get: (url, options) => { get: (url, options) => {
calledBackendSrvParams = options; calledBackendSrvParams = options;
return q.resolve([]); return q.resolve([]);
} },
}; };
const templateSrvStub = { const templateSrvStub = {
replace: val => { replace: val => {
return val return val.replace('$var2', 'replaced|replaced2').replace('$var', 'replaced');
.replace('$var2', 'replaced|replaced2') },
.replace('$var', 'replaced');
}
}; };
const ds = new GrafanaDatasource(backendSrvStub, q, templateSrvStub); const ds = new GrafanaDatasource(backendSrvStub, q, templateSrvStub);
describe('with tags that have template variables', () => { describe('with tags that have template variables', () => {
const options = setupAnnotationQueryOptions( const options = setupAnnotationQueryOptions({ tags: ['tag1:$var'] });
{tags: ['tag1:$var']}
);
beforeEach(() => { beforeEach(() => {
return ds.annotationQuery(options); return ds.annotationQuery(options);
@ -37,9 +33,7 @@ describe('grafana data source', () => {
}); });
describe('with tags that have multi value template variables', () => { describe('with tags that have multi value template variables', () => {
const options = setupAnnotationQueryOptions( const options = setupAnnotationQueryOptions({ tags: ['$var2'] });
{tags: ['$var2']}
);
beforeEach(() => { beforeEach(() => {
return ds.annotationQuery(options); return ds.annotationQuery(options);
@ -55,9 +49,9 @@ describe('grafana data source', () => {
const options = setupAnnotationQueryOptions( const options = setupAnnotationQueryOptions(
{ {
type: 'dashboard', type: 'dashboard',
tags: ['tag1'] tags: ['tag1'],
}, },
{id: 1} { id: 1 }
); );
beforeEach(() => { beforeEach(() => {
@ -77,8 +71,8 @@ function setupAnnotationQueryOptions(annotation, dashboard?) {
dashboard: dashboard, dashboard: dashboard,
range: { range: {
from: moment(1432288354), from: moment(1432288354),
to: moment(1432288401) to: moment(1432288401),
}, },
rangeRaw: {from: "now-24h", to: "now"} rangeRaw: { from: 'now-24h', to: 'now' },
}; };
} }