ops / monitor-ui · Commits

Go to a project

Authored by FengRuwei
Commit 806ca87fa6a44ff9ecd3c9c93f8e9614e005eff1 2 parents b8c9be27 066c449a

Merge branch 'master' of http://git.yoho.cn/ops/monitor-ui

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
@@ -28,10 +28,10 @@ @@ -28,10 +28,10 @@
28 <div id="content" style="background:#FFFFFF"> 28 <div id="content" style="background:#FFFFFF">
29 <div> 29 <div>
30 30
31 - <iframe src="http://aws-monitor.yohops.com/monitor/monitor.html?streams=%5B%7B%22name%22%3A%22%22%2C%22stream%22%3A%22http%3A%2F%2F127.0.0.1%3A8080%2Fturbine%2Fturbine.stream%3Fcluster%3Dyhpro%22%2C%22auth%22%3A%22%22%2C%22delay%22%3A%22%22%7D%5D"  
32 - id="iframepage" frameborder="0" scrolling="yes" width="100%" height="900px"> 31 + <%--<iframe src="http://aws-monitor.yohops.com/monitor/monitor.html?streams=%5B%7B%22name%22%3A%22%22%2C%22stream%22%3A%22http%3A%2F%2F127.0.0.1%3A8080%2Fturbine%2Fturbine.stream%3Fcluster%3Dyhpro%22%2C%22auth%22%3A%22%22%2C%22delay%22%3A%22%22%7D%5D"--%>
  32 + <%--id="iframepage" frameborder="0" scrolling="yes" width="100%" height="900px">--%>
33 33
34 - </iframe> 34 + <%--</iframe>--%>
35 35
36 </div> 36 </div>
37 </div> 37 </div>