Changeset 734

Timestamp:

03/24/13 15:16:58 (10 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:

• graph.php (modified) (2 diffs)
• host_view.php (modified) (2 diffs)
• index.php (modified) (5 diffs)
• templates/host_view.tpl (modified) (1 diff)

branches/0.4/web/addons/job_monarch/graph.php

@@ -523 +523 @@
 $lower_limit = "--lower-limit 0";
 
+if( !isset( $load_color ) or ( $load_color == '') )
+{
+    $load_color = 'FFFFFF';
+}
+
 # Calculate time range.
 if ( isset($sourcetime) )
@@ -550 +555 @@
 $debug=0;
 
-if( !isset( $load_color ) )
-{
-    $load_color = '000000';
-}
 
 # Did we generate a command?   Run it.

branches/0.4/web/addons/job_monarch/host_view.php

@@ -4 +4 @@
  * This file is part of Jobmonarch
  *
- * Copyright (C) 2006  Ramon Bastiaans
+ * Copyright (C) 2006-2013  Ramon Bastiaans
  *
  * Jobmonarch is free software; you can redistribute it and/or modify
@@ -58 +58 @@
     global $cluster_ul, $hosts_up, $get_metric_string;
     global $cluster, $period_start, $period_stop;
-    global $job_start, $job_stop;
-
-    $trd = new TarchRrdGraph( $clustername, $hostname );
-    $rrdirs = $trd->getRrdDirs( $period_start, $period_stop );
-
-    $longtitle = "Batch Archive Node Report :: Powered by Job Monarch!";
-    $title = "Batch Archive Node Report";
+    global $job_start, $job_stop, $view, $conf;
+
+    $rrdirs = array();
+    if( $view == "overview-host" )
+    {
+        $trd    = new TarchRrdGraph( $clustername, $hostname );
+        $rrdirs = $trd->getRrdDirs( $period_start, $period_stop );
+    }
+    else
+    {
+        $rrdirs[] = $conf['rrds'] . '/' . $cluster .'/'. $hostname;
+    }
+
+    $longtitle    = "Batch Archive Node Report :: Powered by Job Monarch!";
+    $title        = "Batch Archive Node Report";
 
     makeHeader( 'host_view', $title, $longtitle );

branches/0.4/web/addons/job_monarch/index.php

@@ -336 +336 @@
         $tpl->assign("metric_menu", $metric_menu );
 
-        if( $view == "search" or $view == "host" ) 
+        if( $view == "search" or $view == "host" or $view == "overview-host" ) 
         {
             $tpl->newBlock("timeperiod");
@@ -351 +351 @@
             $tpl->assign("hostname", $hostname );
 
-            if( $view == "host" ) 
+            if( $view == "host" or $view == "overview-host" ) 
             {
                 $tpl->newBlock("hostview");
@@ -385 +385 @@
     }
 
-    if( $view == "search" or $view == "host" ) 
+    if( $view == "search" or $view == "host" or $view == "overview-host") 
     {
 
@@ -489 +489 @@
         break;
 
+    case "overview-host":
+
+        includeHostPage();
+        break;
+
     default:
 
@@ -524 +529 @@
         break;
 
+    case "overview-host":
+
+        include "./host_view.php";
+        makeHostView();
+        break;
+
     default:
 

branches/0.4/web/addons/job_monarch/templates/host_view.tpl

@@ -52 +52 @@
 <TD ALIGN="CENTER" VALIGN="TOP" WIDTH="395">
 <IMG ALT="{cluster_url} LOAD"
-   SRC="./graph.php?g=load_report&z=medium&c={cluster_url}&{graphargs}">
+   SRC="./graph.php?g=load_report&z=overview-medium&c={cluster_url}&{graphargs}">
 <IMG ALT="{cluster_url} MEM"
-   SRC="./graph.php?g=mem_report&z=medium&c={cluster_url}&{graphargs}">
+   SRC="./graph.php?g=mem_report&z=overview-medium&c={cluster_url}&{graphargs}">
 <IMG ALT="{cluster_url} CPU"
-   SRC="./graph.php?g=cpu_report&z=medium&c={cluster_url}&{graphargs}">
+   SRC="./graph.php?g=cpu_report&z=overview-medium&c={cluster_url}&{graphargs}">
 <IMG ALT="{cluster_url} NETWORK"
-   SRC="./graph.php?g=network_report&z=medium&c={cluster_url}&{graphargs}">
+   SRC="./graph.php?g=network_report&z=overview-medium&c={cluster_url}&{graphargs}">
 <IMG ALT="{cluster_url} PACKETS"
-   SRC="./graph.php?g=packet_report&z=medium&c={cluster_url}&{graphargs}">
+   SRC="./graph.php?g=packet_report&z=overview-medium&c={cluster_url}&{graphargs}">
 
 </TD>