Merge branch 'yamatoya-fix_web_ui_utc' into release-1.7

web/ui/static/js/graph.js

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

web/ui/static/js/graph_template.handlebar

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

web/ui/templates/graph.html

@@ -8,6 +8,7 @@
     <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/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/bootstrap3-typeahead/bootstrap3-typeahead.min.js?v={{ buildVersion }}"></script>
     <script src="{{ pathPrefix }}/static/vendor/fuzzy/fuzzy.js?v={{ buildVersion }}"></script>