Ignore:
Timestamp:
03/27/13 20:50:05 (11 years ago)
Author:
ramonb
Message:

host_view.php,
templates/host_view.tpl:

graph.php:

  • set range as title if it's not job

libtoga.php:

  • remove some timestamp from metrics
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/web/addons/job_monarch/templates/host_view.tpl

    r737 r759  
    22<TR>
    33  <TD COLSPAN="2" BGCOLOR="#EEEEEE" ALIGN="CENTER">
    4   <FONT SIZE="+2">{host} Overview</FONT>
     4  <FONT SIZE="+2">{$host} Overview</FONT>
    55  </TD>
    66</TR>
     
    99 <TD ALIGN="LEFT" VALIGN="TOP">
    1010
    11 <IMG SRC="{node_image}" HEIGHT="60" WIDTH="30" ALT="{host}" BORDER="0">
    12 {node_msg}
     11<IMG SRC="{$node_image}" HEIGHT="60" WIDTH="30" ALT="{$host}" BORDER="0">
     12{$node_msg}
    1313<P>
    1414
     
    1818</TR>
    1919
    20 <!-- START BLOCK : string_metric_info -->
     20{loop $string_metric_info}
    2121<TR>
    22  <TD CLASS=footer WIDTH=30%>{name}</TD><TD>{value}</TD>
     22 <TD CLASS=footer WIDTH=30%>{$name}</TD><TD>{$value}</TD>
    2323</TR>
    24 <!-- END BLOCK : string_metric_info -->
     24{/loop}
    2525
    2626<TR><TD>&nbsp;</TD></TR>
     
    3030</TR>
    3131
    32 <!-- START BLOCK : const_metric_info -->
     32{loop $const_metric_info}
    3333<TR>
    34  <TD CLASS=footer WIDTH=30%>{name}</TD><TD>{value}</TD>
     34 <TD CLASS=footer WIDTH=30%>{$name}</TD><TD>{$value}</TD>
    3535</TR>
    36 <!-- END BLOCK : const_metric_info -->
     36{/loop}
    3737
    3838<TR><TD>&nbsp;</TD></TR>
     
    4040<TR>
    4141 <TD COLSPAN=2 CLASS=title>
    42  <a href="../../host_gmetrics.php?c={cluster_url}&h={host}">Gmetrics</a>
     42 <a href="../../host_gmetrics.php?c={$cluster_url}&h={$host}">Gmetrics</a>
    4343 </TD>
    4444</TR>
    4545</TABLE>
    4646
    47 <a href="./?c={cluster}&h={host}">
    48 <IMG SRC="./image.php?c={cluster}&h={host}&j_view=hostimage" BORDER=0>
     47<a href="./?c={$cluster}&h={$host}">
     48<IMG SRC="./image.php?c={$cluster}&h={$host}&j_view=hostimage" BORDER=0>
    4949</a>
    5050<hr>
     
    5353
    5454<TD ALIGN="CENTER" VALIGN="TOP" WIDTH="395">
    55 <IMG ALT="{cluster_url} LOAD"
    56    SRC="./graph.php?g=load_report&z=overview-medium&c={cluster_url}&{graphargs}">
    57 <IMG ALT="{cluster_url} MEM"
    58    SRC="./graph.php?g=mem_report&z=overview-medium&c={cluster_url}&{graphargs}">
    59 <IMG ALT="{cluster_url} CPU"
    60    SRC="./graph.php?g=cpu_report&z=overview-medium&c={cluster_url}&{graphargs}">
    61 <IMG ALT="{cluster_url} NETWORK"
    62    SRC="./graph.php?g=network_report&z=overview-medium&c={cluster_url}&{graphargs}">
    63 <IMG ALT="{cluster_url} PACKETS"
    64    SRC="./graph.php?g=packet_report&z=overview-medium&c={cluster_url}&{graphargs}">
    65 
     55<div id="monarchimage">
     56<IMG ALT="{$cluster_url} LOAD" SRC="./graph.php?g=load_report&z=overview-medium&c={$cluster_url}&{$graphargs}" WIDTH=381 HEIGHT=148>
     57<IMG ALT="{$cluster_url} MEM" SRC="./graph.php?g=mem_report&z=overview-medium&c={$cluster_url}&{$graphargs}" WIDTH=381 HEIGHT=148>
     58<IMG ALT="{$cluster_url} CPU" SRC="./graph.php?g=cpu_report&z=overview-medium&c={$cluster_url}&{$graphargs}" WIDTH=381 HEIGHT=148>
     59<IMG ALT="{$cluster_url} NETWORK" SRC="./graph.php?g=network_report&z=overview-medium&c={$cluster_url}&{$graphargs}" WIDTH=381 HEIGHT=148>
     60<IMG ALT="{$cluster_url} PACKETS" SRC="./graph.php?g=packet_report&z=overview-medium&c={$cluster_url}&{$graphargs}" WIDTH=381 HEIGHT=148>
     61</div>
    6662</TD>
    6763</TR>
     
    7268<TR>
    7369  <TD CLASS=title>
    74   {host} <strong>graphs</strong>
    75   last <strong>{range}</strong>
    76   sorted <strong>{sort}</strong>
     70  {$host} <strong>graphs</strong>
     71  last <strong>{$range}</strong>
     72  sorted <strong>{$sort}</strong>
    7773  </TD>
    7874</TR>
     
    8480 <TD>
    8581
    86 <!-- START BLOCK : vol_metric_info -->
    87 <IMG ALT="{alt}" SRC="./graph.php?{graphargs}">{br}
    88 <!-- END BLOCK : vol_metric_info -->
     82<div id="monarchimage">
     83{loop $vol_metric_info}
     84<IMG ALT="{$alt}" SRC="./graph.php?{$graphargs}" WIDTH=381 HEIGHT=148>
     85{/loop}
     86</div>
    8987
    9088 </TD>
Note: See TracChangeset for help on using the changeset viewer.