Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

devel branch merge #14

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open

devel branch merge #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
27e01b3
New template: Service php-fpm
kloczek Jun 20, 2018
7ced995
Cleanups.
kloczek Jun 21, 2018
703d8cc
Service Zabbix Agent template
kloczek Jun 21, 2018
5452583
Change php-fpm URL to tree/devel instead tree/master.
kloczek Jun 21, 2018
c58edb0
Service Nginx new item reqs_per_conn and graph presenting this metric.
kloczek Jun 22, 2018
174b726
Adding a macro that is used to check whether SSH is running on a
Ciacho Jun 27, 2018
5bf2dd0
IF-MIB LLDs chages.
kloczek Jun 30, 2018
f71db34
Typo.
kloczek Jun 30, 2018
80b0388
Typo.
kloczek Jun 30, 2018
d783705
Add use [{#IFINDEX}] in interfaces application prototype as well.
kloczek Jun 30, 2018
bea90d0
- Create macro {$SVC_PHP_FPM_PROC}
Ciacho Jul 3, 2018
7028a09
Merge pull request #13 from Ciacho/php-fpm-13
kloczek Jul 3, 2018
4b04e66
Change macros names:
kloczek Jul 3, 2018
24dafb7
Document macros used by template.
kloczek Jul 3, 2018
6d29de7
Use "PROC::$1" in item name instead "PROC::php-fpm" to not hardcoded …
kloczek Jul 3, 2018
be1f185
Document what needs to be done if PROC::php-fpm shows "0"
kloczek Jul 3, 2018
34b360f
s/If on some systems/If on some Linux systems/
kloczek Jul 3, 2018
f58a4b2
Document as well in PROC::php-fpm trigger description that
kloczek Jul 3, 2018
26f7ece
Typo s/pfm/fpm/
kloczek Jul 3, 2018
31899a5
Service Zabbix Server template presentation layer impromements:
kloczek Jul 4, 2018
7e51259
OS Windows template:
kloczek Jul 17, 2018
6230bc2
OS Linux
kloczek Oct 5, 2018
154f9b0
IF-MIB
kloczek Oct 6, 2018
28bb9f8
OS Solaris:
kloczek Oct 6, 2018
38d65ef
Make all templates zabbix 4.0.x ready by remove using $1-$9 macros in…
kloczek Oct 6, 2018
e3bc741
Merge branch 'devel' into devel
kloczek Oct 6, 2018
541e70e
Merge pull request #9 from Ciacho/devel
kloczek Oct 6, 2018
757284d
Updated for for zabbix 4.2
May 29, 2019
b2776a7
Service Apache: new macro {$HTTP_SERVICE_PROCESS}
May 29, 2019
28aacaf
Screens graphs resolution changes to 1200x200 or 600x200.
May 29, 2019
fee4acb
Service Nginx: add use {$NGINX_PORT} macro
May 29, 2019
5c36ad5
Service Apache: Introduce macros abstraction like in Nginx template
kloczek May 29, 2019
327de40
OS Solaris: copy set of 6 NET LLD items prototypes from OS Linux
kloczek May 29, 2019
6034b61
Restore SVC::Apache::processes graph on the main scree.
kloczek May 30, 2019
0e8e074
Service Apache: Rename all {$APACHE_SERVICE_*} macros to {$SVC_APACHE_*}
kloczek May 31, 2019
f894d93
Service Nginx: rename all all {$NGINX_*} macros to {$SVC_NGINX_*}
kloczek May 31, 2019
a0d4fce
OS Solaris: Add all NET: LLD items LLD to NET Application
Jun 1, 2019
2b2cfb6
OS Solaris: changed "VOL:" LLD Application from VOL to per volume VOL…
Jun 1, 2019
a5aceac
OS Linux: VOL: and NET: LLDs items Application changed to prototype
Jun 1, 2019
4694c5f
OS Windows: VOL: and NET: LLDs items Application changed to prototype
Jun 1, 2019
35656e8
Move to the end of file all Changelog entries in all in README.md files.
kloczek Jun 3, 2019
e111565
Add use md marups.
kloczek Jun 6, 2019
9073b05
OS Solaris: replace DSK, NET and VOL Applications by prototypes in LL…
kloczek Jun 6, 2019
ddbe219
Service MySQL: use md format in template description.
kloczek Jun 7, 2019
b5af2ad
OS Linux and OS Solaris: removed monitoring sshd, crond and rsyslogd
kloczek Jun 7, 2019
a055e1c
OS Linux: chage key of the HW::CPU and SYS::rh-distribution->SYS::os-…
kloczek Jun 7, 2019
f5f6631
OS Linux: NET::segments retransmitted now works on latest and old Lin…
kloczek Jun 7, 2019
f525092
OS Linux: use in DSK: LLD items Application prototype DSK::{#DISK}
kloczek Jun 7, 2019
3630e31
OS Linux: VOL: triggers fixes
kloczek Jun 7, 2019
070e1a2
OS Solaris: remove NET::service::$i item and associated trigger as well.
Jun 8, 2019
e30dea6
OS Solaris: removed duplicated SYS::Host is down trigger.
Jun 8, 2019
332327c
OS Linux: LXC monitoring adaptation
kloczek Jun 10, 2019
bfffbb7
OS Linux: "DSK, NET" screen added.
kloczek Jul 30, 2019
5cf6246
OS Linux: Added 4th level of the alarm in VOL::{#FSNAME}::free {ITEM.…
kloczek Jul 30, 2019
739b2bb
OS Linux: fixed "DSK:" filter to get reed of loop devices.
kloczek Jul 30, 2019
df5a91b
OS Linux: more "DSK:" lld filter regexp cleanups.
kloczek Jul 30, 2019
cb6aa46
Replace ''' by ```
kloczek Jul 30, 2019
572e126
OS: Linux: CPU::idle triggers change to raise alarm when idle time is…
kloczek Jul 30, 2019
b957646
OS Linux: "DSK:" filter: remove from the list of moniitored block dev…
kloczek Jul 31, 2019
9bfd45f
OS linux: fix DSK: LLD filter.
kloczek Aug 6, 2019
de05c88
OS Linux: updated DSK: LLD descriptoion.
kloczek Aug 6, 2019
7d9abe6
OS Linux: added new MEM:: metrics and new MEM:active vs inactive graph.
kloczek Aug 6, 2019
d2bba8e
OS Linux: MEM::total history period changed to 1h
kloczek Aug 6, 2019
77111e6
OS Linux: not commited previousely MEM:active vs inactive graph.
kloczek Aug 6, 2019
27f31ab
OS Linux: MEM screen vsize changed to 2 (missing bit from prev commits).
kloczek Aug 6, 2019
5d5b9f6
OS Linux: VOL: {#FSNAME}::total and {#FSNAME}::inodes::total items hi…
kloczek Aug 6, 2019
fd28cdb
OS Linux: document that template now can be used on Ubuntu and compat…
kloczek Aug 6, 2019
b9511ae
OS Linux: remove CPI::idle time <15% trigger (one is enough).
kloczek Aug 6, 2019
0786629
OS Solaris and OS Linux: CPU::idle time trigger logic now uses macros.
kloczek Aug 6, 2019
1172df1
Service MySQL: merge some changes already present in Nginx, php-fpm:
kloczek Aug 9, 2019
96043a8
OS Linux: Add proper dependency on "SYS::Host is down" trigger.
kloczek Aug 9, 2019
b29ff70
OS Windows: the same triggers dependency changes as in "OS Linux".
kloczek Aug 9, 2019
776ff7c
OS Solaris: the same triggers dependency changes as in "OS Linux".
kloczek Aug 9, 2019
e2406a3
Service Nginx: rename {$SVC_NGINX_PROCESS} to {$SVC_NGINX_PROC}
kloczek Aug 12, 2019
30fa3ad
Service MySQL: Documented how to setup mysql server to allow monitor it
kloczek Sep 12, 2019
34581a5
Start standarisation severities of the triggers.
kloczek Oct 18, 2019
95cd239
Service MySQL, Service Zabbix Agent: change trigger severity about ve…
kloczek Oct 18, 2019
27bedb5
Typos.
kloczek Oct 18, 2019
aa4db00
OS Linux: add complete swap monitoring using LLD.
kloczek Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 59 additions & 4 deletions ICMP/ICMP.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<zabbix_export>
<version>3.4</version>
<date>2018-06-11T11:37:57Z</date>
<version>4.2</version>
<date>2019-05-29T15:03:45Z</date>
<groups>
<group>
<name>Templates</name>
Expand Down Expand Up @@ -70,6 +70,24 @@ Notes:&#13;
<logtimefmt/>
<preprocessing/>
<jmx_endpoint/>
<timeout>3s</timeout>
<url/>
<query_fields/>
<posts/>
<status_codes>200</status_codes>
<follow_redirects>1</follow_redirects>
<post_type>0</post_type>
<http_proxy/>
<headers/>
<retrieve_mode>0</retrieve_mode>
<request_method>0</request_method>
<output_format>0</output_format>
<allow_traps>0</allow_traps>
<ssl_cert_file/>
<ssl_key_file/>
<ssl_key_password/>
<verify_peer>0</verify_peer>
<verify_host>0</verify_host>
<master_item/>
</item>
<item>
Expand Down Expand Up @@ -111,6 +129,24 @@ Notes:&#13;
<logtimefmt/>
<preprocessing/>
<jmx_endpoint/>
<timeout>3s</timeout>
<url/>
<query_fields/>
<posts/>
<status_codes>200</status_codes>
<follow_redirects>1</follow_redirects>
<post_type>0</post_type>
<http_proxy/>
<headers/>
<retrieve_mode>0</retrieve_mode>
<request_method>0</request_method>
<output_format>0</output_format>
<allow_traps>0</allow_traps>
<ssl_cert_file/>
<ssl_key_file/>
<ssl_key_password/>
<verify_peer>0</verify_peer>
<verify_host>0</verify_host>
<master_item/>
</item>
<item>
Expand Down Expand Up @@ -152,6 +188,24 @@ Notes:&#13;
<logtimefmt/>
<preprocessing/>
<jmx_endpoint/>
<timeout>3s</timeout>
<url/>
<query_fields/>
<posts/>
<status_codes>200</status_codes>
<follow_redirects>1</follow_redirects>
<post_type>0</post_type>
<http_proxy/>
<headers/>
<retrieve_mode>0</retrieve_mode>
<request_method>0</request_method>
<output_format>0</output_format>
<allow_traps>0</allow_traps>
<ssl_cert_file/>
<ssl_key_file/>
<ssl_key_password/>
<verify_peer>0</verify_peer>
<verify_host>0</verify_host>
<master_item/>
</item>
</items>
Expand All @@ -167,7 +221,7 @@ Notes:&#13;
<screen_items>
<screen_item>
<resourcetype>0</resourcetype>
<width>900</width>
<width>1200</width>
<height>200</height>
<x>0</x>
<y>0</y>
Expand All @@ -189,7 +243,7 @@ Notes:&#13;
</screen_item>
<screen_item>
<resourcetype>0</resourcetype>
<width>900</width>
<width>1200</width>
<height>200</height>
<x>0</x>
<y>1</y>
Expand All @@ -212,6 +266,7 @@ Notes:&#13;
</screen_items>
</screen>
</screens>
<tags/>
</template>
</templates>
<triggers>
Expand Down
5 changes: 3 additions & 2 deletions ICMP/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
#### Description:
Base ICMP template checking availability of the host using ICMP protocol.

#### Notes:
- This template is used by all OS and SNMP Devices templates.

#### Changelog:
- 1.0.4 (2018-06-11):
- Screens:
Expand All @@ -12,5 +15,3 @@ Base ICMP template checking availability of the host using ICMP protocol.
- 1.0.0:
- initial version

#### Notes:
- This template is used by all OS and SNMP Devices templates.
65 changes: 61 additions & 4 deletions MIB/F5-BIGIP-LOCAL-MIB/F5-BIGIP-LOCAL-MIB.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<zabbix_export>
<version>3.4</version>
<date>2018-06-11T11:38:00Z</date>
<version>4.2</version>
<date>2019-05-29T12:46:29Z</date>
<groups>
<group>
<name>Templates SNMP MIB</name>
Expand Down Expand Up @@ -99,8 +99,26 @@ Notes:</description>
<logtimefmt/>
<preprocessing/>
<jmx_endpoint/>
<timeout>3s</timeout>
<url/>
<query_fields/>
<posts/>
<status_codes>200</status_codes>
<follow_redirects>1</follow_redirects>
<post_type>0</post_type>
<http_proxy/>
<headers/>
<retrieve_mode>0</retrieve_mode>
<request_method>0</request_method>
<output_format>0</output_format>
<allow_traps>0</allow_traps>
<ssl_cert_file/>
<ssl_key_file/>
<ssl_key_password/>
<verify_peer>0</verify_peer>
<verify_host>0</verify_host>
<application_prototypes/>
<master_item_prototype/>
<master_item/>
</item_prototype>
<item_prototype>
<name>ltmPoolMemberCnt.$1</name>
Expand Down Expand Up @@ -141,8 +159,26 @@ Notes:</description>
<logtimefmt/>
<preprocessing/>
<jmx_endpoint/>
<timeout>3s</timeout>
<url/>
<query_fields/>
<posts/>
<status_codes>200</status_codes>
<follow_redirects>1</follow_redirects>
<post_type>0</post_type>
<http_proxy/>
<headers/>
<retrieve_mode>0</retrieve_mode>
<request_method>0</request_method>
<output_format>0</output_format>
<allow_traps>0</allow_traps>
<ssl_cert_file/>
<ssl_key_file/>
<ssl_key_password/>
<verify_peer>0</verify_peer>
<verify_host>0</verify_host>
<application_prototypes/>
<master_item_prototype/>
<master_item/>
</item_prototype>
</item_prototypes>
<trigger_prototypes>
Expand Down Expand Up @@ -211,12 +247,33 @@ Notes:</description>
</graph_prototypes>
<host_prototypes/>
<jmx_endpoint/>
<timeout>3s</timeout>
<url/>
<query_fields/>
<posts/>
<status_codes>200</status_codes>
<follow_redirects>1</follow_redirects>
<post_type>0</post_type>
<http_proxy/>
<headers/>
<retrieve_mode>0</retrieve_mode>
<request_method>0</request_method>
<allow_traps>0</allow_traps>
<ssl_cert_file/>
<ssl_key_file/>
<ssl_key_password/>
<verify_peer>0</verify_peer>
<verify_host>0</verify_host>
<lld_macro_paths/>
<preprocessing/>
<master_item/>
</discovery_rule>
</discovery_rules>
<httptests/>
<macros/>
<templates/>
<screens/>
<tags/>
</template>
</templates>
</zabbix_export>
7 changes: 5 additions & 2 deletions MIB/F5-BIGIP-LOCAL-MIB/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@

#### OIDs tree: [F5-BIGIP-LOCAL-MIB](http://www.oidview.com/mibs/3375/F5-BIGIP-LOCAL-MIB.html)

#### Notes:

#### Changelog:
- (devel):
- Items:
- make template zabbix 4.0.x ready by remove using $1-$9 macros in items names
- 1.0.4 (2018-06-11):
- channge default history perid to 2w
- add template description
- Graphs:
- change resolution of all graphs to 1200x300
- 1.0.0:
- initial version

#### Notes:
Loading