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
28b0ae1d
Commit
28b0ae1d
authored
Nov 01, 2018
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added new backend setting for license file
parent
6a9e18c9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
6 deletions
+17
-6
conf/defaults.ini
+4
-0
conf/sample.ini
+5
-0
pkg/setting/setting.go
+8
-6
No files found.
conf/defaults.ini
View file @
28b0ae1d
...
...
@@ -557,3 +557,7 @@ callback_url =
[panels]
enable_alpha
=
false
[enterprise]
license_path
=
conf/sample.ini
View file @
28b0ae1d
...
...
@@ -475,3 +475,8 @@ log_queries =
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
;server_url =
;callback_url =
[enterprise]
# Path to a valid Grafana Enterprise license.jwt file
;license_path =
pkg/setting/setting.go
View file @
28b0ae1d
...
...
@@ -209,12 +209,10 @@ type Cfg struct {
RendererLimitAlerting
int
DisableBruteForceLoginProtection
bool
TempDataLifetime
time
.
Duration
MetricsEndpointEnabled
bool
EnableAlphaPanels
bool
TempDataLifetime
time
.
Duration
MetricsEndpointEnabled
bool
EnableAlphaPanels
bool
EnterpriseLicensePath
string
}
type
CommandLineArgs
struct
{
...
...
@@ -715,6 +713,10 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
imageUploadingSection
:=
iniFile
.
Section
(
"external_image_storage"
)
ImageUploadProvider
=
imageUploadingSection
.
Key
(
"provider"
)
.
MustString
(
""
)
enterprise
:=
iniFile
.
Section
(
"enterprise"
)
cfg
.
EnterpriseLicensePath
=
enterprise
.
Key
(
"license_path"
)
.
MustString
(
filepath
.
Join
(
cfg
.
DataPath
,
"license.jwt"
))
return
nil
}
...
...
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