summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--frontends/php/include/defines.inc.php1
-rw-r--r--frontends/php/include/forms.inc.php5
-rw-r--r--frontends/php/include/local_en.inc.php2
-rw-r--r--frontends/php/items.php6
4 files changed, 14 insertions, 0 deletions
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 9175dffc..f294e85c 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -73,6 +73,7 @@
define("ITEM_TYPE_SNMPV2C",4);
define("ITEM_TYPE_INTERNAL",5);
define("ITEM_TYPE_SNMPV3",6);
+ define("ITEM_TYPE_ZABBIX_ACTIVE",7);
define("ITEM_VALUE_TYPE_FLOAT",0);
define("ITEM_VALUE_TYPE_STR",1);
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index c5ccacb9..ebf61c57 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -314,6 +314,10 @@
if($type==ITEM_TYPE_ZABBIX) echo "SELECTED";
echo ">Zabbix agent";
+ echo "<OPTION VALUE=\"7\"";
+ if($type==ITEM_TYPE_ZABBIX_ACTIVE) echo "SELECTED";
+ echo ">Zabbix agent (active)";
+
echo "<OPTION VALUE=\"3\"";
if($type==ITEM_TYPE_SIMPLE) echo "SELECTED";
echo ">Simple check";
@@ -330,6 +334,7 @@
if($type==ITEM_TYPE_SNMPV3) echo "SELECTED";
echo ">SNMPv3 agent";
+
echo "<OPTION VALUE=\"2\"";
if($type==ITEM_TYPE_TRAPPER) echo "SELECTED";
echo ">Zabbix trapper";
diff --git a/frontends/php/include/local_en.inc.php b/frontends/php/include/local_en.inc.php
index 65a1169d..ed59a0bf 100644
--- a/frontends/php/include/local_en.inc.php
+++ b/frontends/php/include/local_en.inc.php
@@ -311,10 +311,12 @@
define("S_TRENDS", "Trends");
define("S_SHORT_NAME", "Short name");
define("S_ZABBIX_AGENT", "ZABBIX agent");
+ define("S_ZABBIX_AGENT_ACTIVE", "ZABBIX agent (active)");
define("S_SNMPV1_AGENT", "SNMPv1 agent");
define("S_ZABBIX_TRAPPER", "ZABBIX trapper");
define("S_SIMPLE_CHECK", "Simple check");
define("S_SNMPV2_AGENT", "SNMPv2 agent");
+ define("S_SNMPV3_AGENT", "SNMPv3 agent");
define("S_ZABBIX_INTERNAL", "ZABBIX internal");
define("S_ZABBIX_UNKNOWN", "Unknown");
define("S_ACTIVE", "Active");
diff --git a/frontends/php/items.php b/frontends/php/items.php
index f29ad010..04835623 100644
--- a/frontends/php/items.php
+++ b/frontends/php/items.php
@@ -228,6 +228,9 @@
case 0:
$type=S_ZABBIX_AGENT;
break;
+ case 7:
+ $type=S_ZABBIX_AGENT_ACTIVE;
+ break;
case 1:
$type=S_SNMPV1_AGENT;
break;
@@ -240,6 +243,9 @@
case 4:
$type=S_SNMPV2_AGENT;
break;
+ case 6:
+ $type=S_SNMPV3_AGENT;
+ break;
case 5:
$type=S_ZABBIX_INTERNAL;
break;