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
1e4ff1e7
Commit
1e4ff1e7
authored
May 29, 2014
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added config setting for default playlist timespan
parent
0f40e06d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
3 deletions
+9
-3
CHANGELOG.md
+1
-0
src/app/components/settings.js
+1
-1
src/app/controllers/playlistCtrl.js
+1
-1
src/config.sample.js
+6
-1
No files found.
CHANGELOG.md
View file @
1e4ff1e7
...
...
@@ -2,6 +2,7 @@ vNext
-
New Y-axis formater for metric values that represent seconds (Issue #427) - thx @jippi
-
Allow special characters in serie names (influxdb datasource), PR #390 - thx @majst01
-
Refactoring of filterSrv (Issue #428), thx @Tetha
-
New config for playlist feature. Set playlist_timespan to set default playlist interval (Issue #445) - thx @rmca
# Fixes
-
Filter option loading when having muliple nested filters now works better.
...
...
src/app/components/settings.js
View file @
1e4ff1e7
...
...
@@ -25,7 +25,7 @@ function (_, crypto) {
grafana_index
:
'grafana-dash'
,
elasticsearch_all_disabled
:
false
,
timezoneOffset
:
null
,
playlist
Timespan
:
"15s
"
,
playlist
_timespan
:
"1m
"
,
unsaved_changes_warning
:
true
};
...
...
src/app/controllers/playlistCtrl.js
View file @
1e4ff1e7
...
...
@@ -11,7 +11,7 @@ function (angular, _, config) {
module
.
controller
(
'PlaylistCtrl'
,
function
(
$scope
,
playlistSrv
)
{
$scope
.
init
=
function
()
{
$scope
.
timespan
=
config
.
playlist
T
imespan
;
$scope
.
timespan
=
config
.
playlist
_t
imespan
;
$scope
.
loadFavorites
();
$scope
.
$on
(
'modal-opened'
,
$scope
.
loadFavorites
);
};
...
...
src/config.sample.js
View file @
1e4ff1e7
...
...
@@ -14,7 +14,6 @@ function (Settings) {
* For Basic authentication use: http://username:password@domain.com:9200
*/
elasticsearch
:
"http://"
+
window
.
location
.
hostname
+
":9200"
,
playlistTimespan
:
"15s"
,
/**
* graphite-web url:
...
...
@@ -69,6 +68,12 @@ function (Settings) {
*/
unsaved_changes_warning
:
true
,
/**
* set the default timespan for the playlist feature
* Example: "1m", "1h"
*/
playlist_timespan
:
"1m"
,
panel_names
:
[
'text'
,
'graphite'
...
...
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