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

Update zabbixapi gem to latest versions #684

Closed
wants to merge 1 commit into from
Closed

Update zabbixapi gem to latest versions #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 7 additions & 16 deletions manifests/web.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,24 +264,15 @@
# to the puppetdb. We will include an class, otherwise when it
# is set to false, you'll get warnings like this:
# "Warning: You cannot collect without storeconfigs being set"
# this matrix is based on https://github.com/express42/zabbixapi/tree/v4.1.1#version-policy
if $manage_resources {
# Determine correct zabbixapi version.
case $zabbix_version {
'2.2': {
$zabbixapi_version = '2.2.2'
}
'2.4': {
$zabbixapi_version = '2.4.4'
}
'3.2' : {
$zabbixapi_version = '3.2.1'
}
'3.4' : {
$zabbixapi_version = '4.0.0'
}
default : {
$zabbixapi_version = '4.2.0'
}
$zabbixapi_version = $zabbix_version ? {
'2.2' => '2.2.2',
'2.4' => '2.4.4',
'3.2' => '3.2.1',
'3.4' => '4.0.0',
default => '4.2.0',
}

# Installing the zabbixapi gem package. We need this gem for
Expand Down
3 changes: 1 addition & 2 deletions spec/acceptance/zabbix_application_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
require 'spec_helper_acceptance'
require 'serverspec_type_zabbixapi'

# rubocop:disable RSpec/LetBeforeExamples
describe 'zabbix_application type', unless: default[:platform] =~ %r{debian-10-amd64} do
describe 'zabbix_application type' do
context 'create zabbix_application resources' do
# This will deploy a running Zabbix setup (server, web, db) which we can
# use for custom type tests
Expand Down
4 changes: 1 addition & 3 deletions spec/acceptance/zabbix_host_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
require 'spec_helper_acceptance'
require 'serverspec_type_zabbixapi'

# rubocop:disable RSpec/LetBeforeExamples
describe 'zabbix_host type', unless: default[:platform] =~ %r{debian-10-amd64} do
describe 'zabbix_host type' do
context 'create zabbix_host resources' do
# This will deploy a running Zabbix setup (server, web, db) which we can
# use for custom type tests
Expand All @@ -20,7 +19,6 @@ class { 'apache':
include postgresql::server

class { 'zabbix':
zabbix_version => '4.4',
zabbix_url => 'localhost',
zabbix_api_user => 'Admin',
zabbix_api_pass => 'zabbix',
Expand Down
4 changes: 1 addition & 3 deletions spec/acceptance/zabbix_hostgroup_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
require 'spec_helper_acceptance'
require 'serverspec_type_zabbixapi'

# rubocop:disable RSpec/LetBeforeExamples
describe 'zabbix_hostgroup type', unless: default[:platform] =~ %r{debian-10-amd64} do
describe 'zabbix_hostgroup type' do
context 'create zabbix_hostgroup resources' do
it 'runs successfully' do
# This will deploy a running Zabbix setup (server, web, db) which we can
Expand All @@ -15,7 +14,6 @@ class { 'apache':
include postgresql::server

class { 'zabbix':
zabbix_version => '4.4',
zabbix_url => 'localhost',
zabbix_api_user => 'Admin',
zabbix_api_pass => 'zabbix',
Expand Down
4 changes: 1 addition & 3 deletions spec/acceptance/zabbix_proxy_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
require 'spec_helper_acceptance'
require 'serverspec_type_zabbixapi'

# rubocop:disable RSpec/LetBeforeExamples
describe 'zabbix_proxy type', unless: default[:platform] =~ %r{debian-10-amd64} do
describe 'zabbix_proxy type' do
context 'create zabbix_proxy resources' do
# This will deploy a running Zabbix setup (server, web, db) which we can
# use for custom type tests
Expand All @@ -20,7 +19,6 @@ class { 'apache':
include postgresql::server

class { 'zabbix':
zabbix_version => '4.4',
zabbix_url => 'localhost',
zabbix_api_user => 'Admin',
zabbix_api_pass => 'zabbix',
Expand Down
4 changes: 1 addition & 3 deletions spec/acceptance/zabbix_template_host_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
require 'spec_helper_acceptance'
require 'serverspec_type_zabbixapi'

# rubocop:disable RSpec/LetBeforeExamples
describe 'zabbix_template_host type', unless: default[:platform] =~ %r{debian-10-amd64} do
describe 'zabbix_template_host type' do
context 'create zabbix_template_host resources' do
it 'runs successfully' do
# This will deploy a running Zabbix setup (server, web, db) which we can
Expand All @@ -15,7 +14,6 @@ class { 'apache':
include postgresql::server

class { 'zabbix':
zabbix_version => '4.4',
zabbix_url => 'localhost',
zabbix_api_user => 'Admin',
zabbix_api_pass => 'zabbix',
Expand Down
4 changes: 1 addition & 3 deletions spec/acceptance/zabbix_template_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
require 'spec_helper_acceptance'
require 'serverspec_type_zabbixapi'

# rubocop:disable RSpec/LetBeforeExamples
describe 'zabbix_template type', unless: default[:platform] =~ %r{debian-10-amd64} do
describe 'zabbix_template type' do
context 'create zabbix_template resources' do
it 'runs successfully' do
# This will deploy a running Zabbix setup (server, web, db) which we can
Expand All @@ -15,7 +14,6 @@ class { 'apache':
include postgresql::server

class { 'zabbix':
zabbix_version => '4.4',
zabbix_url => 'localhost',
zabbix_api_user => 'Admin',
zabbix_api_pass => 'zabbix',
Expand Down