Authored by FengRuwei

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

... ... @@ -28,10 +28,10 @@
<div id="content" style="background:#FFFFFF">
<div>
<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"
id="iframepage" frameborder="0" scrolling="yes" width="100%" height="900px">
<%--<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"--%>
<%--id="iframepage" frameborder="0" scrolling="yes" width="100%" height="900px">--%>
</iframe>
<%--</iframe>--%>
</div>
</div>
... ...