diff options
Diffstat (limited to 'frontends/php')
| -rw-r--r-- | frontends/php/actions.html | 23 | ||||
| -rw-r--r-- | frontends/php/alerts.html | 2 | ||||
| -rw-r--r-- | frontends/php/chart2.html | 4 | ||||
| -rw-r--r-- | frontends/php/include/config.inc | 2 | ||||
| -rw-r--r-- | frontends/php/latestalarms.html | 2 | ||||
| -rw-r--r-- | frontends/php/trend.html | 2 | ||||
| -rw-r--r-- | frontends/php/triggers.html | 2 |
7 files changed, 27 insertions, 10 deletions
diff --git a/frontends/php/actions.html b/frontends/php/actions.html index a3888967..138bc4d9 100644 --- a/frontends/php/actions.html +++ b/frontends/php/actions.html @@ -124,10 +124,27 @@ } else { + $sql="select description from triggers where triggerid=$triggerid"; + $result=DBselect($sql); + $description=DBget_field($result,0,0); + $good=1; $delay=30; $subject=$description; - $message=""; + + $sql="select i.description, h.host, i.key_ from hosts h, items i,functions f where f.triggerid=$triggerid and h.hostid=i.hostid and f.itemid=i.itemid order by i.description"; + $result=DBselect($sql); + $message="<INSERT YOUR MESSAGE HERE>\n\n------Latest data------\n\n"; + for($i=0;$i<DBnum_rows($result);$i++) + { + $description=DBget_field($result,$i,0); + $host=DBget_field($result,$i,1); + $key=DBget_field($result,$i,2); + $message=$message."$description: \{$host:$key.last(0)} (latest value)\n"; + $message=$message."$description: \{$host:$key.max(300)} (maxumum value for latest 5 min)\n"; + $message=$message."$description: \{$host:$key.min(300)} (minimum value for last 5 min)\n\n"; + } + $message=$message."---------End--------\n"; } echo "<br>"; show_table2_header_begin(); @@ -177,12 +194,12 @@ show_table2_v_delimiter(); echo "Subject"; show_table2_h_delimiter(); - echo "<input name=\"subject\" value=\"$subject\" size=50>"; + echo "<input name=\"subject\" value=\"$subject\" size=70>"; show_table2_v_delimiter(); echo "Message"; show_table2_h_delimiter(); - echo "<textarea name=\"message\" cols=50 ROWS=\"5\" wrap=\"soft\">$message</TEXTAREA>"; + echo "<textarea name=\"message\" cols=70 ROWS=\"7\" wrap=\"soft\">$message</TEXTAREA>"; show_table2_v_delimiter2(); echo "<input type=\"submit\" name=\"register\" value=\"add\">"; diff --git a/frontends/php/alerts.html b/frontends/php/alerts.html index d01a885b..08e61fa9 100644 --- a/frontends/php/alerts.html +++ b/frontends/php/alerts.html @@ -2,7 +2,7 @@ include "include/config.inc"; $page["title"] = "Alerts"; $page["file"] = "alerts.html"; - show_header($page["title"],0,0); + show_header($page["title"],30,0); ?> <? diff --git a/frontends/php/chart2.html b/frontends/php/chart2.html index b906d2f6..0796fcf1 100644 --- a/frontends/php/chart2.html +++ b/frontends/php/chart2.html @@ -142,8 +142,8 @@ { ImageLine($im,$shiftX,$shiftYup+$sizeY/2,$sizeX+$shiftX,$shiftYup+$sizeY/2,$colors[$color[$item]]); } - ImageFilledRectangle($im,$shiftX+150*$item,$sizeY+$shiftYup+19,$shiftX+150*$item+5,$sizeY+$shiftYup+15+9,$colors[$color[$item]]); - ImageString($im, 2,$shiftX+150*$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); } if($nodata == 0) diff --git a/frontends/php/include/config.inc b/frontends/php/include/config.inc index f913238c..20e97988 100644 --- a/frontends/php/include/config.inc +++ b/frontends/php/include/config.inc @@ -1766,7 +1766,7 @@ show_table2_v_delimiter(); echo "Comments"; show_table2_h_delimiter(); - echo "<TEXTAREA NAME=\"comments\" COLS=54 ROWS=\"5\" WRAP=\"SOFT\">$comments</TEXTAREA>"; + echo "<TEXTAREA NAME=\"comments\" COLS=70 ROWS=\"7\" WRAP=\"SOFT\">$comments</TEXTAREA>"; show_table2_v_delimiter(); echo "Disabled"; diff --git a/frontends/php/latestalarms.html b/frontends/php/latestalarms.html index 741a914e..d6473ece 100644 --- a/frontends/php/latestalarms.html +++ b/frontends/php/latestalarms.html @@ -3,7 +3,7 @@ $page["file"] = "latestalarms.html"; include "include/config.inc"; - show_header($page["title"],10,0); + show_header($page["title"],30,0); ?> <? diff --git a/frontends/php/trend.html b/frontends/php/trend.html index 81fa4f3d..3c9d259c 100644 --- a/frontends/php/trend.html +++ b/frontends/php/trend.html @@ -119,7 +119,7 @@ $y2=$sizeY-$y2; ImageLine($im,$x1+$shiftX,$y1+$shiftY,$x2+$shiftX,$y2+$shiftY,$red); - + $x1=$sizeX*($i-$minX)/($maxX-$minX); $y1=$sizeY*($avg[$i]-$minY)/($maxY-$minY); $x2=$x1; diff --git a/frontends/php/triggers.html b/frontends/php/triggers.html index 1f03b286..08bf94ca 100644 --- a/frontends/php/triggers.html +++ b/frontends/php/triggers.html @@ -160,7 +160,7 @@ if(DBget_field($result,0,0)>0) { echo "<a name=\"form\"></a>"; - insert_trigger_form($hostid,$triggerid); + @insert_trigger_form($hostid,$triggerid); } ?> |