Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
8a4ff5bd
Commit
8a4ff5bd
authored
Dec 15, 2014
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1205 from noise/master
fix #1204: add separate datasource parameter withCredentials
parents
4ae7648b
c140c8ca
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletions
+4
-1
src/app/services/graphite/graphiteDatasource.js
+4
-1
No files found.
src/app/services/graphite/graphiteDatasource.js
View file @
8a4ff5bd
...
...
@@ -24,6 +24,7 @@ function (angular, _, $, config, kbn, moment) {
this
.
supportMetrics
=
true
;
this
.
annotationEditorSrc
=
'app/partials/graphite/annotation_editor.html'
;
this
.
cacheTimeout
=
datasource
.
cacheTimeout
;
this
.
withCredentials
=
datasource
.
withCredentials
;
}
GraphiteDatasource
.
prototype
.
query
=
function
(
options
)
{
...
...
@@ -209,8 +210,10 @@ function (angular, _, $, config, kbn, moment) {
};
GraphiteDatasource
.
prototype
.
doGraphiteRequest
=
function
(
options
)
{
if
(
this
.
basicAuth
)
{
if
(
this
.
basicAuth
||
this
.
withCredentials
)
{
options
.
withCredentials
=
true
;
}
if
(
this
.
basicAuth
)
{
options
.
headers
=
options
.
headers
||
{};
options
.
headers
.
Authorization
=
'Basic '
+
this
.
basicAuth
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment