Merge "Fix Zabbix 2.2 triggers expressions"

This commit is contained in:
Jenkins 2017-05-12 08:37:41 +00:00 committed by Gerrit Code Review
commit 60f58f10b1
4 changed files with 17 additions and 3 deletions

View File

@ -29,8 +29,10 @@ class plugin_zabbix::params {
if versioncmp($zabbix_version, '2.4') < 0 {
$zabbix_includes = $zabbix_extra_conf_dir
$zabbix_trigger_exp_not_equal = '#'
} else {
$zabbix_includes = "${zabbix_extra_conf_dir}/*.conf"
$zabbix_trigger_exp_not_equal = '&lt;&gt;'
}
$zabbix_ports = {

View File

@ -34,6 +34,18 @@ class plugin_zabbix::server::config {
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 {
require => File['/etc/zabbix/import'],
}

View File

@ -762,7 +762,7 @@ It requires user parameter mysql.status[*], which is defined in userparameter_my
<dependencies/>
</trigger>
<trigger>
<expression>{Template App MySQL:db.wsrep.connected.query.last(0)}&lt;&gt;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>
<url/>
<status>0</status>
@ -772,7 +772,7 @@ It requires user parameter mysql.status[*], which is defined in userparameter_my
<dependencies/>
</trigger>
<trigger>
<expression>{Template App MySQL:db.wsrep.ready.query.last(0)}&lt;&gt;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>
<url/>
<status>0</status>

View File

@ -1719,7 +1719,7 @@
<dependencies/>
</trigger>
<trigger>
<expression>{Template App OpenStack Ceph Cluster:probe.ceph.last()}&lt;&gt;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>
<url/>
<status>0</status>