.D........ [ZBXNEXT-1263] documented TLS parameters in zabbix_sender man-page

1 files changed, 257 insertions, 2 deletions

diff --git a/man/zabbix_sender.man b/man/zabbix_sender.man
index b146f85737b..4f80ad78f86 100644
--- a/man/zabbix_sender.man
+++ b/man/zabbix_sender.man
@@ -1,4 +1,4 @@
-.TH ZABBIX_SENDER 1 "2015\-03\-02" Zabbix
+.TH ZABBIX_SENDER 1 "2015\-06\-10" Zabbix
 .if n .ad l
 .SH NAME
 zabbix_sender \- Zabbix sender utility
@@ -67,6 +67,214 @@ zabbix_sender \- Zabbix sender utility
 .B \-i
 .I input-file
 .br
+.B zabbix_sender
+.RB [ \-v ]
+.B \-z
+.I server
+.RB [ \-p
+.IR port ]
+.RB [ \-I
+.IR IP\-address ]
+.B \-s
+.I host
+.B \-\-tls\-connect
+.B cert
+.B \-\-tls\-ca\-file
+.I ca_file
+.RB [ \-\-tls\-crl\-file
+.IR crl_file ]
+.RB [ \-\-tls\-cert\-issuer
+.IR certificate_issuer ]
+.RB [ \-\-tls\-cert\-subject
+.IR certificate_subject ]
+.B \-\-tls\-cert\-file
+.I cert_file
+.B \-\-tls\-key\-file
+.I key_file
+.B \-k
+.I key
+.B \-o
+.I value
+.br
+.B zabbix_sender
+.RB [ \-v ]
+.B \-z
+.I server
+.RB [ \-p
+.IR port ]
+.RB [ \-I
+.IR IP\-address ]
+.RB [ \-s
+.IR host ]
+.B \-\-tls\-connect
+.B cert
+.B \-\-tls\-ca\-file
+.I ca_file
+.RB [ \-\-tls\-crl\-file
+.IR crl_file ]
+.RB [ \-\-tls\-cert\-issuer
+.IR certificate_issuer ]
+.RB [ \-\-tls\-cert\-subject
+.IR certificate_subject ]
+.B \-\-tls\-cert\-file
+.I cert_file
+.B \-\-tls\-key\-file
+.I key_file
+.RB [ \-T ]
+.RB [ \-r ]
+.B \-i
+.I input\-file
+.br
+.B zabbix_sender
+.RB [ \-v ]
+.B \-c
+.I config-file
+.RB [ \-z
+.IR server ]
+.RB [ \-p
+.IR port ]
+.RB [ \-I
+.IR IP\-address ]
+.RB [ \-s
+.IR host ]
+.B \-\-tls\-connect
+.B cert
+.B \-\-tls\-ca\-file
+.I ca_file
+.RB [ \-\-tls\-crl\-file
+.IR crl_file ]
+.RB [ \-\-tls\-cert\-issuer
+.IR certificate_issuer ]
+.RB [ \-\-tls\-cert\-subject
+.IR certificate_subject ]
+.B \-\-tls\-cert\-file
+.I cert_file
+.B \-\-tls\-key\-file
+.I key_file
+.B \-k
+.I key
+.B \-o
+.I value
+.br
+.B zabbix_sender
+.RB [ \-v ]
+.B \-c
+.I config-file
+.RB [ \-z
+.IR server ]
+.RB [ \-p
+.IR port ]
+.RB [ \-I
+.IR IP\-address ]
+.RB [ \-s
+.IR host ]
+.B \-\-tls\-connect
+.B cert
+.B \-\-tls\-ca\-file
+.I ca_file
+.RB [ \-\-tls\-crl\-file
+.IR crl_file ]
+.RB [ \-\-tls\-cert\-issuer
+.IR certificate_issuer ]
+.RB [ \-\-tls\-cert\-subject
+.IR certificate_subject ]
+.B \-\-tls\-cert\-file
+.I cert_file
+.B \-\-tls\-key\-file
+.I key_file
+.RB [ \-T ]
+.RB [ \-r ]
+.B \-i
+.I input\-file
+.br
+.B zabbix_sender
+.RB [ \-v ]
+.B \-z
+.I server
+.RB [ \-p
+.IR port ]
+.RB [ \-I
+.IR IP\-address ]
+.B \-s
+.I host
+.B \-\-tls\-connect
+.B psk
+.B \-\-tls\-psk\-identity
+.I psk_identity
+.B \-\-tls\-psk\-file
+.I psk_file
+.B \-k
+.I key
+.B \-o
+.I value
+.br
+.B zabbix_sender
+.RB [ \-v ]
+.B \-z
+.I server
+.RB [ \-p
+.IR port ]
+.RB [ \-I
+.IR IP\-address ]
+.RB [ \-s
+.IR host ]
+.B \-\-tls\-connect
+.B psk
+.B \-\-tls\-psk\-identity
+.I psk_identity
+.B \-\-tls\-psk\-file
+.I psk_file
+.RB [ \-T ]
+.RB [ \-r ]
+.B \-i
+.I input\-file
+.br
+.B zabbix_sender
+.RB [ \-v ]
+.B \-c
+.I config\-file
+.RB [ \-z
+.IR server ]
+.RB [ \-p
+.IR port ]
+.RB [ \-I
+.IR IP-address ]
+.RB [ \-s
+.IR host ]
+.B \-\-tls\-connect
+.B psk
+.B \-\-tls\-psk\-identity
+.I psk_identity
+.B \-\-tls\-psk\-file
+.I psk_file
+.B \-k
+.I key
+.B \-o
+.I value
+.br
+.B zabbix_sender
+.RB [ \-v ]
+.B \-c
+.I config\-file
+.RB [ \-z
+.IR server ]
+.RB [ \-p
+.IR port ]
+.RB [ \-I
+.IR IP-address ]
+.RB [ \-s
+.IR host ]
+.B \-\-tls\-connect
+.B psk
+.B \-\-tls\-psk\-identity
+.I psk_identity
+.B \-\-tls\-psk\-file
+.I psk_file
+.RB [ \-T ]
+.RB [ \-r ]
+.B \-i
+.I input\-file
+.br
 .B zabbix_sender \-h
 .br
 .B zabbix_sender \-V
@@ -118,6 +326,41 @@ If target item has triggers referencing it, all timestamps must be in an increas
 .IP "\fB\-r\fR, \fB\-\-real\-time\fR"
 Send values one by one as soon as they are received.
 This can be used when reading from standard input.
+.IP "\fB\-\-tls\-connect\fR"
+How to connect to agent. Values:\fR
+.SS
+.RS 12
+.TP 12
+.B unencrypted
+connect without encryption
+.RE
+.RS 12
+.TP 12
+.B psk
+connect using TLS and a pre-shared key
+.RE
+.RS 12
+.TP 12
+.B cert
+connect using TLS and a certificate
+.RE
+.RE
+.IP "\fB\-\-tls\-ca\-file\fR"
+Full pathname of a file containing the top-level CA(s) certificates for peer certificate verification.
+.IP "\fB\-\-tls\-crl\-file\fR"
+Full pathname of a file containing revoked certificates.
+.IP "\fB\-\-tls\-cert\-issuer\fR"
+Allowed server certificate issuer.
+.IP "\fB\-\-tls\-cert\-subject\fR"
+Allowed server certificate subject.
+.IP "\fB\-\-tls\-cert\-file\fR"
+Full pathname of a file containing the certificate or certificate chain.
+.IP "\fB\-\-tls\-key\-file\fR"
+Full pathname of a file containing the private key.
+.IP "\fB\-\-tls\-psk\-identity\fR"
+PSK\-identity string.
+.IP "\fB\-\-tls\-psk\-file\fR"
+Full pathname of a file containing the pre-shared key.
 .IP "\fB\-v\fR, \fB\-\-verbose\fR"
 Verbose mode, \fB\-vv\fR for more details.
 .IP "\fB\-h\fR, \fB\-\-help\fR"
@@ -140,7 +383,19 @@ Send \fB342.45\fR as the value for \fBmysql.queries\fR item of monitored host. U
 \fBzabbix_sender \-c /usr/local/etc/zabbix_agentd.conf \-s "Monitored Host" \-k mysql.queries \-o 342.45\fR
 .br
 .RS
-Send \fB342.45\fR as the value for \fBmysql.queries\fR key in \fBMonitored Host\fR host using Zabbix server defined in agent daemon configuration file.
+Send \fB342.45\fR as the value for \fBmysql.queries\fR item in \fBMonitored Host\fR host using Zabbix server defined in agent daemon configuration file.
+.RE
+
+\fBzabbix_sender \-z 192.168.1.113  \-s "Monitored Host" \-k mysql.queries \-o 342.45 \-\-tls\-connect=cert \-\-tls\-ca\-file=/home/zabbix/zabbix_ca_file \-\-tls\-cert\-file=/home/zabbix/zabbix_agentd.crt \-\-tls\-key\-file=/home/zabbix/zabbix_agentd.key\fR
+.br
+.RS
+Send \fB342.45\fR as the value for \fBmysql.queries\fR item in \fBMonitored Host\fR host to server with IP \fB192.168.1.113\fR using TLS with certificate.
+.RE
+
+\fBzabbix_sender \-z 192.168.1.113  \-s "Monitored Host" \-k mysql.queries \-o 342.45 \-\-tls\-connect=psk \-\-tls\-psk\-identity="PSK ID Zabbix sender" \-\-tls\-psk\-file=/home/zabbix/zabbix_agentd.psk\fR
+.br
+.RS
+Send \fB342.45\fR as the value for \fBmysql.queries\fR item in \fBMonitored Host\fR host to server with IP \fB192.168.1.113\fR using TLS with pre-shared key (PSK).
 .RE
 
 .br