summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--TODO1
-rw-r--r--src/zabbix_sender/zabbix_sender.c19
3 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ce15b53..d1645865 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
Changes for 1.0beta7:
- - basic support of mass sending of information for zabbix_sender
- (Alexei)
+ - zabbix_sender to be able to get information from stdin (Alexei)
- support fo JavaScript required now (Alexei)
- automatic resize of all graphs depending on screen size (Alexei)
- got rid of message "Bad protocol identification '0'" when doing check_service[ssh]
diff --git a/TODO b/TODO
index 7e7b9e61..0cb0284d 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
HIGH PRIORITY:
- - support of mass sending for zabbix_sender
- fix Select in Status of Triggers
- mass updates/inserts
- support for net-snmp
diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c
index 80857df7..5bb1a5dd 100644
--- a/src/zabbix_sender/zabbix_sender.c
+++ b/src/zabbix_sender/zabbix_sender.c
@@ -120,6 +120,10 @@ int main(int argc, char **argv)
int port;
int ret=SUCCEED;
char line[MAX_STRING_LEN+1];
+ char port_str[MAX_STRING_LEN+1];
+ char zabbix_server[MAX_STRING_LEN+1];
+ char server_key[MAX_STRING_LEN+1];
+ char value[MAX_STRING_LEN+1];
char *s;
signal( SIGINT, signal_handler );
@@ -144,12 +148,17 @@ int main(int argc, char **argv)
{
/* printf("[%s]\n",line);*/
alarm(SENDER_TIMEOUT);
+
s=(char *)strtok(line," ");
- while(s!=NULL)
- {
- printf("[%s]",s);
- s=(char *)strtok(NULL," ");
- }
+ strncpy(zabbix_server,s,MAX_STRING_LEN);
+ s=(char *)strtok(NULL," ");
+ strncpy(port_str,s,MAX_STRING_LEN);
+ s=(char *)strtok(NULL," ");
+ strncpy(server_key,s,MAX_STRING_LEN);
+ s=(char *)strtok(NULL," ");
+ strncpy(value,s,MAX_STRING_LEN);
+ ret = send_value(zabbix_server,atoi(port_str),server_key,value);
+
alarm(0);
}
}