Fix Zabbix 2.2 triggers expressions
Change-Id: I95b0b47daff5dc6189ef7502cfb2cb3c408d6e07
This commit is contained in:
parent
d7b53e07a5
commit
5854acda6e
|
@ -29,8 +29,10 @@ class plugin_zabbix::params {
|
||||||
|
|
||||||
if versioncmp($zabbix_version, '2.4') < 0 {
|
if versioncmp($zabbix_version, '2.4') < 0 {
|
||||||
$zabbix_includes = $zabbix_extra_conf_dir
|
$zabbix_includes = $zabbix_extra_conf_dir
|
||||||
|
$zabbix_trigger_exp_not_equal = '#'
|
||||||
} else {
|
} else {
|
||||||
$zabbix_includes = "${zabbix_extra_conf_dir}/*.conf"
|
$zabbix_includes = "${zabbix_extra_conf_dir}/*.conf"
|
||||||
|
$zabbix_trigger_exp_not_equal = '<>'
|
||||||
}
|
}
|
||||||
|
|
||||||
$zabbix_ports = {
|
$zabbix_ports = {
|
||||||
|
|
|
@ -34,6 +34,18 @@ class plugin_zabbix::server::config {
|
||||||
source => 'puppet:///modules/plugin_zabbix/import'
|
source => 'puppet:///modules/plugin_zabbix/import'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
file { '/etc/zabbix/import/Template_App_MySQL.xml':
|
||||||
|
ensure => present,
|
||||||
|
require => File['/etc/zabbix/import'],
|
||||||
|
content => template('plugin_zabbix/Template_App_MySQL.xml.erb'),
|
||||||
|
}
|
||||||
|
|
||||||
|
file { '/etc/zabbix/import/Template_App_OpenStack_Ceph_Cluster.xml':
|
||||||
|
ensure => present,
|
||||||
|
require => File['/etc/zabbix/import'],
|
||||||
|
content => template('plugin_zabbix/Template_App_OpenStack_Ceph_Cluster.xml.erb'),
|
||||||
|
}
|
||||||
|
|
||||||
Plugin_zabbix_configuration_import {
|
Plugin_zabbix_configuration_import {
|
||||||
require => File['/etc/zabbix/import'],
|
require => File['/etc/zabbix/import'],
|
||||||
}
|
}
|
||||||
|
|
|
@ -762,7 +762,7 @@ It requires user parameter mysql.status[*], which is defined in userparameter_my
|
||||||
<dependencies/>
|
<dependencies/>
|
||||||
</trigger>
|
</trigger>
|
||||||
<trigger>
|
<trigger>
|
||||||
<expression>{Template App MySQL:db.wsrep.connected.query.last(0)}<>1</expression>
|
<expression>{Template App MySQL:db.wsrep.connected.query.last(0)}<%= scope.lookupvar('plugin_zabbix::params::zabbix_trigger_exp_not_equal') %>1</expression>
|
||||||
<name>MySQL is not connected to the cluster</name>
|
<name>MySQL is not connected to the cluster</name>
|
||||||
<url/>
|
<url/>
|
||||||
<status>0</status>
|
<status>0</status>
|
||||||
|
@ -772,7 +772,7 @@ It requires user parameter mysql.status[*], which is defined in userparameter_my
|
||||||
<dependencies/>
|
<dependencies/>
|
||||||
</trigger>
|
</trigger>
|
||||||
<trigger>
|
<trigger>
|
||||||
<expression>{Template App MySQL:db.wsrep.ready.query.last(0)}<>1</expression>
|
<expression>{Template App MySQL:db.wsrep.ready.query.last(0)}<%= scope.lookupvar('plugin_zabbix::params::zabbix_trigger_exp_not_equal') %>1</expression>
|
||||||
<name>MySQL is not ready to rejoin cluster</name>
|
<name>MySQL is not ready to rejoin cluster</name>
|
||||||
<url/>
|
<url/>
|
||||||
<status>0</status>
|
<status>0</status>
|
|
@ -1719,7 +1719,7 @@
|
||||||
<dependencies/>
|
<dependencies/>
|
||||||
</trigger>
|
</trigger>
|
||||||
<trigger>
|
<trigger>
|
||||||
<expression>{Template App OpenStack Ceph Cluster:probe.ceph.last()}<>0</expression>
|
<expression>{Template App OpenStack Ceph Cluster:probe.ceph.last()}<%= scope.lookupvar('plugin_zabbix::params::zabbix_trigger_exp_not_equal') %>0</expression>
|
||||||
<name>Cannot retrieve Ceph metrics form {HOST.NAME1} node</name>
|
<name>Cannot retrieve Ceph metrics form {HOST.NAME1} node</name>
|
||||||
<url/>
|
<url/>
|
||||||
<status>0</status>
|
<status>0</status>
|
Loading…
Reference in New Issue