From 45baa47bcbca0caa0c8f2c930bb5b4307d4bfba9 Mon Sep 17 00:00:00 2001 From: hugetoad Date: Thu, 27 Dec 2001 08:33:08 +0000 Subject: - added srv_status.html and services.html (Alexei) - added table services and services_links (Alexei) - support for parameter StartAgents in zabbix_agentd.conf (Alexei) git-svn-id: svn://svn.zabbix.com/trunk@270 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/chart2.html | 18 ++-- frontends/php/include/config.inc | 51 ++++++++++- frontends/php/services.html | 178 +++++++++++++++++++++++++++++++++++++++ frontends/php/srv_status.html | 53 ++++++++++++ 4 files changed, 292 insertions(+), 8 deletions(-) create mode 100644 frontends/php/services.html create mode 100644 frontends/php/srv_status.html (limited to 'frontends/php') diff --git a/frontends/php/chart2.html b/frontends/php/chart2.html index b72e976b..07f85468 100644 --- a/frontends/php/chart2.html +++ b/frontends/php/chart2.html @@ -27,16 +27,18 @@ $sizeX=$width; $sizeY=$height; - $shiftX=10; - $shiftYup=10; - $shiftYdown=25; - $nodata=1; Header( "Content-type: text/html"); // Header( "Content-type: image/png"); Header( "Expires: Mon, 17 Aug 1998 12:51:50 GMT"); + $result2=DBselect("select gi.itemid,i.description,gi.color,h.host from graphs_items gi,items i,hosts h where gi.itemid=i.itemid and gi.graphid=$graphid and i.hostid=h.hostid order by gi.gitemid"); + + $shiftX=10; + $shiftYup=10; + $shiftYdown=7+15*DBnum_rows($result2); + $im = imagecreate($sizeX+$shiftX+61,$sizeY+$shiftYup+$shiftYdown+10); $red=ImageColorAllocate($im,255,0,0); @@ -80,7 +82,6 @@ $from_time = time(NULL)-$period-3600*$from; $to_time = time(NULL)-3600*$from; - $result2=DBselect("select gi.itemid,i.description,gi.color from graphs_items gi,items i where gi.itemid=i.itemid and gi.graphid=$graphid order by gi.gitemid"); $len=array(); $x=array(); @@ -98,6 +99,7 @@ $itemid=DBget_field($result2,$item,0); $desc[$item]=DBget_field($result2,$item,1); $color[$item]=DBget_field($result2,$item,2); + $host[$item]=DBget_field($result2,$item,3); $result=DBselect("select clock,value from history where itemid=$itemid and clock>$from_time and clock<$to_time order by clock"); $len[$item]=0; @@ -142,8 +144,10 @@ { ImageLine($im,$shiftX,$shiftYup+$sizeY/2,$sizeX+$shiftX,$shiftYup+$sizeY/2,$colors[$color[$item]]); } - ImageFilledRectangle($im,$shiftX+200*$item,$sizeY+$shiftYup+19,$shiftX+200*$item+5,$sizeY+$shiftYup+15+9,$colors[$color[$item]]); - ImageString($im, 2,$shiftX+200*$item+9,$sizeY+$shiftYup+15, $desc[$item], $gray); +# ImageFilledRectangle($im,$shiftX+200*$item,$sizeY+$shiftYup+19,$shiftX+200*$item+5,$sizeY+$shiftYup+15+9,$colors[$color[$item]]); +# ImageString($im, 2,$shiftX+200*$item+9,$sizeY+$shiftYup+15, $desc[$item], $gray); + ImageFilledRectangle($im,$shiftX,$sizeY+$shiftYup+19+15*$item,$shiftX+5,$sizeY+$shiftYup+15+9+15*$item,$colors[$color[$item]]); + ImageString($im, 2,$shiftX+9,$sizeY+$shiftYup+15*$item+15, $host[$item].": ".$desc[$item], $gray); } if($nodata == 0) diff --git a/frontends/php/include/config.inc b/frontends/php/include/config.inc index 4586397b..c2c777a1 100644 --- a/frontends/php/include/config.inc +++ b/frontends/php/include/config.inc @@ -465,6 +465,21 @@ { echo "GRAPHS"; } +?> + + + + + +[SERVICES]"; + } + else + { + echo "SERVICES"; + } ?> @@ -485,7 +500,7 @@ ?> - + "; } +?> + + + + + +[SERVICES]"; + } + else + { + echo "SERVICES"; + } ?> @@ -860,6 +890,25 @@ return DBexecute($sql); } + function add_service($name,$triggerid,$linktrigger) + { + if( isset($linktrigger)&&($linktrigger=="on") ) + { + $sql="insert into services (serviceid,name,triggerid) values (NULL,'$name',$triggerid)"; + } + else + { + $sql="insert into services (serviceid,name) values (NULL,'$name')"; + } + return DBexecute($sql); + } + + function add_service_link($servicedownid,$serviceupid) + { + $sql="insert into services_links (servicedownid,serviceupid) values ($servicedownid,$serviceupid)"; + return DBexecute($sql); + } + # Update Action function update_action( $actionid, $userid, $good, $delay, $subject, $message ) diff --git a/frontends/php/services.html b/frontends/php/services.html new file mode 100644 index 00000000..afde6132 --- /dev/null +++ b/frontends/php/services.html @@ -0,0 +1,178 @@ + + + + +"; + + show_table_header("SERVICES"); +?> +"; + echo "\n"; + echo "Service"; + echo "\n"; + $col=0; + for($i=0;$i"; + } + else + { + if($col==1) + { + echo ""; + $col=0; + } else + { + echo ""; + $col=1; + } + } + echo "$name_"; + echo ""; + } + echo ""; +?> + +"; + show_table2_header_begin(); + echo "New service"; + + show_table2_v_delimiter(); + echo "
"; + if(isset($serviceid)) + { + echo ""; + } + echo "Name"; + show_table2_h_delimiter(); + echo ""; + + show_table2_v_delimiter(); + echo "Link to trigger ?"; + show_table2_h_delimiter(); + if(isset($linktrigger)&&($triggerid!="")) + { + echo ""; + } + else + { + echo ""; + } + + show_table2_v_delimiter(); + echo "Trigger"; + show_table2_h_delimiter(); + $result=DBselect("select triggerid,description from triggers order by description"); + echo ""; + show_table2_v_delimiter2(); + echo ""; + if(isset($serviceid)) + { + echo ""; + } + + show_table2_header_end(); +?> + +"; + show_table2_header_begin(); + echo "New link"; + + show_table2_v_delimiter(); + echo ""; + if(isset($serviceid)) + { + echo ""; + echo ""; + } + echo "Name"; + show_table2_h_delimiter(); + $result=DBselect("select serviceid,triggerid,name from services order by name"); + echo ""; + show_table2_v_delimiter2(); + echo ""; + + show_table2_header_end(); +?> + + diff --git a/frontends/php/srv_status.html b/frontends/php/srv_status.html new file mode 100644 index 00000000..ed02663f --- /dev/null +++ b/frontends/php/srv_status.html @@ -0,0 +1,53 @@ + + +"; + + show_table_header("SERVICES"); +?> +"; + echo "\n"; + echo "Service"; + echo "\n"; + $col=0; + for($i=0;$i"; + } + else + { + if($col==1) + { + echo ""; + $col=0; + } else + { + echo ""; + $col=1; + } + } + echo "$name_"; + echo ""; + } + echo ""; +?> + + -- cgit