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
d3680d29
Commit
d3680d29
authored
Aug 08, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: graphite issue with metricFind and sending from/until in normal format, fixes #8997
parent
83beff30
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
public/app/features/dashboard/save_as_modal.ts
+9
-5
public/app/plugins/datasource/graphite/datasource.ts
+2
-2
No files found.
public/app/features/dashboard/save_as_modal.ts
View file @
d3680d29
...
...
@@ -44,12 +44,16 @@ export class SaveDashboardAsModalCtrl {
this
.
clone
.
editable
=
true
;
this
.
clone
.
hideControls
=
false
;
// remove alerts
this
.
clone
.
rows
.
forEach
(
row
=>
{
row
.
panels
.
forEach
(
panel
=>
{
delete
panel
.
alert
;
// remove alerts if source dashboard is already persisted
// do not want to create alert dupes
if
(
dashboard
.
id
>
0
)
{
this
.
clone
.
rows
.
forEach
(
row
=>
{
row
.
panels
.
forEach
(
panel
=>
{
delete
panel
.
thresholds
;
delete
panel
.
alert
;
});
});
}
);
}
delete
this
.
clone
.
autoUpdate
;
}
...
...
public/app/plugins/datasource/graphite/datasource.ts
View file @
d3680d29
...
...
@@ -176,8 +176,8 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
};
if
(
options
&&
options
.
range
)
{
httpOptions
.
params
.
from
=
this
.
translateTime
(
options
.
range
.
raw
.
from
,
false
);
httpOptions
.
params
.
until
=
this
.
translateTime
(
options
.
range
.
raw
.
to
,
true
);
httpOptions
.
params
.
from
=
this
.
translateTime
(
options
.
range
.
from
,
false
);
httpOptions
.
params
.
until
=
this
.
translateTime
(
options
.
range
.
to
,
true
);
}
return
this
.
doGraphiteRequest
(
httpOptions
).
then
(
results
=>
{
...
...
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