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
c87b4256
Commit
c87b4256
authored
Dec 16, 2015
by
Carl Bergquist
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3542 from grafana/revert-3445-cloudwatch_sum_period
Revert "(cloudwatch) add "Divide Sum By Period" option"
parents
d465c445
e320bd02
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
7 deletions
+0
-7
public/app/plugins/datasource/cloudwatch/datasource.js
+0
-3
public/app/plugins/datasource/cloudwatch/partials/query.parameter.html
+0
-3
public/app/plugins/datasource/cloudwatch/query_ctrl.js
+0
-1
No files found.
public/app/plugins/datasource/cloudwatch/datasource.js
View file @
c87b4256
...
...
@@ -330,9 +330,6 @@ function (angular, _, moment, dateMath) {
dps
.
push
([
null
,
lastTimestamp
+
periodMs
]);
}
lastTimestamp
=
timestamp
;
if
(
options
.
divideSumByPeriod
&&
stat
===
'Sum'
)
{
dp
[
stat
]
=
dp
[
stat
]
/
options
.
period
;
}
dps
.
push
([
dp
[
stat
],
timestamp
]);
});
...
...
public/app/plugins/datasource/cloudwatch/partials/query.parameter.html
View file @
c87b4256
...
...
@@ -52,9 +52,6 @@
<li>
<input
type=
"text"
class=
"input-xlarge tight-form-input"
ng-model=
"target.alias"
spellcheck=
'false'
ng-model-onblur
ng-change=
"onChange()"
>
</li>
<li
class=
"tight-form-item query-keyword"
>
Sum / Period
<editor-checkbox
text=
""
model=
"target.divideSumByPeriod"
change=
"onChange()"
></editor-checkbox>
</li>
</ul>
<div
class=
"clearfix"
></div>
</div>
...
...
public/app/plugins/datasource/cloudwatch/query_ctrl.js
View file @
c87b4256
...
...
@@ -10,7 +10,6 @@ function (angular, _) {
module
.
controller
(
'CloudWatchQueryCtrl'
,
function
(
$scope
)
{
$scope
.
init
=
function
()
{
$scope
.
target
.
divideSumByPeriod
=
$scope
.
target
.
divideSumByPeriod
||
false
;
$scope
.
aliasSyntax
=
'{{metric}} {{stat}} {{namespace}} {{region}} {{<dimension name>}}'
;
};
...
...
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