├── Dockerfile ├── LICENSE ├── README.md ├── etc ├── sudoers.d │ └── zabbix ├── supervisor │ ├── conf.d │ │ └── supervisor.conf │ └── supervisord.conf └── zabbix │ ├── scripts │ ├── discovery │ │ ├── disks │ │ ├── docker-containers │ │ └── docker-processes │ ├── docker │ └── trapper │ │ ├── disks-discovery │ │ ├── docker │ │ ├── docker-containers-discovery │ │ ├── docker-processes-discovery │ │ └── docker.conf │ ├── templates │ ├── template_coreos.xml │ └── template_docker.xml │ ├── zabbix_agentd.conf │ └── zabbix_agentd.conf.d │ ├── userparameter_custom.conf │ └── userparameter_docker.conf ├── files ├── coreos.patch ├── fleet │ ├── zabbix-agent │ └── zabbix-agent.service ├── systemd │ └── zabbix-agent.service └── zabbix-agent_2.2.7+dfsg-1.1_amd64.deb └── run.sh /Dockerfile: -------------------------------------------------------------------------------- 1 | FROM debian:jessie 2 | MAINTAINER Boris HUISGEN 3 | 4 | ENV DEBIAN_FRONTEND noninteractive 5 | 6 | RUN apt-get update && \ 7 | apt-get -y install locales && \ 8 | dpkg-reconfigure locales && \ 9 | locale-gen C.UTF-8 && \ 10 | /usr/sbin/update-locale LANG=C.UTF-8 && \ 11 | echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && \ 12 | locale-gen 13 | ENV LC_ALL C.UTF-8 14 | ENV LANG en_US.UTF-8 15 | ENV LANGUAGE en_US.UTF-8 16 | ENV TERM xterm 17 | 18 | RUN apt-get update && \ 19 | apt-get -y install \ 20 | ucf \ 21 | procps \ 22 | iproute \ 23 | supervisor 24 | COPY etc/supervisor/ /etc/supervisor/ 25 | 26 | RUN apt-get update && \ 27 | apt-get -y install --no-install-recommends \ 28 | curl \ 29 | jq \ 30 | libcurl3-gnutls \ 31 | libldap-2.4-2 \ 32 | netcat-openbsd \ 33 | pciutils \ 34 | sudo 35 | 36 | COPY files/zabbix-agent_2.2.7+dfsg-1.1_amd64.deb /root/ 37 | RUN dpkg -i /root/zabbix-agent_2.2.7+dfsg-1.1_amd64.deb 38 | COPY etc/zabbix/ /etc/zabbix/ 39 | 40 | RUN mkdir -p /var/lib/zabbix && \ 41 | chmod 700 /var/lib/zabbix && \ 42 | chown zabbix:zabbix /var/lib/zabbix && \ 43 | usermod -d /var/lib/zabbix zabbix && \ 44 | usermod -a -G adm zabbix 45 | 46 | COPY etc/sudoers.d/zabbix etc/sudoers.d/zabbix 47 | RUN chmod 400 /etc/sudoers.d/zabbix 48 | 49 | RUN apt-get clean && \ 50 | rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 51 | 52 | COPY run.sh / 53 | RUN chmod +x /run.sh 54 | 55 | EXPOSE 10050 56 | ENTRYPOINT ["/run.sh"] 57 | CMD [""] 58 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | GNU GENERAL PUBLIC LICENSE 2 | Version 3, 29 June 2007 3 | 4 | Copyright (C) 2007 Free Software Foundation, Inc. 5 | Everyone is permitted to copy and distribute verbatim copies 6 | of this license document, but changing it is not allowed. 7 | 8 | Preamble 9 | 10 | The GNU General Public License is a free, copyleft license for 11 | software and other kinds of works. 12 | 13 | The licenses for most software and other practical works are designed 14 | to take away your freedom to share and change the works. By contrast, 15 | the GNU General Public License is intended to guarantee your freedom to 16 | share and change all versions of a program--to make sure it remains free 17 | software for all its users. We, the Free Software Foundation, use the 18 | GNU General Public License for most of our software; it applies also to 19 | any other work released this way by its authors. You can apply it to 20 | your programs, too. 21 | 22 | When we speak of free software, we are referring to freedom, not 23 | price. Our General Public Licenses are designed to make sure that you 24 | have the freedom to distribute copies of free software (and charge for 25 | them if you wish), that you receive source code or can get it if you 26 | want it, that you can change the software or use pieces of it in new 27 | free programs, and that you know you can do these things. 28 | 29 | To protect your rights, we need to prevent others from denying you 30 | these rights or asking you to surrender the rights. Therefore, you have 31 | certain responsibilities if you distribute copies of the software, or if 32 | you modify it: responsibilities to respect the freedom of others. 33 | 34 | For example, if you distribute copies of such a program, whether 35 | gratis or for a fee, you must pass on to the recipients the same 36 | freedoms that you received. You must make sure that they, too, receive 37 | or can get the source code. And you must show them these terms so they 38 | know their rights. 39 | 40 | Developers that use the GNU GPL protect your rights with two steps: 41 | (1) assert copyright on the software, and (2) offer you this License 42 | giving you legal permission to copy, distribute and/or modify it. 43 | 44 | For the developers' and authors' protection, the GPL clearly explains 45 | that there is no warranty for this free software. For both users' and 46 | authors' sake, the GPL requires that modified versions be marked as 47 | changed, so that their problems will not be attributed erroneously to 48 | authors of previous versions. 49 | 50 | Some devices are designed to deny users access to install or run 51 | modified versions of the software inside them, although the manufacturer 52 | can do so. This is fundamentally incompatible with the aim of 53 | protecting users' freedom to change the software. The systematic 54 | pattern of such abuse occurs in the area of products for individuals to 55 | use, which is precisely where it is most unacceptable. Therefore, we 56 | have designed this version of the GPL to prohibit the practice for those 57 | products. If such problems arise substantially in other domains, we 58 | stand ready to extend this provision to those domains in future versions 59 | of the GPL, as needed to protect the freedom of users. 60 | 61 | Finally, every program is threatened constantly by software patents. 62 | States should not allow patents to restrict development and use of 63 | software on general-purpose computers, but in those that do, we wish to 64 | avoid the special danger that patents applied to a free program could 65 | make it effectively proprietary. To prevent this, the GPL assures that 66 | patents cannot be used to render the program non-free. 67 | 68 | The precise terms and conditions for copying, distribution and 69 | modification follow. 70 | 71 | TERMS AND CONDITIONS 72 | 73 | 0. Definitions. 74 | 75 | "This License" refers to version 3 of the GNU General Public License. 76 | 77 | "Copyright" also means copyright-like laws that apply to other kinds of 78 | works, such as semiconductor masks. 79 | 80 | "The Program" refers to any copyrightable work licensed under this 81 | License. Each licensee is addressed as "you". "Licensees" and 82 | "recipients" may be individuals or organizations. 83 | 84 | To "modify" a work means to copy from or adapt all or part of the work 85 | in a fashion requiring copyright permission, other than the making of an 86 | exact copy. The resulting work is called a "modified version" of the 87 | earlier work or a work "based on" the earlier work. 88 | 89 | A "covered work" means either the unmodified Program or a work based 90 | on the Program. 91 | 92 | To "propagate" a work means to do anything with it that, without 93 | permission, would make you directly or secondarily liable for 94 | infringement under applicable copyright law, except executing it on a 95 | computer or modifying a private copy. Propagation includes copying, 96 | distribution (with or without modification), making available to the 97 | public, and in some countries other activities as well. 98 | 99 | To "convey" a work means any kind of propagation that enables other 100 | parties to make or receive copies. Mere interaction with a user through 101 | a computer network, with no transfer of a copy, is not conveying. 102 | 103 | An interactive user interface displays "Appropriate Legal Notices" 104 | to the extent that it includes a convenient and prominently visible 105 | feature that (1) displays an appropriate copyright notice, and (2) 106 | tells the user that there is no warranty for the work (except to the 107 | extent that warranties are provided), that licensees may convey the 108 | work under this License, and how to view a copy of this License. If 109 | the interface presents a list of user commands or options, such as a 110 | menu, a prominent item in the list meets this criterion. 111 | 112 | 1. Source Code. 113 | 114 | The "source code" for a work means the preferred form of the work 115 | for making modifications to it. "Object code" means any non-source 116 | form of a work. 117 | 118 | A "Standard Interface" means an interface that either is an official 119 | standard defined by a recognized standards body, or, in the case of 120 | interfaces specified for a particular programming language, one that 121 | is widely used among developers working in that language. 122 | 123 | The "System Libraries" of an executable work include anything, other 124 | than the work as a whole, that (a) is included in the normal form of 125 | packaging a Major Component, but which is not part of that Major 126 | Component, and (b) serves only to enable use of the work with that 127 | Major Component, or to implement a Standard Interface for which an 128 | implementation is available to the public in source code form. A 129 | "Major Component", in this context, means a major essential component 130 | (kernel, window system, and so on) of the specific operating system 131 | (if any) on which the executable work runs, or a compiler used to 132 | produce the work, or an object code interpreter used to run it. 133 | 134 | The "Corresponding Source" for a work in object code form means all 135 | the source code needed to generate, install, and (for an executable 136 | work) run the object code and to modify the work, including scripts to 137 | control those activities. However, it does not include the work's 138 | System Libraries, or general-purpose tools or generally available free 139 | programs which are used unmodified in performing those activities but 140 | which are not part of the work. For example, Corresponding Source 141 | includes interface definition files associated with source files for 142 | the work, and the source code for shared libraries and dynamically 143 | linked subprograms that the work is specifically designed to require, 144 | such as by intimate data communication or control flow between those 145 | subprograms and other parts of the work. 146 | 147 | The Corresponding Source need not include anything that users 148 | can regenerate automatically from other parts of the Corresponding 149 | Source. 150 | 151 | The Corresponding Source for a work in source code form is that 152 | same work. 153 | 154 | 2. Basic Permissions. 155 | 156 | All rights granted under this License are granted for the term of 157 | copyright on the Program, and are irrevocable provided the stated 158 | conditions are met. This License explicitly affirms your unlimited 159 | permission to run the unmodified Program. The output from running a 160 | covered work is covered by this License only if the output, given its 161 | content, constitutes a covered work. This License acknowledges your 162 | rights of fair use or other equivalent, as provided by copyright law. 163 | 164 | You may make, run and propagate covered works that you do not 165 | convey, without conditions so long as your license otherwise remains 166 | in force. You may convey covered works to others for the sole purpose 167 | of having them make modifications exclusively for you, or provide you 168 | with facilities for running those works, provided that you comply with 169 | the terms of this License in conveying all material for which you do 170 | not control copyright. Those thus making or running the covered works 171 | for you must do so exclusively on your behalf, under your direction 172 | and control, on terms that prohibit them from making any copies of 173 | your copyrighted material outside their relationship with you. 174 | 175 | Conveying under any other circumstances is permitted solely under 176 | the conditions stated below. Sublicensing is not allowed; section 10 177 | makes it unnecessary. 178 | 179 | 3. Protecting Users' Legal Rights From Anti-Circumvention Law. 180 | 181 | No covered work shall be deemed part of an effective technological 182 | measure under any applicable law fulfilling obligations under article 183 | 11 of the WIPO copyright treaty adopted on 20 December 1996, or 184 | similar laws prohibiting or restricting circumvention of such 185 | measures. 186 | 187 | When you convey a covered work, you waive any legal power to forbid 188 | circumvention of technological measures to the extent such circumvention 189 | is effected by exercising rights under this License with respect to 190 | the covered work, and you disclaim any intention to limit operation or 191 | modification of the work as a means of enforcing, against the work's 192 | users, your or third parties' legal rights to forbid circumvention of 193 | technological measures. 194 | 195 | 4. Conveying Verbatim Copies. 196 | 197 | You may convey verbatim copies of the Program's source code as you 198 | receive it, in any medium, provided that you conspicuously and 199 | appropriately publish on each copy an appropriate copyright notice; 200 | keep intact all notices stating that this License and any 201 | non-permissive terms added in accord with section 7 apply to the code; 202 | keep intact all notices of the absence of any warranty; and give all 203 | recipients a copy of this License along with the Program. 204 | 205 | You may charge any price or no price for each copy that you convey, 206 | and you may offer support or warranty protection for a fee. 207 | 208 | 5. Conveying Modified Source Versions. 209 | 210 | You may convey a work based on the Program, or the modifications to 211 | produce it from the Program, in the form of source code under the 212 | terms of section 4, provided that you also meet all of these conditions: 213 | 214 | a) The work must carry prominent notices stating that you modified 215 | it, and giving a relevant date. 216 | 217 | b) The work must carry prominent notices stating that it is 218 | released under this License and any conditions added under section 219 | 7. This requirement modifies the requirement in section 4 to 220 | "keep intact all notices". 221 | 222 | c) You must license the entire work, as a whole, under this 223 | License to anyone who comes into possession of a copy. This 224 | License will therefore apply, along with any applicable section 7 225 | additional terms, to the whole of the work, and all its parts, 226 | regardless of how they are packaged. This License gives no 227 | permission to license the work in any other way, but it does not 228 | invalidate such permission if you have separately received it. 229 | 230 | d) If the work has interactive user interfaces, each must display 231 | Appropriate Legal Notices; however, if the Program has interactive 232 | interfaces that do not display Appropriate Legal Notices, your 233 | work need not make them do so. 234 | 235 | A compilation of a covered work with other separate and independent 236 | works, which are not by their nature extensions of the covered work, 237 | and which are not combined with it such as to form a larger program, 238 | in or on a volume of a storage or distribution medium, is called an 239 | "aggregate" if the compilation and its resulting copyright are not 240 | used to limit the access or legal rights of the compilation's users 241 | beyond what the individual works permit. Inclusion of a covered work 242 | in an aggregate does not cause this License to apply to the other 243 | parts of the aggregate. 244 | 245 | 6. Conveying Non-Source Forms. 246 | 247 | You may convey a covered work in object code form under the terms 248 | of sections 4 and 5, provided that you also convey the 249 | machine-readable Corresponding Source under the terms of this License, 250 | in one of these ways: 251 | 252 | a) Convey the object code in, or embodied in, a physical product 253 | (including a physical distribution medium), accompanied by the 254 | Corresponding Source fixed on a durable physical medium 255 | customarily used for software interchange. 256 | 257 | b) Convey the object code in, or embodied in, a physical product 258 | (including a physical distribution medium), accompanied by a 259 | written offer, valid for at least three years and valid for as 260 | long as you offer spare parts or customer support for that product 261 | model, to give anyone who possesses the object code either (1) a 262 | copy of the Corresponding Source for all the software in the 263 | product that is covered by this License, on a durable physical 264 | medium customarily used for software interchange, for a price no 265 | more than your reasonable cost of physically performing this 266 | conveying of source, or (2) access to copy the 267 | Corresponding Source from a network server at no charge. 268 | 269 | c) Convey individual copies of the object code with a copy of the 270 | written offer to provide the Corresponding Source. This 271 | alternative is allowed only occasionally and noncommercially, and 272 | only if you received the object code with such an offer, in accord 273 | with subsection 6b. 274 | 275 | d) Convey the object code by offering access from a designated 276 | place (gratis or for a charge), and offer equivalent access to the 277 | Corresponding Source in the same way through the same place at no 278 | further charge. You need not require recipients to copy the 279 | Corresponding Source along with the object code. If the place to 280 | copy the object code is a network server, the Corresponding Source 281 | may be on a different server (operated by you or a third party) 282 | that supports equivalent copying facilities, provided you maintain 283 | clear directions next to the object code saying where to find the 284 | Corresponding Source. Regardless of what server hosts the 285 | Corresponding Source, you remain obligated to ensure that it is 286 | available for as long as needed to satisfy these requirements. 287 | 288 | e) Convey the object code using peer-to-peer transmission, provided 289 | you inform other peers where the object code and Corresponding 290 | Source of the work are being offered to the general public at no 291 | charge under subsection 6d. 292 | 293 | A separable portion of the object code, whose source code is excluded 294 | from the Corresponding Source as a System Library, need not be 295 | included in conveying the object code work. 296 | 297 | A "User Product" is either (1) a "consumer product", which means any 298 | tangible personal property which is normally used for personal, family, 299 | or household purposes, or (2) anything designed or sold for incorporation 300 | into a dwelling. In determining whether a product is a consumer product, 301 | doubtful cases shall be resolved in favor of coverage. For a particular 302 | product received by a particular user, "normally used" refers to a 303 | typical or common use of that class of product, regardless of the status 304 | of the particular user or of the way in which the particular user 305 | actually uses, or expects or is expected to use, the product. A product 306 | is a consumer product regardless of whether the product has substantial 307 | commercial, industrial or non-consumer uses, unless such uses represent 308 | the only significant mode of use of the product. 309 | 310 | "Installation Information" for a User Product means any methods, 311 | procedures, authorization keys, or other information required to install 312 | and execute modified versions of a covered work in that User Product from 313 | a modified version of its Corresponding Source. The information must 314 | suffice to ensure that the continued functioning of the modified object 315 | code is in no case prevented or interfered with solely because 316 | modification has been made. 317 | 318 | If you convey an object code work under this section in, or with, or 319 | specifically for use in, a User Product, and the conveying occurs as 320 | part of a transaction in which the right of possession and use of the 321 | User Product is transferred to the recipient in perpetuity or for a 322 | fixed term (regardless of how the transaction is characterized), the 323 | Corresponding Source conveyed under this section must be accompanied 324 | by the Installation Information. But this requirement does not apply 325 | if neither you nor any third party retains the ability to install 326 | modified object code on the User Product (for example, the work has 327 | been installed in ROM). 328 | 329 | The requirement to provide Installation Information does not include a 330 | requirement to continue to provide support service, warranty, or updates 331 | for a work that has been modified or installed by the recipient, or for 332 | the User Product in which it has been modified or installed. Access to a 333 | network may be denied when the modification itself materially and 334 | adversely affects the operation of the network or violates the rules and 335 | protocols for communication across the network. 336 | 337 | Corresponding Source conveyed, and Installation Information provided, 338 | in accord with this section must be in a format that is publicly 339 | documented (and with an implementation available to the public in 340 | source code form), and must require no special password or key for 341 | unpacking, reading or copying. 342 | 343 | 7. Additional Terms. 344 | 345 | "Additional permissions" are terms that supplement the terms of this 346 | License by making exceptions from one or more of its conditions. 347 | Additional permissions that are applicable to the entire Program shall 348 | be treated as though they were included in this License, to the extent 349 | that they are valid under applicable law. If additional permissions 350 | apply only to part of the Program, that part may be used separately 351 | under those permissions, but the entire Program remains governed by 352 | this License without regard to the additional permissions. 353 | 354 | When you convey a copy of a covered work, you may at your option 355 | remove any additional permissions from that copy, or from any part of 356 | it. (Additional permissions may be written to require their own 357 | removal in certain cases when you modify the work.) You may place 358 | additional permissions on material, added by you to a covered work, 359 | for which you have or can give appropriate copyright permission. 360 | 361 | Notwithstanding any other provision of this License, for material you 362 | add to a covered work, you may (if authorized by the copyright holders of 363 | that material) supplement the terms of this License with terms: 364 | 365 | a) Disclaiming warranty or limiting liability differently from the 366 | terms of sections 15 and 16 of this License; or 367 | 368 | b) Requiring preservation of specified reasonable legal notices or 369 | author attributions in that material or in the Appropriate Legal 370 | Notices displayed by works containing it; or 371 | 372 | c) Prohibiting misrepresentation of the origin of that material, or 373 | requiring that modified versions of such material be marked in 374 | reasonable ways as different from the original version; or 375 | 376 | d) Limiting the use for publicity purposes of names of licensors or 377 | authors of the material; or 378 | 379 | e) Declining to grant rights under trademark law for use of some 380 | trade names, trademarks, or service marks; or 381 | 382 | f) Requiring indemnification of licensors and authors of that 383 | material by anyone who conveys the material (or modified versions of 384 | it) with contractual assumptions of liability to the recipient, for 385 | any liability that these contractual assumptions directly impose on 386 | those licensors and authors. 387 | 388 | All other non-permissive additional terms are considered "further 389 | restrictions" within the meaning of section 10. If the Program as you 390 | received it, or any part of it, contains a notice stating that it is 391 | governed by this License along with a term that is a further 392 | restriction, you may remove that term. If a license document contains 393 | a further restriction but permits relicensing or conveying under this 394 | License, you may add to a covered work material governed by the terms 395 | of that license document, provided that the further restriction does 396 | not survive such relicensing or conveying. 397 | 398 | If you add terms to a covered work in accord with this section, you 399 | must place, in the relevant source files, a statement of the 400 | additional terms that apply to those files, or a notice indicating 401 | where to find the applicable terms. 402 | 403 | Additional terms, permissive or non-permissive, may be stated in the 404 | form of a separately written license, or stated as exceptions; 405 | the above requirements apply either way. 406 | 407 | 8. Termination. 408 | 409 | You may not propagate or modify a covered work except as expressly 410 | provided under this License. Any attempt otherwise to propagate or 411 | modify it is void, and will automatically terminate your rights under 412 | this License (including any patent licenses granted under the third 413 | paragraph of section 11). 414 | 415 | However, if you cease all violation of this License, then your 416 | license from a particular copyright holder is reinstated (a) 417 | provisionally, unless and until the copyright holder explicitly and 418 | finally terminates your license, and (b) permanently, if the copyright 419 | holder fails to notify you of the violation by some reasonable means 420 | prior to 60 days after the cessation. 421 | 422 | Moreover, your license from a particular copyright holder is 423 | reinstated permanently if the copyright holder notifies you of the 424 | violation by some reasonable means, this is the first time you have 425 | received notice of violation of this License (for any work) from that 426 | copyright holder, and you cure the violation prior to 30 days after 427 | your receipt of the notice. 428 | 429 | Termination of your rights under this section does not terminate the 430 | licenses of parties who have received copies or rights from you under 431 | this License. If your rights have been terminated and not permanently 432 | reinstated, you do not qualify to receive new licenses for the same 433 | material under section 10. 434 | 435 | 9. Acceptance Not Required for Having Copies. 436 | 437 | You are not required to accept this License in order to receive or 438 | run a copy of the Program. Ancillary propagation of a covered work 439 | occurring solely as a consequence of using peer-to-peer transmission 440 | to receive a copy likewise does not require acceptance. However, 441 | nothing other than this License grants you permission to propagate or 442 | modify any covered work. These actions infringe copyright if you do 443 | not accept this License. Therefore, by modifying or propagating a 444 | covered work, you indicate your acceptance of this License to do so. 445 | 446 | 10. Automatic Licensing of Downstream Recipients. 447 | 448 | Each time you convey a covered work, the recipient automatically 449 | receives a license from the original licensors, to run, modify and 450 | propagate that work, subject to this License. You are not responsible 451 | for enforcing compliance by third parties with this License. 452 | 453 | An "entity transaction" is a transaction transferring control of an 454 | organization, or substantially all assets of one, or subdividing an 455 | organization, or merging organizations. If propagation of a covered 456 | work results from an entity transaction, each party to that 457 | transaction who receives a copy of the work also receives whatever 458 | licenses to the work the party's predecessor in interest had or could 459 | give under the previous paragraph, plus a right to possession of the 460 | Corresponding Source of the work from the predecessor in interest, if 461 | the predecessor has it or can get it with reasonable efforts. 462 | 463 | You may not impose any further restrictions on the exercise of the 464 | rights granted or affirmed under this License. For example, you may 465 | not impose a license fee, royalty, or other charge for exercise of 466 | rights granted under this License, and you may not initiate litigation 467 | (including a cross-claim or counterclaim in a lawsuit) alleging that 468 | any patent claim is infringed by making, using, selling, offering for 469 | sale, or importing the Program or any portion of it. 470 | 471 | 11. Patents. 472 | 473 | A "contributor" is a copyright holder who authorizes use under this 474 | License of the Program or a work on which the Program is based. The 475 | work thus licensed is called the contributor's "contributor version". 476 | 477 | A contributor's "essential patent claims" are all patent claims 478 | owned or controlled by the contributor, whether already acquired or 479 | hereafter acquired, that would be infringed by some manner, permitted 480 | by this License, of making, using, or selling its contributor version, 481 | but do not include claims that would be infringed only as a 482 | consequence of further modification of the contributor version. For 483 | purposes of this definition, "control" includes the right to grant 484 | patent sublicenses in a manner consistent with the requirements of 485 | this License. 486 | 487 | Each contributor grants you a non-exclusive, worldwide, royalty-free 488 | patent license under the contributor's essential patent claims, to 489 | make, use, sell, offer for sale, import and otherwise run, modify and 490 | propagate the contents of its contributor version. 491 | 492 | In the following three paragraphs, a "patent license" is any express 493 | agreement or commitment, however denominated, not to enforce a patent 494 | (such as an express permission to practice a patent or covenant not to 495 | sue for patent infringement). To "grant" such a patent license to a 496 | party means to make such an agreement or commitment not to enforce a 497 | patent against the party. 498 | 499 | If you convey a covered work, knowingly relying on a patent license, 500 | and the Corresponding Source of the work is not available for anyone 501 | to copy, free of charge and under the terms of this License, through a 502 | publicly available network server or other readily accessible means, 503 | then you must either (1) cause the Corresponding Source to be so 504 | available, or (2) arrange to deprive yourself of the benefit of the 505 | patent license for this particular work, or (3) arrange, in a manner 506 | consistent with the requirements of this License, to extend the patent 507 | license to downstream recipients. "Knowingly relying" means you have 508 | actual knowledge that, but for the patent license, your conveying the 509 | covered work in a country, or your recipient's use of the covered work 510 | in a country, would infringe one or more identifiable patents in that 511 | country that you have reason to believe are valid. 512 | 513 | If, pursuant to or in connection with a single transaction or 514 | arrangement, you convey, or propagate by procuring conveyance of, a 515 | covered work, and grant a patent license to some of the parties 516 | receiving the covered work authorizing them to use, propagate, modify 517 | or convey a specific copy of the covered work, then the patent license 518 | you grant is automatically extended to all recipients of the covered 519 | work and works based on it. 520 | 521 | A patent license is "discriminatory" if it does not include within 522 | the scope of its coverage, prohibits the exercise of, or is 523 | conditioned on the non-exercise of one or more of the rights that are 524 | specifically granted under this License. You may not convey a covered 525 | work if you are a party to an arrangement with a third party that is 526 | in the business of distributing software, under which you make payment 527 | to the third party based on the extent of your activity of conveying 528 | the work, and under which the third party grants, to any of the 529 | parties who would receive the covered work from you, a discriminatory 530 | patent license (a) in connection with copies of the covered work 531 | conveyed by you (or copies made from those copies), or (b) primarily 532 | for and in connection with specific products or compilations that 533 | contain the covered work, unless you entered into that arrangement, 534 | or that patent license was granted, prior to 28 March 2007. 535 | 536 | Nothing in this License shall be construed as excluding or limiting 537 | any implied license or other defenses to infringement that may 538 | otherwise be available to you under applicable patent law. 539 | 540 | 12. No Surrender of Others' Freedom. 541 | 542 | If conditions are imposed on you (whether by court order, agreement or 543 | otherwise) that contradict the conditions of this License, they do not 544 | excuse you from the conditions of this License. If you cannot convey a 545 | covered work so as to satisfy simultaneously your obligations under this 546 | License and any other pertinent obligations, then as a consequence you may 547 | not convey it at all. For example, if you agree to terms that obligate you 548 | to collect a royalty for further conveying from those to whom you convey 549 | the Program, the only way you could satisfy both those terms and this 550 | License would be to refrain entirely from conveying the Program. 551 | 552 | 13. Use with the GNU Affero General Public License. 553 | 554 | Notwithstanding any other provision of this License, you have 555 | permission to link or combine any covered work with a work licensed 556 | under version 3 of the GNU Affero General Public License into a single 557 | combined work, and to convey the resulting work. The terms of this 558 | License will continue to apply to the part which is the covered work, 559 | but the special requirements of the GNU Affero General Public License, 560 | section 13, concerning interaction through a network will apply to the 561 | combination as such. 562 | 563 | 14. Revised Versions of this License. 564 | 565 | The Free Software Foundation may publish revised and/or new versions of 566 | the GNU General Public License from time to time. Such new versions will 567 | be similar in spirit to the present version, but may differ in detail to 568 | address new problems or concerns. 569 | 570 | Each version is given a distinguishing version number. If the 571 | Program specifies that a certain numbered version of the GNU General 572 | Public License "or any later version" applies to it, you have the 573 | option of following the terms and conditions either of that numbered 574 | version or of any later version published by the Free Software 575 | Foundation. If the Program does not specify a version number of the 576 | GNU General Public License, you may choose any version ever published 577 | by the Free Software Foundation. 578 | 579 | If the Program specifies that a proxy can decide which future 580 | versions of the GNU General Public License can be used, that proxy's 581 | public statement of acceptance of a version permanently authorizes you 582 | to choose that version for the Program. 583 | 584 | Later license versions may give you additional or different 585 | permissions. However, no additional obligations are imposed on any 586 | author or copyright holder as a result of your choosing to follow a 587 | later version. 588 | 589 | 15. Disclaimer of Warranty. 590 | 591 | THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY 592 | APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT 593 | HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY 594 | OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, 595 | THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 596 | PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM 597 | IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF 598 | ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 599 | 600 | 16. Limitation of Liability. 601 | 602 | IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 603 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS 604 | THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY 605 | GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE 606 | USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF 607 | DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD 608 | PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), 609 | EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF 610 | SUCH DAMAGES. 611 | 612 | 17. Interpretation of Sections 15 and 16. 613 | 614 | If the disclaimer of warranty and limitation of liability provided 615 | above cannot be given local legal effect according to their terms, 616 | reviewing courts shall apply local law that most closely approximates 617 | an absolute waiver of all civil liability in connection with the 618 | Program, unless a warranty or assumption of liability accompanies a 619 | copy of the Program in return for a fee. 620 | 621 | END OF TERMS AND CONDITIONS 622 | 623 | How to Apply These Terms to Your New Programs 624 | 625 | If you develop a new program, and you want it to be of the greatest 626 | possible use to the public, the best way to achieve this is to make it 627 | free software which everyone can redistribute and change under these terms. 628 | 629 | To do so, attach the following notices to the program. It is safest 630 | to attach them to the start of each source file to most effectively 631 | state the exclusion of warranty; and each file should have at least 632 | the "copyright" line and a pointer to where the full notice is found. 633 | 634 | 635 | Copyright (C) 636 | 637 | This program is free software: you can redistribute it and/or modify 638 | it under the terms of the GNU General Public License as published by 639 | the Free Software Foundation, either version 3 of the License, or 640 | (at your option) any later version. 641 | 642 | This program is distributed in the hope that it will be useful, 643 | but WITHOUT ANY WARRANTY; without even the implied warranty of 644 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 645 | GNU General Public License for more details. 646 | 647 | You should have received a copy of the GNU General Public License 648 | along with this program. If not, see . 649 | 650 | Also add information on how to contact you by electronic and paper mail. 651 | 652 | If the program does terminal interaction, make it output a short 653 | notice like this when it starts in an interactive mode: 654 | 655 | Copyright (C) 656 | This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 657 | This is free software, and you are welcome to redistribute it 658 | under certain conditions; type `show c' for details. 659 | 660 | The hypothetical commands `show w' and `show c' should show the appropriate 661 | parts of the General Public License. Of course, your program's commands 662 | might be different; for a GUI interface, you would use an "about box". 663 | 664 | You should also get your employer (if you work as a programmer) or school, 665 | if any, to sign a "copyright disclaimer" for the program, if necessary. 666 | For more information on this, and how to apply and follow the GNU GPL, see 667 | . 668 | 669 | The GNU General Public License does not permit incorporating your program 670 | into proprietary programs. If your program is a subroutine library, you 671 | may consider it more useful to permit linking proprietary applications with 672 | the library. If this is what you want to do, use the GNU Lesser General 673 | Public License instead of this License. But first, please read 674 | . 675 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # Docker Zabbix for CoreOS server 2 | 3 | This Docker container provides a patched Zabbix agent to monitor a real CoreOS server and all his containers. 4 | 5 | The Zabbix agent has been patched to read system informations from these directories: 6 | 7 | * */coreos/proc* mapped from */proc* on the real host 8 | * */coreos/dev* mapped from */dev* on the real host 9 | * */coreos/sys* mapped from */sys* on the real host 10 | 11 | You can access the Docker REST API through the socket file */coreos/var/run/docker.sock* 12 | 13 | ## Usage 14 | 15 | ### Build the image 16 | 17 | # docker build -t bhuisgen/docker-zabbix-coreos . 18 | 19 | ### Configure your Zabbix server 20 | 21 | #### Import templates 22 | 23 | Import the needed templates in *etc/zabbix/templates* 24 | 25 | #### Create auto-registration action (optional) 26 | 27 | To automatically create new host on the zabbix server, create a auto-registration action (Configuration/Actions/Auto-registration): 28 | 29 | * conditions: Host metadata like 'coreos' 30 | * actions: Add Host, Add host to groups, Link to templates (Custom Template CoreOS, Custom Template Docker, Template App SSH Service, Template ICMP Ping, Template OS Linux) 31 | 32 | The host metadata value is the value shared by all your cluster nodes. Each node must shared the same value. 33 | 34 | If you don't want to use the auto-registration, you must add each node in the frontend. 35 | 36 | ### Run the container 37 | 38 | #### Docker 39 | 40 | To create the container: 41 | 42 | # docker run -d -p 10050:10050 -u 0 -c 1024 -m 64M --memory-swap=-1 \ 43 | -v /proc:/coreos/proc:ro -v /sys:/coreos/sys:ro -v /dev:/coreos/dev:ro \ 44 | -v /var/run/docker.sock:/coreos/var/run/docker.sock \ 45 | --name zabbix-coreos bhuisgen/docker-zabbix-coreos [] 46 | 47 | If you want to access directly to the network stack of the node, you can use the *host* network mode but it is less secure: 48 | 49 | # docker run -d -p 10050:10050 -u 0 -c 1024 -m 64M --memory-swap=-1 --net="host" \ 50 | -v /proc:/coreos/proc:ro -v /sys:/coreos/sys:ro -v /dev:/coreos/dev:ro \ 51 | -v /var/run/docker.sock:/coreos/var/run/docker.sock \ 52 | --name zabbix-coreos bhuisgen/docker-zabbix-coreos [] 53 | 54 | The needed options are: 55 | 56 | * *SERVER* (required): the IP address of the Zabbix server 57 | * *HOSTMETADATA* (required): the metadata value shared by all servers on the same cluster. This value will match the autoregistration action 58 | * *HOSTNAME* (optional): the hostname used by this agent in the zabbix frontend. If no value is given, the machine id of the host will be used 59 | 60 | The agent will start and the auto-registration will add your agent if a auto-registration action is matched for your host metadata. If you don't want to auto-register your nodes, you need to specify the hostname value to use. 61 | 62 | #### Fleet 63 | 64 | Copy this file: 65 | 66 | # cp files/fleet/zabbix-agent /etc/default/zabbix-agent 67 | 68 | Each node will be created with the machine id into the Zabbix frontend. 69 | 70 | Edit the environment file to set the configuration settings: 71 | 72 | # vim /etc/default/zabbix-agent 73 | 74 | The configuration settings are: 75 | 76 | * *SERVER*: the IP address of the Zabbix server 77 | * *HOSTMETADATA* (required): the metadata value shared by all servers on the same cluster. This value will match the autoregistration action 78 | 79 | You can start the agent on all your cluster nodes with fleet: 80 | 81 | # fleetctl submit zabbix-agent 82 | # fleetctl start zabbix-agent 83 | 84 | If you don't want to use auto-registration, create your service unit file. You can use the template in *files/systemd*. 85 | 86 | ### FAQ 87 | 88 | #### What is the machine id of my host ? 89 | 90 | # cat /etc/machine-id 91 | 92 | #### How to modify the agent configuration files ? 93 | 94 | # docker exec -ti zabbix-coreos /bin/bash 95 | 96 | Inside the container: 97 | 98 | # cd /etc/zabbix/ 99 | 100 | #### How to restart the agent ? 101 | 102 | # docker exec -ti zabbix-coreos /bin/bash 103 | 104 | Inside the container: 105 | 106 | # supervisorctl restart zabbix-agent 107 | 108 | #### How to add custom user parameters for a host ? 109 | 110 | Create a custom configuration file *HOSTNAME.conf* in *etc/zabbix/* where HOSTNAME matches the value used for your host agent. Docker will concatenate this file into the main configuration file before running the container. 111 | 112 | Exemple 1: with manual registration, if your zabbix host is *myhost*: 113 | 114 | # vim etc/zabbix/5bcc6a59c4234d1eac3d6c57e3e58eff.conf 115 | 116 | Exemple 2: with auto-registration, if you use *cluster* as host metadata and *5bcc6a59c4234d1eac3d6c57e3e58eff* is the machine id of your real host: 117 | 118 | # vim etc/zabbix/cluster-5bcc6a59c4234d1eac3d6c57e3e58eff.conf 119 | -------------------------------------------------------------------------------- /etc/sudoers.d/zabbix: -------------------------------------------------------------------------------- 1 | zabbix ALL=(ALL:ALL) NOPASSWD: /bin/netcat 2 | -------------------------------------------------------------------------------- /etc/supervisor/conf.d/supervisor.conf: -------------------------------------------------------------------------------- 1 | [supervisord] 2 | nodaemon=true 3 | 4 | [program:zabbix-agent] 5 | command=/usr/sbin/zabbix_agentd -f 6 | directory=/etc/zabbix 7 | autorestart=true 8 | stdout_logfile=NONE 9 | redirect_stderr=true 10 | 11 | [program:zabbix-trapper-disks-discovery] 12 | command=/usr/bin/watch -n 3600 /etc/zabbix/scripts/trapper/disks-discovery 13 | user=zabbix 14 | directory=/etc/zabbix 15 | autorestart=true 16 | stdout_logfile=NONE 17 | redirect_stderr=false 18 | 19 | [program:zabbix-trapper-docker-containers-discovery] 20 | command=/usr/bin/watch -n 900 /etc/zabbix/scripts/trapper/docker-containers-discovery 21 | user=zabbix 22 | directory=/etc/zabbix 23 | autorestart=true 24 | stdout_logfile=NONE 25 | redirect_stderr=false 26 | 27 | [program:zabbix-trapper-docker-processes-discovery] 28 | command=/usr/bin/watch -n 900 /etc/zabbix/scripts/trapper/docker-processes-discovery 29 | user=zabbix 30 | directory=/etc/zabbix 31 | autorestart=true 32 | stdout_logfile=NONE 33 | redirect_stderr=false 34 | 35 | [program:zabbix-trapper-docker] 36 | command=/usr/bin/watch -n 30 /etc/zabbix/scripts/trapper/docker 37 | user=zabbix 38 | directory=/etc/zabbix 39 | autorestart=true 40 | stdout_logfile=NONE 41 | redirect_stderr=false 42 | -------------------------------------------------------------------------------- /etc/supervisor/supervisord.conf: -------------------------------------------------------------------------------- 1 | ; supervisor config file 2 | 3 | [inet_http_server] 4 | port=127.0.0.1:9001 5 | 6 | [supervisord] 7 | user=root 8 | logfile=/var/log/supervisor/supervisord.log 9 | pidfile=/var/run/supervisord.pid 10 | childlogdir=/var/log/supervisor 11 | 12 | [rpcinterface:supervisor] 13 | supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface 14 | 15 | [supervisorctl] 16 | serverurl=http://127.0.0.1:9001 17 | 18 | [include] 19 | files = /etc/supervisor/conf.d/*.conf 20 | -------------------------------------------------------------------------------- /etc/zabbix/scripts/discovery/disks: -------------------------------------------------------------------------------- 1 | #!/usr/bin/perl 2 | 3 | use strict; 4 | use warnings; 5 | 6 | sub get_vmname_by_id 7 | { 8 | my $vmname=`cat /etc/qemu-server/$_[0].conf | grep name | cut -d \: -f 2`; 9 | 10 | $vmname =~ s/^\s+//; #remove leading spaces 11 | $vmname =~ s/\s+$//; #remove trailing spaces 12 | 13 | return $vmname 14 | } 15 | 16 | my $first = 1; 17 | print "{\n"; 18 | print "\t\"data\":[\n\n"; 19 | 20 | for (`cat /proc/diskstats`) 21 | { 22 | my ($major,$minor,$disk) = m/^\s*([0-9]+)\s+([0-9]+)\s+(\S+)\s.*$/; 23 | my $dmnamefile = "/coreos/sys/dev/block/$major:$minor/dm/name"; 24 | my $vmid= ""; 25 | my $vmname = ""; 26 | my $dmname = $disk; 27 | my $diskdev = "/dev/$disk"; 28 | 29 | # DM name 30 | if (-e $dmnamefile) { 31 | $dmname = `cat $dmnamefile`; 32 | $dmname =~ s/\n$//; #remove trailing \n 33 | $diskdev = "/dev/mapper/$dmname"; 34 | } 35 | 36 | print "\t,\n" if not $first; 37 | $first = 0; 38 | 39 | print "\t{\n"; 40 | print "\t\t\"{#DISK}\":\"$disk\",\n"; 41 | print "\t\t\"{#DISKDEV}\":\"$diskdev\",\n"; 42 | print "\t\t\"{#DMNAME}\":\"$dmname\"\n"; 43 | print "\t}\n"; 44 | } 45 | 46 | print "\n\t]\n"; 47 | print "}\n"; 48 | 49 | -------------------------------------------------------------------------------- /etc/zabbix/scripts/discovery/docker-containers: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | DOCKER_SOCKET=/var/run/docker.sock 4 | 5 | CONFIG_FILE=/etc/zabbix/scripts/trapper/docker.conf 6 | 7 | [ -r "$CONFIG_FILE" ] && . $CONFIG_FILE 8 | 9 | CTS=$(echo "GET /containers/json?all=1 HTTP/1.0\r\n"|sudo netcat -U "$DOCKER_SOCKET"|tail -n +5) 10 | LEN=$(echo "$CTS"|jq 'length') 11 | 12 | for I in $(seq 0 $((LEN-1))) 13 | do 14 | NAME=$(echo "$CTS"|jq ".[$I].Names[0]"|sed -e 's/^"\//"/') 15 | 16 | DATA="$DATA,"'{"{#NAME}":'$NAME'}' 17 | done 18 | 19 | echo '{"data":['${DATA#,}']}' 20 | -------------------------------------------------------------------------------- /etc/zabbix/scripts/discovery/docker-processes: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | DOCKER_SOCKET=/var/run/docker.sock 4 | 5 | CONFIG_FILE=/etc/zabbix/scripts/trapper/docker.conf 6 | 7 | [ -r "$CONFIG_FILE" ] && . $CONFIG_FILE 8 | 9 | CTS=$(echo "GET /containers/json?all=1 HTTP/1.0\r\n"|sudo netcat -U "$DOCKER_SOCKET"|tail -n +5) 10 | LEN=$(echo "$CTS"|jq 'length') 11 | 12 | for I in $(seq 0 $((LEN-1))) 13 | do 14 | ID=$(echo "$CTS"|jq ".[$I].Id"|sed -e 's/^"//' -e 's/"$//') 15 | NAME=$(echo "$CTS"|jq ".[$I].Names[0]"|sed -e 's/^"\//"/') 16 | CT=$(echo "GET /containers/$ID/json HTTP/1.0\r\n"|sudo netcat -U "$DOCKER_SOCKET"|tail -n +5) 17 | RUNNING=$(echo "$CT"|jq ".State.Running"|sed -e 's/^"//' -e 's/"$//') 18 | if [ "$RUNNING" = "true" ]; then 19 | TOP=$(echo "GET /containers/$ID/top?ps_args=-aux HTTP/1.0\r\n"|sudo netcat -U "$DOCKER_SOCKET"|tail -n +5) 20 | PS=$(echo "$TOP"|jq ".Processes") 21 | PS_LEN=$(echo "$PS"|jq "length") 22 | 23 | for J in $(seq 0 $((PS_LEN-1))) 24 | do 25 | P=$(echo "$PS"|jq ".[$J]") 26 | 27 | PID=$(echo "$P"|jq ".[1]"|sed -e 's/^"//' -e 's/"$//') 28 | CMD=$(basename $(echo "$P"|jq ".[10]"|sed -e 's/^"//' -e 's/"$//'|cut -d' ' -f1)) 29 | 30 | DATA="$DATA,"'{"{#NAME}":'$NAME',"{#PID}":'$PID',"{#CMD}":"'$CMD'"}' 31 | done 32 | fi 33 | done 34 | 35 | echo '{"data":['${DATA#,}']}' 36 | -------------------------------------------------------------------------------- /etc/zabbix/scripts/docker: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | USAGE="Usage: $(basename "$0") [-s ]" 4 | DOCKER_SOCKET=/var/run/docker.sock 5 | 6 | while getopts hs: OPT; do 7 | case "$OPT" in 8 | h) 9 | echo "$USAGE" 10 | exit 0 11 | ;; 12 | s) 13 | DOCKER_SOCKET=$OPTARG 14 | ;; 15 | \?) 16 | echo "$USAGE" >&2 17 | exit 1 18 | ;; 19 | esac 20 | done 21 | 22 | CTS=$(echo "GET /containers/json?all=1 HTTP/1.0\r\n"|sudo netcat -U "$DOCKER_SOCKET"|tail -n +5) 23 | LEN=$(echo "$CTS"|jq "length") 24 | 25 | for I in $(seq 0 $((LEN-1))) 26 | do 27 | ID=$(echo "$CTS"|jq ".[$I].Id"|sed -e 's/^"//' -e 's/"$//') 28 | NAME=$(echo "$CTS"|jq ".[$I].Names[0]"|sed -e 's/^"\//"/'|sed -e 's/^"//' -e 's/"$//') 29 | 30 | CT=$(echo "GET /containers/$ID/json HTTP/1.0\r\n"|sudo netcat -U "$DOCKER_SOCKET"|tail -n +5) 31 | RUNNING=$(echo "$CT"|jq ".State.Running"|sed -e 's/^"//' -e 's/"$//') 32 | PID=$(echo "$CT"|jq ".State.Pid"|sed -e 's/^"//' -e 's/"$//') 33 | EXITCODE=$(echo "$CT"|jq ".State.ExitCode"|sed -e 's/^"//' -e 's/"$//') 34 | 35 | echo "- docker.containers.running[$NAME] $RUNNING" 36 | echo "- docker.containers.pid[$NAME] $PID" 37 | echo "- docker.containers.exitcode[$NAME] $EXITCODE" 38 | 39 | if [ "$RUNNING" = "true" ]; then 40 | TOP=$(echo "GET /containers/$ID/top?ps_args=-aux HTTP/1.0\r\n"|sudo netcat -U "$DOCKER_SOCKET"|tail -n +5) 41 | PS=$(echo "$TOP"|jq ".Processes") 42 | PS_LEN=$(echo "$PS"|jq "length") 43 | 44 | for J in $(seq 0 $((PS_LEN-1))) 45 | do 46 | P=$(echo "$PS"|jq ".[$J]") 47 | 48 | PID=$(echo "$P"|jq ".[1]"|sed -e 's/^"//' -e 's/"$//') 49 | CPU=$(echo "$P"|jq ".[2]"|sed -e 's/^"//' -e 's/"$//') 50 | MEM=$(echo "$P"|jq ".[3]"|sed -e 's/^"//' -e 's/"$//') 51 | VSZ=$(echo "$P"|jq ".[4]"|sed -e 's/^"//' -e 's/"$//') 52 | RSS=$(echo "$P"|jq ".[5]"|sed -e 's/^"//' -e 's/"$//') 53 | COMMAND=$(echo "$P"|jq ".[10]"|sed -e 's/^"//' -e 's/"$//') 54 | 55 | echo "- docker.top.cpu[$NAME,$PID] $CPU" 56 | echo "- docker.top.mem[$NAME,$PID] $MEM" 57 | echo "- docker.top.vsz[$NAME,$PID] $VSZ" 58 | echo "- docker.top.rss[$NAME,$PID] $RSS" 59 | echo "- docker.top.command[$NAME,$PID] \"$COMMAND\"" 60 | done 61 | fi 62 | done 63 | -------------------------------------------------------------------------------- /etc/zabbix/scripts/trapper/disks-discovery: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | ZABBIX_SENDER=/usr/bin/zabbix_sender 4 | ZABBIX_CONF=/etc/zabbix/zabbix_agentd.conf 5 | 6 | zsend () { 7 | $ZABBIX_SENDER -c $ZABBIX_CONF -k "$1" -o "$2" > /dev/null 2>&1 8 | } 9 | 10 | KEY="disks.discovery" 11 | VALUE=$(/etc/zabbix/scripts/discovery/disks) 12 | if [ "$?" -ne "0" ]; then 13 | exit 1 14 | fi 15 | 16 | zsend "$KEY" "$VALUE" 17 | -------------------------------------------------------------------------------- /etc/zabbix/scripts/trapper/docker: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | ZABBIX_SENDER=/usr/bin/zabbix_sender 4 | ZABBIX_CONF=/etc/zabbix/zabbix_agentd.conf 5 | 6 | DOCKER_SOCKET=/var/run/docker.sock 7 | 8 | CONFIG_FILE=/etc/zabbix/scripts/trapper/docker.conf 9 | 10 | [ -r "$CONFIG_FILE" ] && . $CONFIG_FILE 11 | 12 | zsendall () { 13 | echo "$1"|$ZABBIX_SENDER -c $ZABBIX_CONF -i - 2>&1 >/dev/null 14 | } 15 | 16 | RET=$(/etc/zabbix/scripts/docker -s $DOCKER_SOCKET) 17 | if [ "$?" -ne "0" ]; then 18 | exit 1 19 | fi 20 | 21 | zsendall "$RET" 22 | -------------------------------------------------------------------------------- /etc/zabbix/scripts/trapper/docker-containers-discovery: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | ZABBIX_SENDER=/usr/bin/zabbix_sender 4 | ZABBIX_CONF=/etc/zabbix/zabbix_agentd.conf 5 | 6 | zsend () { 7 | $ZABBIX_SENDER -c $ZABBIX_CONF -k "$1" -o "$2" > /dev/null 2>&1 8 | } 9 | 10 | KEY="docker.discovery.containers" 11 | VALUE=$(/etc/zabbix/scripts/discovery/docker-containers) 12 | if [ "$?" -ne "0" ]; then 13 | exit 1 14 | fi 15 | 16 | zsend "$KEY" "$VALUE" 17 | -------------------------------------------------------------------------------- /etc/zabbix/scripts/trapper/docker-processes-discovery: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | ZABBIX_SENDER=/usr/bin/zabbix_sender 4 | ZABBIX_CONF=/etc/zabbix/zabbix_agentd.conf 5 | 6 | zsend () { 7 | $ZABBIX_SENDER -c $ZABBIX_CONF -k "$1" -o "$2" > /dev/null 2>&1 8 | } 9 | 10 | KEY="docker.discovery.processes" 11 | VALUE=$(/etc/zabbix/scripts/discovery/docker-processes) 12 | if [ "$?" -ne "0" ]; then 13 | exit 1 14 | fi 15 | 16 | zsend "$KEY" "$VALUE" 17 | -------------------------------------------------------------------------------- /etc/zabbix/scripts/trapper/docker.conf: -------------------------------------------------------------------------------- 1 | DOCKER_SOCKET=/coreos/var/run/docker.sock 2 | -------------------------------------------------------------------------------- /etc/zabbix/templates/template_coreos.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 2.0 4 | 2015-09-10T10:20:10Z 5 | 6 | 7 | Templates 8 | 9 | 10 | 11 | 392 | 393 | 394 | 395 | {Custom Template CoreOS:net.tcp.service[tcp,{$COREOS.ETCD_CLIENT_SERVICE_IP},{$COREOS.ETCD_CLIENT_SERVICE_PORT}].last()}=0 396 | Etcd client service is down on {HOST.NAME} 397 | 398 | 0 399 | 4 400 | 401 | 0 402 | 403 | 404 | 405 | {Custom Template CoreOS:proc.num[etcd].last()}=0 406 | Etcd is not running on {HOST.NAME} 407 | 408 | 0 409 | 5 410 | 411 | 0 412 | 413 | 414 | 415 | {Custom Template CoreOS:net.tcp.service[tcp,{$COREOS.ETCD_SERVER_SERVICE_IP},{$COREOS.ETCD_SERVER_SERVICE_PORT}].last()}=0 416 | Etcd server service is down on {HOST.NAME} 417 | 418 | 0 419 | 4 420 | 421 | 0 422 | 423 | 424 | 425 | {Custom Template CoreOS:proc.num[fleetd].last()}=0 426 | Fleet is not running on {HOST.NAME} 427 | 428 | 0 429 | 5 430 | 431 | 0 432 | 433 | 434 | 435 | ({Custom Template CoreOS:proc.num[locksmithd].last()}=0)&({$COREOS.AUTOUPDATE}=1) 436 | Locksmith is not running on {HOST.NAME} 437 | 438 | 0 439 | 5 440 | 441 | 0 442 | 443 | 444 | 445 | ({Custom Template CoreOS:proc.num[locksmithd].last()}#0)&({$COREOS.AUTOUPDATE}=0) 446 | Locksmith is running on {HOST.NAME} 447 | 448 | 0 449 | 5 450 | 451 | 0 452 | 453 | 454 | 455 | ({Custom Template CoreOS:proc.num[update_engine].last()}=0)&({$COREOS.AUTOUPDATE}=1) 456 | Update engine is not running on {HOST.NAME} 457 | 458 | 0 459 | 5 460 | 461 | 0 462 | 463 | 464 | 465 | ({Custom Template CoreOS:proc.num[update_engine].last()}#0)&({$COREOS.AUTOUPDATE}=0) 466 | Update engine is running on {HOST.NAME} 467 | 468 | 0 469 | 5 470 | 471 | 0 472 | 473 | 474 | 475 | 476 | 477 | Etcd memory usage 478 | 900 479 | 200 480 | 0.0000 481 | 100.0000 482 | 1 483 | 1 484 | 0 485 | 1 486 | 0 487 | 0.0000 488 | 0.0000 489 | 1 490 | 0 491 | 0 492 | 0 493 | 494 | 495 | 0 496 | 0 497 | 00C800 498 | 0 499 | 2 500 | 0 501 | 502 | Custom Template CoreOS 503 | proc.mem[etcd] 504 | 505 | 506 | 507 | 508 | 509 | Fleet memory usage 510 | 900 511 | 200 512 | 0.0000 513 | 100.0000 514 | 1 515 | 1 516 | 0 517 | 1 518 | 0 519 | 0.0000 520 | 0.0000 521 | 1 522 | 0 523 | 0 524 | 0 525 | 526 | 527 | 0 528 | 0 529 | 00C800 530 | 0 531 | 2 532 | 0 533 | 534 | Custom Template CoreOS 535 | proc.mem[fleetd] 536 | 537 | 538 | 539 | 540 | 541 | 542 | -------------------------------------------------------------------------------- /etc/zabbix/templates/template_docker.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 2.0 4 | 2015-09-10T10:17:46Z 5 | 6 | 7 | Templates 8 | 9 | 10 | 11 | 625 | 626 | 627 | 628 | {Custom Template Docker:proc.num[docker].last()}=0 629 | Docker is not running on {HOST.NAME} 630 | 631 | 0 632 | 5 633 | 634 | 0 635 | 636 | 637 | 638 | 639 | -------------------------------------------------------------------------------- /etc/zabbix/zabbix_agentd.conf: -------------------------------------------------------------------------------- 1 | # This is a config file for the Zabbix agent daemon (Unix) 2 | # To get more information about Zabbix, visit http://www.zabbix.com 3 | 4 | ############ GENERAL PARAMETERS ################# 5 | 6 | ### Option: PidFile 7 | # Name of PID file. 8 | # 9 | # Mandatory: no 10 | # Default: 11 | # PidFile=/tmp/zabbix_agentd.pid 12 | 13 | ### Option: LogFile 14 | # Name of log file. 15 | # If not set, syslog is used. 16 | # 17 | # Mandatory: no 18 | # Default: 19 | # LogFile= 20 | 21 | ### Option: LogFileSize 22 | # Maximum size of log file in MB. 23 | # 0 - disable automatic log rotation. 24 | # 25 | # Mandatory: no 26 | # Range: 0-1024 27 | # Default: 28 | # LogFileSize=1 29 | 30 | ### Option: DebugLevel 31 | # Specifies debug level 32 | # 0 - no debug 33 | # 1 - critical information 34 | # 2 - error information 35 | # 3 - warnings 36 | # 4 - for debugging (produces lots of information) 37 | # 38 | # Mandatory: no 39 | # Range: 0-4 40 | # Default: 41 | # DebugLevel=3 42 | 43 | ### Option: SourceIP 44 | # Source IP address for outgoing connections. 45 | # 46 | # Mandatory: no 47 | # Default: 48 | # SourceIP= 49 | 50 | ### Option: EnableRemoteCommands 51 | # Whether remote commands from Zabbix server are allowed. 52 | # 0 - not allowed 53 | # 1 - allowed 54 | # 55 | # Mandatory: no 56 | # Default: 57 | # EnableRemoteCommands=0 58 | 59 | ### Option: LogRemoteCommands 60 | # Enable logging of executed shell commands as warnings. 61 | # 0 - disabled 62 | # 1 - enabled 63 | # 64 | # Mandatory: no 65 | # Default: 66 | # LogRemoteCommands=0 67 | 68 | ##### Passive checks related 69 | 70 | ### Option: Server 71 | # List of comma delimited IP addresses (or hostnames) of Zabbix servers. 72 | # Incoming connections will be accepted only from the hosts listed here. 73 | # If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. 74 | # 75 | # Mandatory: no 76 | # Default: 77 | # Server= 78 | 79 | Server=127.0.0.1 80 | 81 | ### Option: ListenPort 82 | # Agent will listen on this port for connections from the server. 83 | # 84 | # Mandatory: no 85 | # Range: 1024-32767 86 | # Default: 87 | # ListenPort=10050 88 | 89 | ### Option: ListenIP 90 | # List of comma delimited IP addresses that the agent should listen on. 91 | # First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. 92 | # 93 | # Mandatory: no 94 | # Default: 95 | # ListenIP=0.0.0.0 96 | 97 | ### Option: StartAgents 98 | # Number of pre-forked instances of zabbix_agentd that process passive checks. 99 | # If set to 0, disables passive checks and the agent will not listen on any TCP port. 100 | # 101 | # Mandatory: no 102 | # Range: 0-100 103 | # Default: 104 | # StartAgents=3 105 | 106 | StartAgents=1 107 | 108 | ##### Active checks related 109 | 110 | ### Option: ServerActive 111 | # List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. 112 | # If port is not specified, default port is used. 113 | # IPv6 addresses must be enclosed in square brackets if port for that host is specified. 114 | # If port is not specified, square brackets for IPv6 addresses are optional. 115 | # If this parameter is not specified, active checks are disabled. 116 | # Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] 117 | # 118 | # Mandatory: no 119 | # Default: 120 | # ServerActive= 121 | 122 | ServerActive=127.0.0.1 123 | 124 | ### Option: Hostname 125 | # Unique, case sensitive hostname. 126 | # Required for active checks and must match hostname as configured on the server. 127 | # Value is acquired from HostnameItem if undefined. 128 | # 129 | # Mandatory: no 130 | # Default: 131 | # Hostname= 132 | 133 | Hostname=zabbix-coreos 134 | 135 | ### Option: HostnameItem 136 | # Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. 137 | # Does not support UserParameters or aliases. 138 | # 139 | # Mandatory: no 140 | # Default: 141 | # HostnameItem=system.hostname 142 | 143 | ### Option: HostMetadata 144 | # Optional parameter that defines host metadata. 145 | # Host metadata is used at host auto-registration process. 146 | # An agent will issue an error and not start if the value is over limit of 255 characters. 147 | # If not defined, value will be acquired from HostMetadataItem. 148 | # 149 | # Mandatory: no 150 | # Range: 0-255 characters 151 | # Default: 152 | # HostMetadata= 153 | 154 | HostMetadata=zabbix-coreos 155 | 156 | ### Option: HostMetadataItem 157 | # Optional parameter that defines an item used for getting host metadata. 158 | # Host metadata is used at host auto-registration process. 159 | # During an auto-registration request an agent will log a warning message if 160 | # the value returned by specified item is over limit of 255 characters. 161 | # This option is only used when HostMetadata is not defined. 162 | # 163 | # Mandatory: no 164 | # Default: 165 | # HostMetadataItem= 166 | 167 | ### Option: RefreshActiveChecks 168 | # How often list of active checks is refreshed, in seconds. 169 | # 170 | # Mandatory: no 171 | # Range: 60-3600 172 | # Default: 173 | # RefreshActiveChecks=120 174 | 175 | ### Option: BufferSend 176 | # Do not keep data longer than N seconds in buffer. 177 | # 178 | # Mandatory: no 179 | # Range: 1-3600 180 | # Default: 181 | # BufferSend=5 182 | 183 | ### Option: BufferSize 184 | # Maximum number of values in a memory buffer. The agent will send 185 | # all collected data to Zabbix Server or Proxy if the buffer is full. 186 | # 187 | # Mandatory: no 188 | # Range: 2-65535 189 | # Default: 190 | # BufferSize=100 191 | 192 | ### Option: MaxLinesPerSecond 193 | # Maximum number of new lines the agent will send per second to Zabbix Server 194 | # or Proxy processing 'log' and 'logrt' active checks. 195 | # The provided value will be overridden by the parameter 'maxlines', 196 | # provided in 'log' or 'logrt' item keys. 197 | # 198 | # Mandatory: no 199 | # Range: 1-1000 200 | # Default: 201 | # MaxLinesPerSecond=100 202 | 203 | ############ ADVANCED PARAMETERS ################# 204 | 205 | ### Option: Alias 206 | # Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one. 207 | # Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed. 208 | # Different Alias keys may reference the same item key. 209 | # For example, to retrieve the ID of user 'zabbix': 210 | # Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1] 211 | # Now shorthand key zabbix.userid may be used to retrieve data. 212 | # Aliases can be used in HostMetadataItem but not in HostnameItem parameters. 213 | # 214 | # Mandatory: no 215 | # Range: 216 | # Default: 217 | 218 | ### Option: Timeout 219 | # Spend no more than Timeout seconds on processing 220 | # 221 | # Mandatory: no 222 | # Range: 1-30 223 | # Default: 224 | # Timeout=3 225 | 226 | ### Option: AllowRoot 227 | # Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent 228 | # will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. 229 | # 0 - do not allow 230 | # 1 - allow 231 | # 232 | # Mandatory: no 233 | # Default: 234 | # AllowRoot=0 235 | 236 | ### Option: Include 237 | # You may include individual files or all files in a directory in the configuration file. 238 | # Installing Zabbix will create include directory in /etc/zabbix, unless modified during the compile time. 239 | # 240 | # Mandatory: no 241 | # Default: 242 | # Include= 243 | 244 | # Include=/etc/zabbix/zabbix_agentd.userparams.conf 245 | # Include=/etc/zabbix/zabbix_agentd.conf.d/ 246 | 247 | Include=/etc/zabbix/zabbix_agentd.conf.d/ 248 | 249 | ####### USER-DEFINED MONITORED PARAMETERS ####### 250 | 251 | ### Option: UnsafeUserParameters 252 | # Allow all characters to be passed in arguments to user-defined parameters. 253 | # 0 - do not allow 254 | # 1 - allow 255 | # 256 | # Mandatory: no 257 | # Range: 0-1 258 | # Default: 259 | # UnsafeUserParameters=0 260 | 261 | ### Option: UserParameter 262 | # User-defined parameter to monitor. There can be several user-defined parameters. 263 | # Format: UserParameter=, 264 | # See 'zabbix_agentd' directory for examples. 265 | # 266 | # Mandatory: no 267 | # Default: 268 | # UserParameter= 269 | 270 | ####### LOADABLE MODULES ####### 271 | 272 | ### Option: LoadModulePath 273 | # Full path to location of agent modules. 274 | # Default depends on compilation options. 275 | # 276 | # Mandatory: no 277 | # Default: 278 | # LoadModulePath=${libdir}/modules 279 | 280 | ### Option: LoadModule 281 | # Module to load at agent startup. Modules are used to extend functionality of the agent. 282 | # Format: LoadModule= 283 | # The modules must be located in directory specified by LoadModulePath. 284 | # It is allowed to include multiple LoadModule parameters. 285 | # 286 | # Mandatory: no 287 | # Default: 288 | # LoadModule= 289 | -------------------------------------------------------------------------------- /etc/zabbix/zabbix_agentd.conf.d/userparameter_custom.conf: -------------------------------------------------------------------------------- 1 | UserParameter=custom.entropy,cat /coreos/proc/sys/kernel/random/entropy_avail 2 | UserParameter=custom.fd.current,awk '{print $1-$2}' < /coreos/proc/sys/fs/file-nr 3 | UserParameter=custom.fd.max,awk '{print $3}' < /coreos/proc/sys/fs/file-nr 4 | UserParameter=custom.net.listen,ss -tanu | grep LISTEN | wc -l 5 | UserParameter=custom.net.waiting,ss -tanu | grep TIME-WAIT | wc -l 6 | UserParameter=custom.net.established,ss -tanpu | grep ESTAB | wc -l 7 | UserParameter=custom.net.tcp,ss -tan | wc -l 8 | UserParameter=custom.net.tcp4,ss -tan4 | wc -l 9 | UserParameter=custom.net.tcp6,ss -tan6 | wc -l 10 | UserParameter=custom.net.udp,ss -uan | wc -l 11 | UserParameter=custom.net.udp4,ss -uan4 | wc -l 12 | UserParameter=custom.net.udp6,ss -uan6 | wc -l 13 | UserParameter=custom.proc.low,ps --no-header -eo stat | grep \< | wc -l 14 | UserParameter=custom.proc.high,ps --no-header -eo stat | grep N | wc -l 15 | UserParameter=custom.proc.lock,ps --no-header -eo stat | grep L | wc -l 16 | UserParameter=custom.proc.fork,grep process /coreos/proc/stat|cut -d' ' -f 2 17 | UserParameter=custom.proc.threads,grep -s '^Threads' /coreos/proc/[0-9]*/status | awk '{ sum += $2; } END { print sum; }' 18 | UserParameter=custom.vfs.dev.read.ops[*],cat /coreos/proc/diskstats | grep "$1" | head -1 | awk '{print $$4}' 19 | UserParameter=custom.vfs.dev.read.ms[*],cat /coreos/proc/diskstats | grep "$1" | head -1 | awk '{print $$7}' 20 | UserParameter=custom.vfs.dev.write.ops[*],cat /coreos/proc/diskstats | grep "$1" | head -1 | awk '{print $$8}' 21 | UserParameter=custom.vfs.dev.write.ms[*],cat /coreos/proc/diskstats | grep "$1" | head -1 | awk '{print $$11}' 22 | UserParameter=custom.vfs.dev.io.active[*],cat /coreos/proc/diskstats | grep "$1" | head -1 | awk '{print $$12}' 23 | UserParameter=custom.vfs.dev.io.ms[*],cat /coreos/proc/diskstats | grep "$1" | head -1 | awk '{print $$13}' 24 | UserParameter=custom.vfs.dev.read.sectors[*],cat /coreos/proc/diskstats | grep "$1" | head -1 | awk '{print $$6}' 25 | UserParameter=custom.vfs.dev.write.sectors[*],cat /coreos/proc/diskstats | grep "$1" | head -1 | awk '{print $$10}' 26 | 27 | # discovery 28 | UserParameter=custom.disks.discovery,/etc/zabbix/scripts/discovery/disks 29 | -------------------------------------------------------------------------------- /etc/zabbix/zabbix_agentd.conf.d/userparameter_docker.conf: -------------------------------------------------------------------------------- 1 | # discovery 2 | UserParameter=docker.discovery.containers,/etc/zabbix/scripts/discovery/docker-containers 3 | UserParameter=docker.discovery.processes,/etc/zabbix/scripts/discovery/docker-processes 4 | -------------------------------------------------------------------------------- /files/coreos.patch: -------------------------------------------------------------------------------- 1 | Description: Add CoreOS support 2 | Allow running and monitoring on CoreOS servers 3 | Author: Boris HUISGEN 4 | Last-Update: 2014-10-10 5 | --- 6 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ 7 | --- a/include/common.h 8 | +++ b/include/common.h 9 | @@ -1067,4 +1067,7 @@ 10 | #define ZBX_SESSION_ACTIVE 0 11 | #define ZBX_SESSION_PASSIVE 1 12 | 13 | +#define ZBX_RUN_BACKGROUND 0 14 | +#define ZBX_RUN_FOREGROUND 1 15 | + 16 | #endif 17 | --- a/include/daemon.h 18 | +++ b/include/daemon.h 19 | @@ -30,7 +30,7 @@ 20 | 21 | #include "threads.h" 22 | 23 | -int daemon_start(int allow_root); 24 | +int daemon_start(int allow_root, int run_foreground); 25 | void daemon_stop(); 26 | 27 | int zbx_sigusr_send(zbx_task_t task); 28 | @@ -38,6 +38,6 @@ 29 | #define ZBX_IS_RUNNING() 1 30 | #define ZBX_DO_EXIT() 31 | 32 | -#define START_MAIN_ZABBIX_ENTRY(a) daemon_start(a) 33 | +#define START_MAIN_ZABBIX_ENTRY(a, f) daemon_start(a, f) 34 | 35 | #endif /* ZABBIX_DAEMON_H */ 36 | --- a/src/libs/zbxnix/daemon.c 37 | +++ b/src/libs/zbxnix/daemon.c 38 | @@ -134,13 +134,14 @@ 39 | * Purpose: init process as daemon * 40 | * * 41 | * Parameters: allow_root - allow root permission for application * 42 | + * run_foreground - allow running in foreground * 43 | * * 44 | * Author: Alexei Vladishev * 45 | * * 46 | * Comments: it doesn't allow running under 'root' if allow_root is zero * 47 | * * 48 | ******************************************************************************/ 49 | -int daemon_start(int allow_root) 50 | +int daemon_start(int allow_root, int run_foreground) 51 | { 52 | pid_t pid; 53 | struct passwd *pwd; 54 | @@ -186,15 +187,20 @@ 55 | #endif 56 | } 57 | 58 | - if (0 != (pid = zbx_fork())) 59 | - exit(0); 60 | + if (ZBX_RUN_FOREGROUND != run_foreground) 61 | + if (0 != (pid = zbx_fork())) 62 | + exit(0); 63 | 64 | setsid(); 65 | 66 | signal(SIGHUP, SIG_IGN); 67 | 68 | - if (0 != (pid = zbx_fork())) 69 | - exit(0); 70 | + if (ZBX_RUN_FOREGROUND == run_foreground) { 71 | + zabbix_log(LOG_LEVEL_INFORMATION, "Running in foreground"); 72 | + } else { 73 | + if (0 != (pid = zbx_fork())) 74 | + exit(0); 75 | + } 76 | 77 | if (-1 == chdir("/")) /* this is to eliminate warning: ignoring return value of chdir */ 78 | assert(0); 79 | --- a/src/zabbix_agent/zabbix_agentd.c 80 | +++ b/src/zabbix_agent/zabbix_agentd.c 81 | @@ -58,6 +58,8 @@ 82 | static char DEFAULT_CONFIG_FILE[] = SYSCONFDIR "/zabbix_agentd.conf"; 83 | #endif 84 | 85 | +int CONFIG_FOREGROUND = ZBX_RUN_FOREGROUND; 86 | + 87 | /* application TITLE */ 88 | const char title_message[] = APPLICATION_NAME 89 | #if defined(_WIN64) 90 | @@ -77,7 +79,7 @@ 91 | 92 | /* application USAGE message */ 93 | const char usage_message[] = 94 | - "[-Vhp]" 95 | + "[-Vhfp]" 96 | #ifdef _WINDOWS 97 | " [-idsx] [-m]" 98 | #endif 99 | @@ -89,6 +91,7 @@ 100 | "Options:", 101 | "", 102 | " -c --config Absolute path to the configuration file", 103 | + " -f --foreground Run in foreground", 104 | " -p --print Print known items and exit", 105 | " -t --test Test specified item and exit", 106 | " -h --help Give this help", 107 | @@ -115,6 +118,7 @@ 108 | {"config", 1, NULL, 'c'}, 109 | {"help", 0, NULL, 'h'}, 110 | {"version", 0, NULL, 'V'}, 111 | + {"foreground", 0, NULL, 'f'}, 112 | {"print", 0, NULL, 'p'}, 113 | {"test", 1, NULL, 't'}, 114 | #ifdef _WINDOWS 115 | @@ -130,7 +134,7 @@ 116 | }; 117 | 118 | static char shortopts[] = 119 | - "c:hVpt:" 120 | + "c:hVfpt:" 121 | #ifdef _WINDOWS 122 | "idsxm" 123 | #endif 124 | @@ -178,6 +182,9 @@ 125 | #endif 126 | exit(EXIT_FAILURE); 127 | break; 128 | + case 'f': 129 | + CONFIG_FOREGROUND = ZBX_RUN_FOREGROUND; 130 | + break; 131 | case 'p': 132 | if (ZBX_TASK_START == t->task) 133 | t->task = ZBX_TASK_PRINT_SUPPORTED; 134 | @@ -839,7 +846,7 @@ 135 | break; 136 | } 137 | 138 | - START_MAIN_ZABBIX_ENTRY(CONFIG_ALLOW_ROOT); 139 | + START_MAIN_ZABBIX_ENTRY(CONFIG_ALLOW_ROOT, CONFIG_FOREGROUND); 140 | 141 | exit(SUCCEED); 142 | } 143 | --- a/src/zabbix_proxy/proxy.c 144 | +++ b/src/zabbix_proxy/proxy.c 145 | @@ -66,6 +66,7 @@ 146 | const char *help_message[] = { 147 | "Options:", 148 | " -c --config Absolute path to the configuration file", 149 | + " -f --foreground Run in foreground", 150 | " -R --runtime-control