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
9f9fca1e
Commit
9f9fca1e
authored
Jun 17, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(datasource): added suggest urls for each data source, #4577
parent
fdf46c6a
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
12 deletions
+16
-12
pkg/api/api.go
+1
-0
public/app/features/plugins/ds_edit_ctrl.ts
+3
-5
public/app/features/plugins/partials/ds_http_settings.html
+4
-1
public/app/plugins/datasource/elasticsearch/partials/config.html
+1
-1
public/app/plugins/datasource/graphite/partials/config.html
+3
-1
public/app/plugins/datasource/influxdb/partials/config.html
+1
-1
public/app/plugins/datasource/opentsdb/partials/config.html
+2
-2
public/app/plugins/datasource/prometheus/partials/config.html
+1
-1
No files found.
pkg/api/api.go
View file @
9f9fca1e
...
...
@@ -34,6 +34,7 @@ func Register(r *macaron.Macaron) {
r
.
Get
(
"/org/"
,
reqSignedIn
,
Index
)
r
.
Get
(
"/org/new"
,
reqSignedIn
,
Index
)
r
.
Get
(
"/datasources/"
,
reqSignedIn
,
Index
)
r
.
Get
(
"/datasources/new"
,
reqSignedIn
,
Index
)
r
.
Get
(
"/datasources/edit/*"
,
reqSignedIn
,
Index
)
r
.
Get
(
"/org/users/"
,
reqSignedIn
,
Index
)
r
.
Get
(
"/org/apikeys/"
,
reqSignedIn
,
Index
)
...
...
public/app/features/plugins/ds_edit_ctrl.ts
View file @
9f9fca1e
...
...
@@ -168,15 +168,13 @@ coreModule.directive('datasourceHttpSettings', function() {
return
{
scope
:
{
current
:
"="
,
defaultUrl
:
"="
suggestUrl
:
"@"
,
},
templateUrl
:
'public/app/features/plugins/partials/ds_http_settings.html'
,
link
:
{
pre
:
function
(
$scope
,
elem
,
attrs
)
{
$scope
.
suggestDefaultUrl
=
function
()
{
return
[
$scope
.
defaultUrl
];
$scope
.
getSuggestUrls
=
function
()
{
return
[
$scope
.
suggestUrl
];
};
}
}
...
...
public/app/features/plugins/partials/ds_http_settings.html
View file @
9f9fca1e
...
...
@@ -6,7 +6,10 @@
<div
class=
"gf-form-inline"
>
<div
class=
"gf-form max-width-30"
>
<span
class=
"gf-form-label width-7"
>
Url
</span>
<input
class=
"gf-form-input"
type=
"text"
ng-model=
'current.url'
placeholder=
"for example: http://localhost:8081"
bs-typeahead=
"suggestDefaultUrl"
ng-pattern=
"/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/"
required
></input>
<input
class=
"gf-form-input"
type=
"text"
ng-model=
'current.url'
placeholder=
"{{suggestUrl}}"
bs-typeahead=
"getSuggestUrls"
min-length=
"0"
ng-pattern=
"/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/"
required
></input>
<info-popover
mode=
"right-absolute"
>
<p>
Specify a complete HTTP url (for example http://your_server:8080)
</p>
<span
ng-show=
"current.access === 'direct'"
>
...
...
public/app/plugins/datasource/elasticsearch/partials/config.html
View file @
9f9fca1e
<datasource-http-settings
current=
"ctrl.current"
>
<datasource-http-settings
current=
"ctrl.current"
suggest-url=
"http://localhost:9200"
>
</datasource-http-settings>
<h3
class=
"page-heading"
>
Elasticsearch details
</h3>
...
...
public/app/plugins/datasource/graphite/partials/config.html
View file @
9f9fca1e
<datasource-http-settings
current=
"ctrl.current"
default-url=
"'http://localhost:8081'"
>
<datasource-http-settings
current=
"ctrl.current"
suggest-url=
"http://localhost:8080"
>
</datasource-http-settings>
public/app/plugins/datasource/influxdb/partials/config.html
View file @
9f9fca1e
<datasource-http-settings
current=
"ctrl.current"
>
<datasource-http-settings
current=
"ctrl.current"
suggest-url=
"http://localhost:8086"
>
</datasource-http-settings>
<h3
class=
"page-heading"
>
InfluxDB Details
</h3>
...
...
public/app/plugins/datasource/opentsdb/partials/config.html
View file @
9f9fca1e
<datasource-http-settings
current=
"ctrl.current"
></datasource-http-settings>
<datasource-http-settings
current=
"ctrl.current"
suggest-url=
"http://localhost:4242"
></datasource-http-settings>
<h5>
Open
tsdb
settings
</h5>
<h5>
Open
TSDB
settings
</h5>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label width-7"
>
Version
...
...
public/app/plugins/datasource/prometheus/partials/config.html
View file @
9f9fca1e
<datasource-http-settings
current=
"ctrl.current"
>
<datasource-http-settings
current=
"ctrl.current"
suggest-url=
"http://localhost:9090"
>
</datasource-http-settings>
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