diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-18 12:03:37 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-18 12:03:37 +0000 |
| commit | 0ae3a0ca67fd055ba7735ccd0b010f5508271cb3 (patch) | |
| tree | 7db28964ae220a77314484c74b2397614f9688b8 /include | |
| parent | 1bc36b4f63dbe95d7d98be834e1e69a8a7ef4cb4 (diff) | |
- added discovery based on data receivedfrom ZABBIX and SNMP agents (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@4036 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 8 | ||||
| -rw-r--r-- | include/db.h | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index 7c750198..c632a466 100644 --- a/include/common.h +++ b/include/common.h @@ -177,7 +177,10 @@ typedef enum SVC_POP, SVC_NNTP, SVC_IMAP, - SVC_TCP + SVC_TCP, + SVC_AGENT, + SVC_SNMPv1, + SVC_SNMPv2c } zbx_dservice_type_t; @@ -221,7 +224,8 @@ typedef enum CONDITION_TYPE_DSERVICE_TYPE, CONDITION_TYPE_DSERVICE_PORT, CONDITION_TYPE_DSTATUS, - CONDITION_TYPE_DUPTIME + CONDITION_TYPE_DUPTIME, + CONDITION_TYPE_DVALUE } zbx_condition_type_t; /* Condition operators */ diff --git a/include/db.h b/include/db.h index d68ecfb6..92cdf509 100644 --- a/include/db.h +++ b/include/db.h @@ -108,6 +108,9 @@ extern int CONFIG_MASTER_NODEID; #define ACTION_SUBJECT_LEN 255 #define ACTION_SUBJECT_LEN_MAX ACTION_SUBJECT_LEN+1 +#define DSERVICE_VALUE_LEN 255 +#define DSERVICE_VALUE_LEN_MAX DSERVICE_VALUE_LEN+1 + #define ZBX_SQL_ITEM_SELECT "i.itemid,i.key_,h.host,h.port,i.delay,i.description,i.nextcheck,i.type,i.snmp_community,i.snmp_oid,h.useip,h.ip,i.history,i.lastvalue,i.prevvalue,i.hostid,h.status,i.value_type,h.errors_from,i.snmp_port,i.delta,i.prevorgvalue,i.lastclock,i.units,i.multiplier,i.snmpv3_securityname,i.snmpv3_securitylevel,i.snmpv3_authpassphrase,i.snmpv3_privpassphrase,i.formula,h.available,i.status,i.trapper_hosts,i.logtimefmt,i.valuemapid,i.delay_flex,h.dns from hosts h, items i" #define ZBX_MAX_SQL_LEN 65535 @@ -128,7 +131,10 @@ DB_DCHECK zbx_uint64_t druleid; int type; char *ports; + char *key_; + char *snmp_community; int status; + char value[DSERVICE_VALUE_LEN_MAX]; }; DB_DHOST @@ -150,6 +156,7 @@ DB_DSERVICE int status; int lastup; int lastdown; + char value[DSERVICE_VALUE_LEN_MAX]; }; DB_EVENT |