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
b4a2b96e
Commit
b4a2b96e
authored
Oct 14, 2015
by
shoonoise
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add options to manage snapshot publishing
parent
3b4c095b
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
43 additions
and
5 deletions
+43
-5
conf/defaults.ini
+6
-0
conf/sample.ini
+6
-0
pkg/api/api.go
+1
-0
pkg/api/dashboard_snapshot.go
+8
-0
pkg/setting/setting.go
+11
-0
public/app/features/dashboard/partials/shareModal.html
+3
-4
public/app/features/dashboard/shareSnapshotCtrl.js
+8
-1
No files found.
conf/defaults.ini
View file @
b4a2b96e
...
@@ -125,6 +125,12 @@ disable_gravatar = false
...
@@ -125,6 +125,12 @@ disable_gravatar = false
# data source proxy whitelist (ip_or_domain:port seperated by spaces)
# data source proxy whitelist (ip_or_domain:port seperated by spaces)
data_source_proxy_whitelist
=
data_source_proxy_whitelist
=
[snapshots]
# snapshot sharing options
external_enabled
=
true
external_snapshot_url
=
https://snapshots-origin.raintank.io
external_snapshot_name
=
Publish to snapshot.raintank.io
#################################### Users ####################################
#################################### Users ####################################
[users]
[users]
# disable user signup / registration
# disable user signup / registration
...
...
conf/sample.ini
View file @
b4a2b96e
...
@@ -120,6 +120,12 @@
...
@@ -120,6 +120,12 @@
# data source proxy whitelist (ip_or_domain:port seperated by spaces)
# data source proxy whitelist (ip_or_domain:port seperated by spaces)
;data_source_proxy_whitelist =
;data_source_proxy_whitelist =
[snapshots]
# snapshot sharing options
;external_enabled = true
;external_snapshot_url = https://snapshots-origin.raintank.io
;external_snapshot_name = Publish to snapshot.raintank.io
#################################### Users ####################################
#################################### Users ####################################
[users]
[users]
# disable user signup / registration
# disable user signup / registration
...
...
pkg/api/api.go
View file @
b4a2b96e
...
@@ -65,6 +65,7 @@ func Register(r *macaron.Macaron) {
...
@@ -65,6 +65,7 @@ func Register(r *macaron.Macaron) {
r
.
Post
(
"/api/snapshots/"
,
bind
(
m
.
CreateDashboardSnapshotCommand
{}),
CreateDashboardSnapshot
)
r
.
Post
(
"/api/snapshots/"
,
bind
(
m
.
CreateDashboardSnapshotCommand
{}),
CreateDashboardSnapshot
)
r
.
Get
(
"/dashboard/snapshot/*"
,
Index
)
r
.
Get
(
"/dashboard/snapshot/*"
,
Index
)
r
.
Get
(
"/api/snapshot/shared-options/"
,
GetSharingOptions
)
r
.
Get
(
"/api/snapshots/:key"
,
GetDashboardSnapshot
)
r
.
Get
(
"/api/snapshots/:key"
,
GetDashboardSnapshot
)
r
.
Get
(
"/api/snapshots-delete/:key"
,
DeleteDashboardSnapshot
)
r
.
Get
(
"/api/snapshots-delete/:key"
,
DeleteDashboardSnapshot
)
...
...
pkg/api/dashboard_snapshot.go
View file @
b4a2b96e
...
@@ -12,6 +12,14 @@ import (
...
@@ -12,6 +12,14 @@ import (
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/util"
)
)
func
GetSharingOptions
(
c
*
middleware
.
Context
)
{
c
.
JSON
(
200
,
util
.
DynMap
{
"externalSnapshotURL"
:
setting
.
ExternalSnapshotUrl
,
"externalSnapshotName"
:
setting
.
ExternalSnapshotName
,
"externalEnabled"
:
setting
.
ExternalEnabled
,
})
}
func
CreateDashboardSnapshot
(
c
*
middleware
.
Context
,
cmd
m
.
CreateDashboardSnapshotCommand
)
{
func
CreateDashboardSnapshot
(
c
*
middleware
.
Context
,
cmd
m
.
CreateDashboardSnapshotCommand
)
{
if
cmd
.
External
{
if
cmd
.
External
{
// external snapshot ref requires key and delete key
// external snapshot ref requires key and delete key
...
...
pkg/setting/setting.go
View file @
b4a2b96e
...
@@ -76,6 +76,11 @@ var (
...
@@ -76,6 +76,11 @@ var (
EmailCodeValidMinutes
int
EmailCodeValidMinutes
int
DataProxyWhiteList
map
[
string
]
bool
DataProxyWhiteList
map
[
string
]
bool
// Snapshots
ExternalSnapshotUrl
string
ExternalSnapshotName
string
ExternalEnabled
bool
// User settings
// User settings
AllowUserSignUp
bool
AllowUserSignUp
bool
AllowUserOrgCreate
bool
AllowUserOrgCreate
bool
...
@@ -414,6 +419,12 @@ func NewConfigContext(args *CommandLineArgs) error {
...
@@ -414,6 +419,12 @@ func NewConfigContext(args *CommandLineArgs) error {
CookieRememberName
=
security
.
Key
(
"cookie_remember_name"
)
.
String
()
CookieRememberName
=
security
.
Key
(
"cookie_remember_name"
)
.
String
()
DisableGravatar
=
security
.
Key
(
"disable_gravatar"
)
.
MustBool
(
true
)
DisableGravatar
=
security
.
Key
(
"disable_gravatar"
)
.
MustBool
(
true
)
// read snapshots settings
snapshots
:=
Cfg
.
Section
(
"snapshots"
)
ExternalSnapshotUrl
=
snapshots
.
Key
(
"external_snapshot_url"
)
.
String
()
ExternalSnapshotName
=
snapshots
.
Key
(
"external_snapshot_name"
)
.
String
()
ExternalEnabled
=
snapshots
.
Key
(
"external_enabled"
)
.
MustBool
(
true
)
// read data source proxy white list
// read data source proxy white list
DataProxyWhiteList
=
make
(
map
[
string
]
bool
)
DataProxyWhiteList
=
make
(
map
[
string
]
bool
)
for
_
,
hostAndIp
:=
range
security
.
Key
(
"data_source_proxy_whitelist"
)
.
Strings
(
" "
)
{
for
_
,
hostAndIp
:=
range
security
.
Key
(
"data_source_proxy_whitelist"
)
.
Strings
(
" "
)
{
...
...
public/app/features/dashboard/partials/shareModal.html
View file @
b4a2b96e
...
@@ -107,7 +107,7 @@
...
@@ -107,7 +107,7 @@
</script>
</script>
<script
type=
"text/ng-template"
id=
"shareSnapshot.html"
>
<script
type=
"text/ng-template"
id=
"shareSnapshot.html"
>
<
div
class
=
"ng-cloak"
ng
-
cloak
ng
-
controller
=
"ShareSnapshotCtrl"
>
<
div
class
=
"ng-cloak"
ng
-
cloak
ng
-
controller
=
"ShareSnapshotCtrl"
ng
-
init
=
"init()"
>
<
div
class
=
"share-modal-big-icon"
>
<
div
class
=
"share-modal-big-icon"
>
<
i
ng
-
if
=
"loading"
class
=
"fa fa-spinner fa-spin"
><
/i
>
<
i
ng
-
if
=
"loading"
class
=
"fa fa-spinner fa-spin"
><
/i
>
<
i
ng
-
if
=
"!loading"
class
=
"gf-icon gf-icon-snap-multi"
><
/i
>
<
i
ng
-
if
=
"!loading"
class
=
"gf-icon gf-icon-snap-multi"
><
/i
>
...
@@ -175,10 +175,9 @@
...
@@ -175,10 +175,9 @@
<
i
class
=
"fa fa-save"
><
/i
>
<
i
class
=
"fa fa-save"
><
/i
>
Local
Snapshot
Local
Snapshot
<
/button
>
<
/button
>
<
button
class
=
"btn btn-primary btn-large"
ng
-
if
=
"externalEnabled"
ng
-
click
=
"createSnapshot(true)"
ng
-
disabled
=
"loading"
>
<
button
class
=
"btn btn-primary btn-large"
ng
-
click
=
"createSnapshot(true)"
ng
-
disabled
=
"loading"
>
<
i
class
=
"fa fa-cloud-upload"
><
/i
>
<
i
class
=
"fa fa-cloud-upload"
><
/i
>
Publish
to
snapshot
.
raintank
.
io
{{
sharingButtonText
}}
<
/button
>
<
/button
>
<
/div
>
<
/div
>
...
...
public/app/features/dashboard/shareSnapshotCtrl.js
View file @
b4a2b96e
...
@@ -29,7 +29,14 @@ function (angular, _) {
...
@@ -29,7 +29,14 @@ function (angular, _) {
{
text
:
'Public on the web'
,
value
:
3
},
{
text
:
'Public on the web'
,
value
:
3
},
];
];
$scope
.
externalUrl
=
'//snapshots-origin.raintank.io'
;
$scope
.
init
=
function
()
{
backendSrv
.
get
(
'/api/snapshot/shared-options'
).
then
(
function
(
options
)
{
$scope
.
externalUrl
=
options
[
'externalSnapshotURL'
];
$scope
.
sharingButtonText
=
options
[
'externalSnapshotName'
];
$scope
.
externalEnabled
=
options
[
'externalEnabled'
];
});
};
$scope
.
apiUrl
=
'/api/snapshots'
;
$scope
.
apiUrl
=
'/api/snapshots'
;
$scope
.
createSnapshot
=
function
(
external
)
{
$scope
.
createSnapshot
=
function
(
external
)
{
...
...
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