Skip to content

Commit e754030

Browse files
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 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
1 parent b048ea2 commit e754030

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+8782
-2136
lines changed

.editorconfig

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# editorconfig.org
22

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

56
root = true
67

.fixtures.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fixtures:
88
postgresql: https://github.com/puppetlabs/puppet-postgresql.git
99
mysql: https://github.com/puppetlabs/puppetlabs-mysql.git
1010
ruby: https://github.com/puppetlabs/puppetlabs-ruby.git
11-
systemd: https://github.com/camptocamp/puppet-systemd.git
11+
systemd: https://github.com/voxpupuli/puppet-systemd.git
1212
selinux: https://github.com/voxpupuli/puppet-selinux.git
1313
chocolatey: https://github.com/puppetlabs/puppetlabs-chocolatey.git
1414
yumrepo_core:

.github/CONTRIBUTING.md

+3-33
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ By participating in this project you agree to abide by its terms.
2525

2626
* Fork the repo.
2727
* Create a separate branch for your change.
28-
* 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).
28+
* 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).
2929
* 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.
3030
* 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.
3131
* Squash your commits down into logical components. Make sure to rebase against our current master.
@@ -232,33 +232,7 @@ simple tests against it after applying the module. You can run this
232232
with:
233233

234234
```sh
235-
bundle exec rake beaker
236-
```
237-
238-
This will run the tests on the module's default nodeset. You can override the
239-
nodeset used, e.g.,
240-
241-
```sh
242-
BEAKER_set=centos-7-x64 bundle exec rake beaker
243-
```
244-
245-
There are default rake tasks for the various acceptance test modules, e.g.,
246-
247-
```sh
248-
bundle exec rake beaker:centos-7-x64
249-
bundle exec rake beaker:ssh:centos-7-x64
250-
```
251-
252-
If you don't want to have to recreate the virtual machine every time you can
253-
use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will at
254-
least need `BEAKER_provision` set to yes (the default). The Vagrantfile for the
255-
created virtual machines will be in `.vagrant/beaker_vagrant_files`.
256-
257-
Beaker also supports docker containers. We also use that in our automated CI
258-
pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:
259-
260-
```sh
261-
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
235+
BEAKER_setfile=debian10-x64 bundle exec rake beaker
262236
```
263237

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

275-
The easiest way to debug in a docker container is to open a shell:
276-
277-
```sh
278-
docker exec -it -u root ${container_id_or_name} bash
279-
```
249+
For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
280250

281251
The source of this file is in our [modulesync_config](https://github.com/voxpupuli/modulesync_config/blob/master/moduleroot/.github/CONTRIBUTING.md.erb)
282252
repository.

.github/workflows/ci.yml

+27-14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
15
name: CI
26

37
on: pull_request
@@ -6,28 +10,31 @@ jobs:
610
setup_matrix:
711
name: 'Setup Test Matrix'
812
runs-on: ubuntu-latest
13+
timeout-minutes: 40
914
outputs:
10-
beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
11-
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
1215
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
16+
github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }}
1317
env:
14-
BUNDLE_WITHOUT: development:test:release
18+
BUNDLE_WITHOUT: development:system_tests:release
1519
steps:
1620
- uses: actions/checkout@v2
1721
- name: Setup ruby
1822
uses: ruby/setup-ruby@v1
1923
with:
20-
ruby-version: '2.7'
24+
ruby-version: '3.0'
2125
bundler-cache: true
22-
- name: Run rake validate
23-
run: bundle exec rake validate
26+
- name: Run static validations
27+
run: bundle exec rake validate lint check
28+
- name: Run rake rubocop
29+
run: bundle exec rake rubocop
2430
- name: Setup Test Matrix
2531
id: get-outputs
2632
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround CentOS,Ubuntu
2733

2834
unit:
2935
needs: setup_matrix
3036
runs-on: ubuntu-latest
37+
timeout-minutes: 40
3138
strategy:
3239
fail-fast: false
3340
matrix:
@@ -44,32 +51,38 @@ jobs:
4451
ruby-version: ${{ matrix.ruby }}
4552
bundler-cache: true
4653
- name: Run tests
47-
run: bundle exec rake
54+
run: bundle exec rake parallel_spec
4855

4956
acceptance:
5057
needs: setup_matrix
5158
runs-on: ubuntu-latest
5259
env:
60+
LANG: en_US
61+
LC_ALL: en_US.UTF-8
5362
BUNDLE_WITHOUT: development:test:release
5463
strategy:
5564
fail-fast: false
5665
matrix:
57-
setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
58-
puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
66+
include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}}
5967
name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
6068
steps:
61-
- name: Enable IPv6 on docker
62-
run: |
63-
echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
64-
sudo service docker restart
6569
- uses: actions/checkout@v2
6670
- name: Setup ruby
6771
uses: ruby/setup-ruby@v1
6872
with:
69-
ruby-version: '2.7'
73+
ruby-version: '3.0'
7074
bundler-cache: true
7175
- name: Run tests
7276
run: bundle exec rake beaker
7377
env:
7478
BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }}
7579
BEAKER_setfile: ${{ matrix.setfile.value }}
80+
81+
tests:
82+
needs:
83+
- unit
84+
- acceptance
85+
runs-on: ubuntu-latest
86+
name: Test suite
87+
steps:
88+
- run: echo Test suite completed

.github/workflows/release.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
15
name: Release
26

37
on:
@@ -12,6 +16,7 @@ jobs:
1216
deploy:
1317
name: 'deploy to forge'
1418
runs-on: ubuntu-latest
19+
if: github.repository_owner == 'voxpupuli'
1520
steps:
1621
- name: Checkout repository
1722
uses: actions/checkout@v2

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
pkg/
25
Gemfile.lock
36
Gemfile.local

.msync.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
---
2-
modulesync_config_version: '4.0.0'
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
modulesync_config_version: '4.2.0'

.overcommit.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Managed by https://github.com/voxpupuli/modulesync_configs
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
23
#
34
# Hooks are only enabled if you take action.
45
#

.pmtignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
docs/
25
pkg/
36
Gemfile

.rspec

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
--format documentation
25
--color

.rspec_parallel

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
--format progress

.rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
inherit_gem:
36
voxpupuli-test: rubocop.yml

.sync.yml

+2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ Gemfile:
44
':test':
55
- gem: 'fakefs'
66
- gem: 'zabbixapi'
7+
- gem: puppet-lint-param-docs
78
spec/spec_helper.rb:
89
mock_with: ':mocha'
10+
spec_overrides: "require 'support/acceptance/supported_versions'"
911
spec/spec_helper_acceptance.rb:
1012
unmanaged: false
1113
.github/workflows/ci.yml:

.yardopts

-2
This file was deleted.

0 commit comments

Comments
 (0)