summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--TODO1
-rw-r--r--create/mysql/schema.sql1
-rw-r--r--create/postgresql/schema.sql1
-rw-r--r--frontends/php/include/config.inc.php8
-rw-r--r--frontends/php/include/locales/en_gb.inc.php1
-rw-r--r--frontends/php/include/screens.inc.php8
-rw-r--r--frontends/php/screenedit.php14
-rw-r--r--upgrades/dbpatches/1.1beta4_to_1.1beta5/mysql/patch.sql1
-rw-r--r--upgrades/dbpatches/1.1beta4_to_1.1beta5/postgresql/patch.sql1
10 files changed, 26 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index db5b7a2b..22e8f947 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
Changes for 1.1beta5:
+ - added configurable number of plain text elements for screens (Alexei)
+ - added screens_items.elements (Alexei)
- escalations removed from GUI (Alexei)
- fixed typo in tr_comments.php (Alexei)
diff --git a/TODO b/TODO
index 19e1dcda..ad0b25c5 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,6 @@
- http://www.zabbix.com/forum/showthread.php?p=6360#post6360
- http://www.zabbix.com/forum/showthread.php?t=1849
- - When adding plain text into a screen, allow for the number of entries displayed to be set. For example, I do not need to see the past 25 records of my uptime, host information, or Zabbix agent version.
- fix undeleted warnings for host and trigger statuses
- make agents return error message if not supported or not available
- centralised management of agent configuration files
diff --git a/create/mysql/schema.sql b/create/mysql/schema.sql
index 5eacc3a6..be76c070 100644
--- a/create/mysql/schema.sql
+++ b/create/mysql/schema.sql
@@ -575,6 +575,7 @@ CREATE TABLE screens_items (
y int(4) DEFAULT '0' NOT NULL,
colspan int(4) DEFAULT '0' NOT NULL,
rowspan int(4) DEFAULT '0' NOT NULL,
+ elements int(4) DEFAULT '25' NOT NULL,
PRIMARY KEY (screenitemid)
) TYPE=InnoDB;
diff --git a/create/postgresql/schema.sql b/create/postgresql/schema.sql
index 98d08d05..92bd5a5b 100644
--- a/create/postgresql/schema.sql
+++ b/create/postgresql/schema.sql
@@ -589,6 +589,7 @@ CREATE TABLE screens_items (
y int4 DEFAULT '0' NOT NULL,
colspan int4 DEFAULT '0' NOT NULL,
rowspan int4 DEFAULT '0' NOT NULL,
+ elements int4 DEFAULT '25' NOT NULL,
PRIMARY KEY (screenitemid)
);
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 2a62a268..ecad6837 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1218,21 +1218,21 @@ echo "</head>";
}
# Show screen cell containing plain text values
- function show_screen_plaintext($itemid)
+ function show_screen_plaintext($itemid,$elements)
{
$item=get_item_by_itemid($itemid);
if($item["value_type"]==0)
{
- $sql="select clock,value from history where itemid=$itemid order by clock desc limit 25";
+ $sql="select clock,value from history where itemid=$itemid order by clock desc limit $elements";
}
else
{
- $sql="select clock,value from history_str where itemid=$itemid order by clock desc limit 25";
+ $sql="select clock,value from history_str where itemid=$itemid order by clock desc limit $elements";
}
$result=DBselect($sql);
table_begin();
- table_header(array(S_CLOCK,$item["description"]));
+ table_header(array(S_TIMESTAMP,$item["description"]));
$col=0;
while($row=DBfetch($result))
{
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 5165d30c..c127d88d 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -602,6 +602,7 @@
"S_PLAIN_TEXT"=> "Plain text",
"S_COLUMN_SPAN"=> "Column span",
"S_ROW_SPAN"=> "Row span",
+ "S_SHOW_LINES"=> "Show lines",
// screens.php
"S_CUSTOM_SCREENS"=> "Custom screens",
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index bc771c32..1e21e396 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -55,17 +55,17 @@
return DBexecute($sql);
}
- function add_screen_item($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan)
+ function add_screen_item($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan,$elements)
{
$sql="delete from screens_items where screenid=$screenid and x=$x and y=$y";
DBexecute($sql);
- $sql="insert into screens_items (resource,screenid,x,y,resourceid,width,height,colspan,rowspan) values ($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan)";
+ $sql="insert into screens_items (resource,screenid,x,y,resourceid,width,height,colspan,rowspan,elements) values ($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan,$elements)";
return DBexecute($sql);
}
- function update_screen_item($screenitemid,$resource,$resourceid,$width,$height,$colspan,$rowspan)
+ function update_screen_item($screenitemid,$resource,$resourceid,$width,$height,$colspan,$rowspan,$elements)
{
- $sql="update screens_items set resource=$resource,resourceid=$resourceid,width=$width,height=$height,colspan=$colspan,rowspan=$rowspan where screenitemid=$screenitemid";
+ $sql="update screens_items set resource=$resource,resourceid=$resourceid,width=$width,height=$height,colspan=$colspan,rowspan=$rowspan,elements=$elements where screenitemid=$screenitemid";
return DBexecute($sql);
}
diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index 23a3da5c..b677ae1a 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -49,7 +49,7 @@
// delete_screen_item($_REQUEST["screenitemid"]);
// unset($_REQUEST["screenitemid"]);
// }
- $result=add_screen_item($_REQUEST["resource"],$_REQUEST["screenid"],$_REQUEST["x"],$_REQUEST["y"],$_REQUEST["resourceid"],$_REQUEST["width"],$_REQUEST["height"],$_REQUEST["colspan"],$_REQUEST["rowspan"]);
+ $result=add_screen_item($_REQUEST["resource"],$_REQUEST["screenid"],$_REQUEST["x"],$_REQUEST["y"],$_REQUEST["resourceid"],$_REQUEST["width"],$_REQUEST["height"],$_REQUEST["colspan"],$_REQUEST["rowspan"],$_REQUEST["elements"]);
unset($_REQUEST["x"]);
show_messages($result, S_ITEM_ADDED, S_CANNOT_ADD_ITEM);
}
@@ -61,7 +61,7 @@
}
if($_REQUEST["register"]=="update")
{
- $result=update_screen_item($_REQUEST["screenitemid"],$_REQUEST["resource"],$_REQUEST["resourceid"],$_REQUEST["width"],$_REQUEST["height"],$_REQUEST["colspan"],$_REQUEST["rowspan"]);
+ $result=update_screen_item($_REQUEST["screenitemid"],$_REQUEST["resource"],$_REQUEST["resourceid"],$_REQUEST["width"],$_REQUEST["height"],$_REQUEST["colspan"],$_REQUEST["rowspan"],$_REQUEST["elements"]);
show_messages($result, S_ITEM_UPDATED, S_CANNOT_UPDATE_ITEM);
unset($_REQUEST["x"]);
}
@@ -92,6 +92,7 @@
$height=$irow["height"];
$colspan=$irow["colspan"];
$rowspan=$irow["rowspan"];
+ $elements=$irow["elements"];
}
else
{
@@ -102,6 +103,7 @@
$height=100;
$colspan=0;
$rowspan=0;
+ $elements=25;
}
$tmp="";
if($colspan>1)
@@ -141,6 +143,7 @@
$height=@iif(isset($_REQUEST["height"]),$_REQUEST["height"],$height);
$colspan=@iif(isset($_REQUEST["colspan"]),$_REQUEST["colspan"],$colspan);
$rowspan=@iif(isset($_REQUEST["rowspan"]),$_REQUEST["rowspan"],$rowspan);
+ $elements=@iif(isset($_REQUEST["elements"]),$_REQUEST["elements"],$elements);
show_form_begin("screenedit.cell");
echo S_SCREEN_CELL_CONFIGURATION;
@@ -197,6 +200,11 @@
echo "<OPTION VALUE='$itemid_' ".iif($resourceid==$itemid_,"selected","").">$host_: $description_";
}
echo "</SELECT>";
+
+ show_table2_v_delimiter();
+ echo nbsp(S_SHOW_LINES);
+ show_table2_h_delimiter();
+ echo "<input class=\"biginput\" name=\"elements\" size=2 value=\"$elements\">";
}
// User-defined graph
else if($resource == 0)
@@ -288,7 +296,7 @@
}
else if( ($screenitemid!=0) && ($resource==3) )
{
- show_screen_plaintext($resourceid);
+ show_screen_plaintext($resourceid,$elements);
echo "<p align=center>";
echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r>".S_CHANGE."</a>";
}
diff --git a/upgrades/dbpatches/1.1beta4_to_1.1beta5/mysql/patch.sql b/upgrades/dbpatches/1.1beta4_to_1.1beta5/mysql/patch.sql
new file mode 100644
index 00000000..baed4d59
--- /dev/null
+++ b/upgrades/dbpatches/1.1beta4_to_1.1beta5/mysql/patch.sql
@@ -0,0 +1 @@
+alter table screens_items add elements int(4) DEFAULT '25' NOT NULL;
diff --git a/upgrades/dbpatches/1.1beta4_to_1.1beta5/postgresql/patch.sql b/upgrades/dbpatches/1.1beta4_to_1.1beta5/postgresql/patch.sql
new file mode 100644
index 00000000..f88dc578
--- /dev/null
+++ b/upgrades/dbpatches/1.1beta4_to_1.1beta5/postgresql/patch.sql
@@ -0,0 +1 @@
+alter table screens_items add elements int4 DEFAULT '25' NOT NULL;
generated by cgit (git 2.34.1) at 2024-06-09 16:57:29 +0000