RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Rickshaw/D3 version mismatch. 

When Rickshaw was updated to 1.5.1 in
fd43daf82e,
the Rickshaw upstream package now contained 3 different D3 files:

d3.min.js
d3.v2.js
d3.v3.js

For details on why that is, see
https://groups.google.com/forum/#!topic/d3-js/lXQgKA7mtEw

For the 1.5.1 Rickshaw to work properly (being able to format dates with
D3 without causing a JS error), it needs d3.v2.js or d3.v3.js, not the
d3.min.js one. I chose to update us to d3.v3.js now, since that is the
most recent and minified version, and I didn't see any problems with it
(also, the current Rickshaw examples are using that D3 version).

Currently, displaying graphs with a range >14d is broken. This fixes
that.
This commit is contained in:
Julius Volz 2015-02-02 22:57:47 +01:00
parent 63a79821fc
commit b3978fe869
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console_libraries/prom.lib
View File

@ -4,7 +4,7 @@
<link type="text/css" rel="stylesheet" href="/static/vendor/rickshaw/rickshaw.min.css"> <link type="text/css" rel="stylesheet" href="/static/vendor/rickshaw/rickshaw.min.css">
<link type="text/css" rel="stylesheet" href="/static/vendor/bootstrap-3.3.1/css/bootstrap.min.css"> <link type="text/css" rel="stylesheet" href="/static/vendor/bootstrap-3.3.1/css/bootstrap.min.css">
<link type="text/css" rel="stylesheet" href="/static/css/prom_console.css"> <link type="text/css" rel="stylesheet" href="/static/css/prom_console.css">
<script src="/static/vendor/rickshaw/vendor/d3.min.js"></script> <script src="/static/vendor/rickshaw/vendor/d3.v3.js"></script>
<script src="/static/vendor/rickshaw/vendor/d3.layout.min.js"></script> <script src="/static/vendor/rickshaw/vendor/d3.layout.min.js"></script>
<script src="/static/vendor/rickshaw/rickshaw.min.js"></script> <script src="/static/vendor/rickshaw/rickshaw.min.js"></script>
<script src="/static/vendor/js/jquery.min.js"></script> <script src="/static/vendor/js/jquery.min.js"></script>

2
web/static/vendor/rickshaw/vendor/d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
web/static/vendor/rickshaw/vendor/d3.v3.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
web/templates/graph.html
View File

@ -6,7 +6,7 @@
<link type="text/css" rel="stylesheet" href="/static/vendor/rickshaw/rickshaw.min.css"> <link type="text/css" rel="stylesheet" href="/static/vendor/rickshaw/rickshaw.min.css">
<link type="text/css" rel="stylesheet" href="/static/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css"> <link type="text/css" rel="stylesheet" href="/static/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css">
<script src="/static/vendor/rickshaw/vendor/d3.min.js"></script> <script src="/static/vendor/rickshaw/vendor/d3.v3.js"></script>
<script src="/static/vendor/rickshaw/vendor/d3.layout.min.js"></script> <script src="/static/vendor/rickshaw/vendor/d3.layout.min.js"></script>
<script src="/static/vendor/rickshaw/rickshaw.min.js"></script> <script src="/static/vendor/rickshaw/rickshaw.min.js"></script>
<script src="/static/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.js"></script> <script src="/static/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.js"></script>