RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-27 00:53:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2371 fix to display utc date at datetime picker

Browse Source
This commit is contained in:
Takahito Yamatoya 2017-09-16 11:38:29 +09:00
parent 3369422327
commit 738a51bea6
5 changed files with 76 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
web/ui/bindata.go
View File

File diff suppressed because one or more lines are too long

1
web/ui/static/js/graph.js
View File

@ -120,6 +120,7 @@ Prometheus.Graph.prototype.initialize = function() {
showTodayButton: true, showTodayButton: true,
showClear: true, showClear: true,
showClose: true, showClose: true,
timeZone: 'UTC',
}); });
if (self.options.end_input) { if (self.options.end_input) {
self.endDate.data('DateTimePicker').date(self.options.end_input); self.endDate.data('DateTimePicker').date(self.options.end_input);

2
web/ui/static/js/graph_template.handlebar
View File

@ -77,7 +77,7 @@
<input <input
class="pull-left date_input input" class="pull-left date_input input"
id="end{{id}}" id="end{{id}}"
title="End time of graph" title="End time of graph (UTC)"
placeholder="Until" placeholder="Until"
data-format="yyyy-MM-dd" data-format="yyyy-MM-dd"
type="text" type="text"

7
web/ui/static/vendor/moment/moment-timezone-with-data.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
web/ui/templates/graph.html
View File

@ -8,6 +8,7 @@
<script src="{{ pathPrefix }}/static/vendor/rickshaw/vendor/d3.layout.min.js?v={{ buildVersion }}"></script> <script src="{{ pathPrefix }}/static/vendor/rickshaw/vendor/d3.layout.min.js?v={{ buildVersion }}"></script>
<script src="{{ pathPrefix }}/static/vendor/rickshaw/rickshaw.min.js?v={{ buildVersion }}"></script> <script src="{{ pathPrefix }}/static/vendor/rickshaw/rickshaw.min.js?v={{ buildVersion }}"></script>
<script src="{{ pathPrefix }}/static/vendor/moment/moment.min.js?v={{ buildVersion }}"></script> <script src="{{ pathPrefix }}/static/vendor/moment/moment.min.js?v={{ buildVersion }}"></script>
<script src="{{ pathPrefix }}/static/vendor/moment/moment-timezone-with-data.min.js?v={{ buildVersion }}"></script>
<script src="{{ pathPrefix }}/static/vendor/eonasdan-bootstrap-datetimepicker/bootstrap-datetimepicker.min.js?v={{ buildVersion }}"></script> <script src="{{ pathPrefix }}/static/vendor/eonasdan-bootstrap-datetimepicker/bootstrap-datetimepicker.min.js?v={{ buildVersion }}"></script>
<script src="{{ pathPrefix }}/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js?v={{ buildVersion }}"></script> <script src="{{ pathPrefix }}/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js?v={{ buildVersion }}"></script>
<script src="{{ pathPrefix }}/static/vendor/fuzzy/fuzzy.js?v={{ buildVersion }}"></script> <script src="{{ pathPrefix }}/static/vendor/fuzzy/fuzzy.js?v={{ buildVersion }}"></script>