Changeset 734


Ignore:
Timestamp:
03/24/13 15:16:58 (9 years ago)
Author:
ramonb
Message:

templates/host_view.tpl:

  • changed report sizes

index.php:

  • added overview-host

host_view.php:

  • added overview-host

graph.php:

  • fixed load color
Location:
branches/0.4/web/addons/job_monarch
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/web/addons/job_monarch/graph.php

    r733 r734  
    523523$lower_limit = "--lower-limit 0";
    524524
     525if( !isset( $load_color ) or ( $load_color == '') )
     526{
     527    $load_color = 'FFFFFF';
     528}
     529
    525530# Calculate time range.
    526531if ( isset($sourcetime) )
     
    550555$debug=0;
    551556
    552 if( !isset( $load_color ) )
    553 {
    554     $load_color = '000000';
    555 }
    556557
    557558# Did we generate a command?   Run it.
  • branches/0.4/web/addons/job_monarch/host_view.php

    r720 r734  
    44 * This file is part of Jobmonarch
    55 *
    6  * Copyright (C) 2006  Ramon Bastiaans
     6 * Copyright (C) 2006-2013  Ramon Bastiaans
    77 *
    88 * Jobmonarch is free software; you can redistribute it and/or modify
     
    5858    global $cluster_ul, $hosts_up, $get_metric_string;
    5959    global $cluster, $period_start, $period_stop;
    60     global $job_start, $job_stop;
    61 
    62     $trd = new TarchRrdGraph( $clustername, $hostname );
    63     $rrdirs = $trd->getRrdDirs( $period_start, $period_stop );
    64 
    65     $longtitle = "Batch Archive Node Report :: Powered by Job Monarch!";
    66     $title = "Batch Archive Node Report";
     60    global $job_start, $job_stop, $view, $conf;
     61
     62    $rrdirs = array();
     63    if( $view == "overview-host" )
     64    {
     65        $trd    = new TarchRrdGraph( $clustername, $hostname );
     66        $rrdirs = $trd->getRrdDirs( $period_start, $period_stop );
     67    }
     68    else
     69    {
     70        $rrdirs[] = $conf['rrds'] . '/' . $cluster .'/'. $hostname;
     71    }
     72
     73    $longtitle    = "Batch Archive Node Report :: Powered by Job Monarch!";
     74    $title        = "Batch Archive Node Report";
    6775
    6876    makeHeader( 'host_view', $title, $longtitle );
  • branches/0.4/web/addons/job_monarch/index.php

    r727 r734  
    336336        $tpl->assign("metric_menu", $metric_menu );
    337337
    338         if( $view == "search" or $view == "host" )
     338        if( $view == "search" or $view == "host" or $view == "overview-host" )
    339339        {
    340340            $tpl->newBlock("timeperiod");
     
    351351            $tpl->assign("hostname", $hostname );
    352352
    353             if( $view == "host" )
     353            if( $view == "host" or $view == "overview-host" )
    354354            {
    355355                $tpl->newBlock("hostview");
     
    385385    }
    386386
    387     if( $view == "search" or $view == "host" )
     387    if( $view == "search" or $view == "host" or $view == "overview-host")
    388388    {
    389389
     
    489489        break;
    490490
     491    case "overview-host":
     492
     493        includeHostPage();
     494        break;
     495
    491496    default:
    492497
     
    524529        break;
    525530
     531    case "overview-host":
     532
     533        include "./host_view.php";
     534        makeHostView();
     535        break;
     536
    526537    default:
    527538
  • branches/0.4/web/addons/job_monarch/templates/host_view.tpl

    r399 r734  
    5252<TD ALIGN="CENTER" VALIGN="TOP" WIDTH="395">
    5353<IMG ALT="{cluster_url} LOAD"
    54    SRC="./graph.php?g=load_report&z=medium&c={cluster_url}&{graphargs}">
     54   SRC="./graph.php?g=load_report&z=overview-medium&c={cluster_url}&{graphargs}">
    5555<IMG ALT="{cluster_url} MEM"
    56    SRC="./graph.php?g=mem_report&z=medium&c={cluster_url}&{graphargs}">
     56   SRC="./graph.php?g=mem_report&z=overview-medium&c={cluster_url}&{graphargs}">
    5757<IMG ALT="{cluster_url} CPU"
    58    SRC="./graph.php?g=cpu_report&z=medium&c={cluster_url}&{graphargs}">
     58   SRC="./graph.php?g=cpu_report&z=overview-medium&c={cluster_url}&{graphargs}">
    5959<IMG ALT="{cluster_url} NETWORK"
    60    SRC="./graph.php?g=network_report&z=medium&c={cluster_url}&{graphargs}">
     60   SRC="./graph.php?g=network_report&z=overview-medium&c={cluster_url}&{graphargs}">
    6161<IMG ALT="{cluster_url} PACKETS"
    62    SRC="./graph.php?g=packet_report&z=medium&c={cluster_url}&{graphargs}">
     62   SRC="./graph.php?g=packet_report&z=overview-medium&c={cluster_url}&{graphargs}">
    6363
    6464</TD>
Note: See TracChangeset for help on using the changeset viewer.