Selaa lähdekoodia

updated to zabbix 3.4

tags/v1.2.0^0
Robin Thoni 6 vuotta sitten
vanhempi
commit
cc51543650
4 muutettua tiedostoa jossa 11561 lisäystä ja 2541 poistoa
  1. 1
    1
      frontend/Dockerfile
  2. 11514
    2531
      postgresql/docker-entrypoint-initdb.d/01_init.sql
  3. 1
    1
      zabbix/Dockerfile
  4. 45
    8
      zabbix/zabbix_server.conf

+ 1
- 1
frontend/Dockerfile Näytä tiedosto

@@ -7,7 +7,7 @@ RUN apt-get update && apt-get -y install\
7 7
         wget &&\
8 8
         apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
9 9
 
10
-ARG ZABBIX_VERSION=3.2
10
+ARG ZABBIX_VERSION=3.4
11 11
 
12 12
 RUN wget http://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/debian/pool/main/z/zabbix-release/zabbix-release_${ZABBIX_VERSION}-1+jessie_all.deb -O /tmp/zabbix.deb &&\
13 13
     dpkg -i /tmp/zabbix.deb

+ 11514
- 2531
postgresql/docker-entrypoint-initdb.d/01_init.sql
File diff suppressed because it is too large
Näytä tiedosto


+ 1
- 1
zabbix/Dockerfile Näytä tiedosto

@@ -6,7 +6,7 @@ RUN apt-get update && apt-get -y install\
6 6
         wget &&\
7 7
         apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
8 8
 
9
-ARG ZABBIX_VERSION=3.2
9
+ARG ZABBIX_VERSION=3.4
10 10
 
11 11
 RUN wget http://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/debian/pool/main/z/zabbix-release/zabbix-release_${ZABBIX_VERSION}-1+jessie_all.deb -O /tmp/zabbix.deb &&\
12 12
     dpkg -i /tmp/zabbix.deb

+ 45
- 8
zabbix/zabbix_server.conf Näytä tiedosto

@@ -71,6 +71,16 @@ LogFileSize=0
71 71
 
72 72
 PidFile=/var/run/zabbix/zabbix_server.pid
73 73
 
74
+### Option: SocketDir
75
+#	IPC socket directory.
76
+#       Directory to store IPC sockets used by internal Zabbix services.
77
+#
78
+# Mandatory: no
79
+# Default:
80
+# SocketDir=/tmp
81
+
82
+SocketDir=/var/run/zabbix
83
+
74 84
 ### Option: DBHost
75 85
 #	Database host name.
76 86
 #	If set to localhost, socket is used for MySQL.
@@ -129,6 +139,20 @@ DBPassword=POSTGRES_PASSWORD
129 139
 # Default (for MySQL):
130 140
 # DBPort=3306
131 141
 
142
+### Option: HistoryStorageURL
143
+#	History storage HTTP[S] URL.
144
+#
145
+# Mandatory: no
146
+# Default:
147
+# HistoryStorageURL=
148
+
149
+### Option: HistoryStorageTypes
150
+#	Comma separated list of value types to be sent to the history storage.
151
+#
152
+# Mandatory: no
153
+# Default:
154
+# HistoryStorageTypes=uint,dbl,str,log,text
155
+
132 156
 ############ ADVANCED PARAMETERS ################
133 157
 
134 158
 ### Option: StartPollers
@@ -141,12 +165,22 @@ StartPollers=20
141 165
 
142 166
 ### Option: StartIPMIPollers
143 167
 #	Number of pre-forked instances of IPMI pollers.
168
+#       The IPMI manager process is automatically started when at least one IPMI poller is started.
144 169
 #
145 170
 # Mandatory: no
146 171
 # Range: 0-1000
147 172
 # Default:
148 173
 # StartIPMIPollers=0
149 174
 
175
+### Option: StartPreprocessors
176
+#	Number of pre-forked instances of preprocessing workers.
177
+#       The preprocessing manager process is automatically started when preprocessor worker is started.
178
+#
179
+# Mandatory: no
180
+# Range: 1-1000
181
+# Default:
182
+# StartPreprocessors=3
183
+
150 184
 ### Option: StartPollersUnreachable
151 185
 #	Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java).
152 186
 #	At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers
@@ -210,6 +244,15 @@ StartPollers=20
210 244
 # Default:
211 245
 # StartEscalators=1
212 246
 
247
+### Option: StartAlerters
248
+#	Number of pre-forked instances of alerters.
249
+#	Alerters send the notifications created by action operations.
250
+#
251
+# Mandatory: no
252
+# Range: 0-100
253
+# Default:
254
+# StartAlerters=3
255
+
213 256
 ### Option: JavaGateway
214 257
 #	IP address (or hostname) of Zabbix Java gateway.
215 258
 #	Only required if Java pollers are started.
@@ -284,6 +327,8 @@ StartPollers=20
284 327
 # Default:
285 328
 # SNMPTrapperFile=/tmp/zabbix_traps.tmp
286 329
 
330
+SNMPTrapperFile=/var/log/snmptrap/snmptrap.log
331
+
287 332
 ### Option: StartSNMPTrapper
288 333
 #	If 1, SNMP trapper process is started.
289 334
 #
@@ -328,14 +373,6 @@ ListenIP=0.0.0.0
328 373
 # Default:
329 374
 # MaxHousekeeperDelete=5000
330 375
 
331
-### Option: SenderFrequency
332
-#	How often Zabbix will try to send unsent alerts (in seconds).
333
-#
334
-# Mandatory: no
335
-# Range: 5-3600
336
-# Default:
337
-# SenderFrequency=30
338
-
339 376
 ### Option: CacheSize
340 377
 #	Size of configuration cache, in bytes.
341 378
 #	Shared memory size for storing host, item and trigger data.

Loading…
Peruuta
Tallenna