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
6267ef13
Commit
6267ef13
authored
Nov 01, 2017
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
datasource as cfg: fixes typos
parent
6e82dbaf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
conf/datasources/datasources.yaml
+2
-2
pkg/cmd/grafana-server/server.go
+0
-1
No files found.
conf/datasources/datasources.yaml
View file @
6267ef13
...
@@ -36,9 +36,9 @@ datasources:
...
@@ -36,9 +36,9 @@ datasources:
# json_data: '{"graphiteVersion":"0.9"}'
# json_data: '{"graphiteVersion":"0.9"}'
# # <string> json object of data that will be encrypted in UI.
# # <string> json object of data that will be encrypted in UI.
# secure_json_fields: ''
# secure_json_fields: ''
# # <int> including this value garantees that instance with old configs cannot
# # <int> including this value g
u
arantees that instance with old configs cannot
# # overwrite your last change.
# # overwrite your last change.
# version: 1
# version: 1
# # <bool> allow users to edit datasources from the UI.
# # <bool> allow users to edit datasources from the UI.
# editable:
tru
e
# editable:
fals
e
pkg/cmd/grafana-server/server.go
View file @
6267ef13
...
@@ -66,7 +66,6 @@ func (g *GrafanaServerImpl) Start() {
...
@@ -66,7 +66,6 @@ func (g *GrafanaServerImpl) Start() {
social
.
NewOAuthService
()
social
.
NewOAuthService
()
plugins
.
Init
()
plugins
.
Init
()
//if err := provisioning.StartUp(setting.HomePath); err != nil {
if
err
:=
provisioning
.
StartUp
(
setting
.
DatasourcesPath
);
err
!=
nil
{
if
err
:=
provisioning
.
StartUp
(
setting
.
DatasourcesPath
);
err
!=
nil
{
logger
.
Error
(
"Failed to provision Grafana from config"
,
"error"
,
err
)
logger
.
Error
(
"Failed to provision Grafana from config"
,
"error"
,
err
)
g
.
Shutdown
(
1
,
"Startup failed"
)
g
.
Shutdown
(
1
,
"Startup failed"
)
...
...
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