Skip to content

Commit

Permalink
Added details to host network interface for SNMP
Browse files Browse the repository at this point in the history
Added details to host network interface for SNMP

Added details to host network interface for SNMP

Added details to host network interface for SNMP

Added details to host network interface for SNMP

Added details to host network interface for SNMP

Added details to host network interface for SNMP

Added spec acceptance test for interfacetype and interfacedetails

Added context test3.example.com to acceptance test

Fix include in test3 context

Fix hash syntax in test3 context

Change template for snmp in acceptance test

Fix case for var template_snmp

Removed conflicts on templates used for snmp host test acceptance

Trying to fix interface details data types

Sub double quote with single quote in include

Trying to understand if interface details is nil

Fix trailing whitespace :-O!

Zabbix version 4.0 doesn't have the interface details hash, excluded from test

Wip (#1)

* Added details to result_hosts

* Add TODO file

* Run test specific to zabbix >= 4.0

* Add param documentation

* Fix spaces

* Remove TODO file

metadata: increase max versions of dependency modules

Enable Puppet 7 support

To make this work, we also enforce UTF8 for the acceptance tests. The
also voxpupuli/modulesync_config#708

Adjust for new option in configurations.

templateDashboards is replacing templateScreens option in 5.2+

Signed-off-by: Christos Papageorgiou <[email protected]>

Add Ubuntu 18.04 and 20.04 support

Signed-off-by: Christos Papageorgiou <[email protected]>

Enable Debian 10 acceptance tests

Signed-off-by: Christos Papageorgiou <[email protected]>

Remove packages installation before running acceptance tests

* This is already being handled by prepare_host function.

Signed-off-by: Christos Papageorgiou <[email protected]>

Allow non-default port database importing

Signed-off-by: Christos Papageorgiou <[email protected]>

Fix README regarding zbx_group(s) deprecation and fix small bug so deprecation actually work

modulesync 4.1.0

rubocop: autofix

rubocop: cleanup unused variables

beaker tests: set locale

Support sslcertlocation & sslkeylocation for zabbix proxy

Support sslcalocation for zabbix proxy

Ensure consistent use of logtype and logfile across agent/server/proxy (voxpupuli#765)

* Fix reference to camptocamp/systemd

* logfile param is now consistent across agent/server/proxy

* Add logtype param to proxy

* Add logtype to class parameters documentation

* Ensure logtype is passed to server from init and it is typed consistently

* logfile param is now consistent across agent/server/proxy

* Support sslcertlocation & sslkeylocation for zabbix proxy

* Ensure datatype for logtype and logfile in zabbix::init

Co-authored-by: Shaun Bugler - Xneelo <[email protected]>

Add ability to set $DB[DOUBLE_IEEE754] to true in zabbix.conf.php. (voxpupuli#735)

* Add ability to set $DB[DOUBLE_IEEE754] to true in zabbix.conf.php.

Zabbix 5.0 and greater enable extended range of float values.
>This is by default for new installations.
>However, when upgrading existing installations, a manual database
>upgrade patch must be applied

The $DB[DOUBLE_IEEE754] value must be set to true in zabbix.conf.php.
Otherwise, the message "Database history tables upgraded: No" will
continue to be displayed in the web frontend.
https://www.zabbix.com/documentation/5.0/manual/installation/upgrade_notes_500#enabling_extended_range_of_numeric_float_values

* Update spec/classes/web_spec.rb

* Update manifests/web.pp

Co-authored-by: Joshua Snapp <[email protected]>
Co-authored-by: Tim Meusel <[email protected]>

Allow to pass LDAP settings to zabbix class

* Also strong type ldap parameters

Signed-off-by: Christos Papageorgiou <[email protected]>

Implement additional SAML settings

Signed-off-by: Christos Papageorgiou <[email protected]>

release 9.0.0

[blacksmith] Bump version to 9.0.1-rc0

Deprecate EnableRemoteCommands

* https://www.zabbix.com/documentation/5.0/manual/appendix/config/zabbix_agentd

Signed-off-by: Christos Papageorgiou <[email protected]>

Add {Allow,Deny}Key options

Signed-off-by: Christos Papageorgiou <[email protected]>

Add {TLSCipher}* options for agent

Signed-off-by: Christos Papageorgiou <[email protected]>

Add DBTLS options

Signed-off-by: Christos Papageorgiou <[email protected]>

Add {TLSCipher}* options for proxy/server

Add StartAlerters option

Signed-off-by: Christos Papageorgiou <[email protected]>

Add StartEscalators option

Signed-off-by: Christos Papageorgiou <[email protected]>

Add StartLLDProcessors option

Signed-off-by: Christos Papageorgiou <[email protected]>

Add StartPreprocessors option

Signed-off-by: Christos Papageorgiou <[email protected]>

Optimize acceptance tests

Signed-off-by: Christos Papageorgiou <[email protected]>

switch from camptocamp/systemd to voxpupuli/systemd

Ensure correct logfile/logfilesize values when defaulting logtype to system

Signed-off-by: Christos Papageorgiou <[email protected]>

Add Vault parameters to server

Signed-off-by: Christos Papageorgiou <[email protected]>

Add Vault parameters to proxy

Signed-off-by: Christos Papageorgiou <[email protected]>

[temp] Pass ignore_version parameter to zabbixapi

* Don't fail if version is not supported by the gem, until the gem has been updated for zabbix 5.4

Signed-off-by: Christos Papageorgiou <[email protected]>

Drop zabbix_application support for zabbix 5.4

* Zabbix applications were replaced with Item tags in version 5.4
* applications and screens parameters were removed from configurations.import
* selectApplications parameter was removed from templates.get in version 5.4

Source: https://www.zabbix.com/documentation/5.4/manual/api/changes_5.2_-_5.4

Signed-off-by: Christos Papageorgiou <[email protected]>

Add supported_versions helper

Signed-off-by: Christos Papageorgiou <[email protected]>

Add zabbix-sql-scripts installation/zabbix server 5.4 is not supported on RHEL7

* zabbix 5.4 changed the location of the sql scripts, now there's a standalone package called zabbix-sql-scripts which installs the scripts in `/usr/share/doc/zabbix-sql-scripts/*

Signed-off-by: Christos Papageorgiou <[email protected]>

RHEL7 needs scl packages and on 5.4 version

Signed-off-by: Christos Papageorgiou <[email protected]>

Release 9.1.0

[blacksmith] Bump version to 9.1.1-rc0

Update README.md with new badges/transfer notice

modulesync 4.1.0

Use puppet-strings annotations/Generate REFERENCE.md

Signed-off-by: Christos Papageorgiou <[email protected]>

Drop Reference from README

Signed-off-by: Christos Papageorgiou <[email protected]>

Modulesync 4.2.0

Fix suggested
  • Loading branch information
oraziobattaglia committed Aug 28, 2021
1 parent b048ea2 commit e754030
Show file tree
Hide file tree
Showing 72 changed files with 8,782 additions and 2,136 deletions.
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# editorconfig.org

# MANAGED BY MODULESYNC
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

root = true

Expand Down
2 changes: 1 addition & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fixtures:
postgresql: https://github.com/puppetlabs/puppet-postgresql.git
mysql: https://github.com/puppetlabs/puppetlabs-mysql.git
ruby: https://github.com/puppetlabs/puppetlabs-ruby.git
systemd: https://github.com/camptocamp/puppet-systemd.git
systemd: https://github.com/voxpupuli/puppet-systemd.git
selinux: https://github.com/voxpupuli/puppet-selinux.git
chocolatey: https://github.com/puppetlabs/puppetlabs-chocolatey.git
yumrepo_core:
Expand Down
36 changes: 3 additions & 33 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ By participating in this project you agree to abide by its terms.

* Fork the repo.
* Create a separate branch for your change.
* We only take pull requests with passing tests, and documentation. [travis-ci](http://travis-ci.org) runs the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
* We only take pull requests with passing tests, and documentation. [GitHub Actions](https://docs.github.com/en/actions) run the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
* Checkout [our docs](https://voxpupuli.org/docs/reviewing_pr/) we use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html). They provide some guidance for new code that might help you before you submit a pull request.
* Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
* Squash your commits down into logical components. Make sure to rebase against our current master.
Expand Down Expand Up @@ -232,33 +232,7 @@ simple tests against it after applying the module. You can run this
with:

```sh
bundle exec rake beaker
```

This will run the tests on the module's default nodeset. You can override the
nodeset used, e.g.,

```sh
BEAKER_set=centos-7-x64 bundle exec rake beaker
```

There are default rake tasks for the various acceptance test modules, e.g.,

```sh
bundle exec rake beaker:centos-7-x64
bundle exec rake beaker:ssh:centos-7-x64
```

If you don't want to have to recreate the virtual machine every time you can
use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will at
least need `BEAKER_provision` set to yes (the default). The Vagrantfile for the
created virtual machines will be in `.vagrant/beaker_vagrant_files`.

Beaker also supports docker containers. We also use that in our automated CI
pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:

```sh
PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
BEAKER_setfile=debian10-x64 bundle exec rake beaker
```

You can replace the string `debian10` with any common operating system.
Expand All @@ -272,11 +246,7 @@ The following strings are known to work:
* centos7
* centos8

The easiest way to debug in a docker container is to open a shell:

```sh
docker exec -it -u root ${container_id_or_name} bash
```
For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).

The source of this file is in our [modulesync_config](https://github.com/voxpupuli/modulesync_config/blob/master/moduleroot/.github/CONTRIBUTING.md.erb)
repository.
41 changes: 27 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

name: CI

on: pull_request
Expand All @@ -6,28 +10,31 @@ jobs:
setup_matrix:
name: 'Setup Test Matrix'
runs-on: ubuntu-latest
timeout-minutes: 40
outputs:
beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }}
env:
BUNDLE_WITHOUT: development:test:release
BUNDLE_WITHOUT: development:system_tests:release
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '3.0'
bundler-cache: true
- name: Run rake validate
run: bundle exec rake validate
- name: Run static validations
run: bundle exec rake validate lint check
- name: Run rake rubocop
run: bundle exec rake rubocop
- name: Setup Test Matrix
id: get-outputs
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround CentOS,Ubuntu

unit:
needs: setup_matrix
runs-on: ubuntu-latest
timeout-minutes: 40
strategy:
fail-fast: false
matrix:
Expand All @@ -44,32 +51,38 @@ jobs:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Run tests
run: bundle exec rake
run: bundle exec rake parallel_spec

acceptance:
needs: setup_matrix
runs-on: ubuntu-latest
env:
LANG: en_US
LC_ALL: en_US.UTF-8
BUNDLE_WITHOUT: development:test:release
strategy:
fail-fast: false
matrix:
setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}}
name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
steps:
- name: Enable IPv6 on docker
run: |
echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
sudo service docker restart
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '3.0'
bundler-cache: true
- name: Run tests
run: bundle exec rake beaker
env:
BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }}
BEAKER_setfile: ${{ matrix.setfile.value }}

tests:
needs:
- unit
- acceptance
runs-on: ubuntu-latest
name: Test suite
steps:
- run: echo Test suite completed
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

name: Release

on:
Expand All @@ -12,6 +16,7 @@ jobs:
deploy:
name: 'deploy to forge'
runs-on: ubuntu-latest
if: github.repository_owner == 'voxpupuli'
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

pkg/
Gemfile.lock
Gemfile.local
Expand Down
5 changes: 4 additions & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
---
modulesync_config_version: '4.0.0'
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '4.2.0'
3 changes: 2 additions & 1 deletion .overcommit.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Managed by https://github.com/voxpupuli/modulesync_configs
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
#
# Hooks are only enabled if you take action.
#
Expand Down
3 changes: 3 additions & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

docs/
pkg/
Gemfile
Expand Down
3 changes: 3 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

--format documentation
--color
3 changes: 3 additions & 0 deletions .rspec_parallel
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

--format progress
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

inherit_gem:
voxpupuli-test: rubocop.yml
2 changes: 2 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ Gemfile:
':test':
- gem: 'fakefs'
- gem: 'zabbixapi'
- gem: puppet-lint-param-docs
spec/spec_helper.rb:
mock_with: ':mocha'
spec_overrides: "require 'support/acceptance/supported_versions'"
spec/spec_helper_acceptance.rb:
unmanaged: false
.github/workflows/ci.yml:
Expand Down
2 changes: 0 additions & 2 deletions .yardopts

This file was deleted.

Loading

0 comments on commit e754030

Please sign in to comment.