Skip to content

Commit

Permalink
Merge pull request #167 from tribe29/devel
Browse files Browse the repository at this point in the history
Prepare Release 0.11.0
  • Loading branch information
robin-checkmk authored Oct 10, 2022
2 parents 47fe0e1 + b34ba60 commit bf5c4e7
Show file tree
Hide file tree
Showing 31 changed files with 1,588 additions and 45 deletions.
1 change: 1 addition & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use_default_rules: true
# This makes linter to fully ignore rules/tags listed below
skip_list:
- experimental
- name[template] # https://ansible-lint.readthedocs.io/rules/name/

# # Any rule that has the 'opt-in' tag will not be loaded unless its 'id' is
# # mentioned in the enable_list:
Expand Down
65 changes: 65 additions & 0 deletions .github/workflows/ans-int-test-host_group.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# https://github.com/ansible-collections/collection_template/blob/main/.github/workflows/ansible-test.yml

name: Ansible Integration Tests for Host Group Module
on:
workflow_dispatch:
pull_request:
branches:
- main
- devel
paths:
- 'plugins/modules/host_group.py'

env:
NAMESPACE: tribe29
COLLECTION_NAME: checkmk

jobs:

###
# Integration tests (RECOMMENDED)
#
# https://docs.ansible.com/ansible/latest/dev_guide/testing_integration.html

integration:
runs-on: ubuntu-latest
name: Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}
strategy:
fail-fast: false
matrix:
ansible:
- stable-2.12
- stable-2.13
- devel
python:
- '2.7'
- '3.6'
- '3.7'
- '3.8'
- '3.9'
- '3.10'
- '3.11'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.12
python: '3.11'
- ansible: stable-2.13
python: '3.11'

steps:
- name: Check out code
uses: actions/checkout@v3
with:
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9

- name: Install ansible-base (${{ matrix.ansible }})
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check

- name: Run integration test
run: ansible-test integration host_group -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
65 changes: 65 additions & 0 deletions .github/workflows/ans-int-test-tag_group.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# https://github.com/ansible-collections/collection_template/blob/main/.github/workflows/ansible-test.yml

name: Ansible Integration Tests for Tag Group Module
on:
workflow_dispatch:
pull_request:
branches:
- main
- devel
paths:
- 'plugins/modules/tag_group.py'

env:
NAMESPACE: tribe29
COLLECTION_NAME: checkmk

jobs:

###
# Integration tests (RECOMMENDED)
#
# https://docs.ansible.com/ansible/latest/dev_guide/testing_integration.html

integration:
runs-on: ubuntu-latest
name: Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}
strategy:
fail-fast: false
matrix:
ansible:
- stable-2.12
- stable-2.13
- devel
python:
- '2.7'
- '3.6'
- '3.7'
- '3.8'
- '3.9'
- '3.10'
- '3.11'
exclude:
# Exclude unsupported sets.
- ansible: stable-2.12
python: '3.11'
- ansible: stable-2.13
python: '3.11'

steps:
- name: Check out code
uses: actions/checkout@v3
with:
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9

- name: Install ansible-base (${{ matrix.ansible }})
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check

- name: Run integration test
run: ansible-test integration tag_group -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
2 changes: 1 addition & 1 deletion .github/workflows/molecule-role-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}

Expand Down
32 changes: 27 additions & 5 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,25 @@ Vagrant.configure("2") do |config|
end
$script = <<-SCRIPT
apt-get update
apt-get install -y python3-pip
wget "https://download.checkmk.com/checkmk/2.1.0p10/check-mk-raw-2.1.0p10_0.focal_amd64.deb" -O /tmp/checkmk-stable.deb
wget "https://download.checkmk.com/checkmk/2.1.0p10/check-mk-raw-2.1.0p10_0.focal_amd64.deb" -O /tmp/checkmk-beta.deb
apt-get install -y python3-pip ca-certificates curl gnupg lsb-release
wget "https://download.checkmk.com/checkmk/2.1.0p13/check-mk-raw-2.1.0p13_0.focal_amd64.deb" -O /tmp/checkmk-stable.deb
wget "https://download.checkmk.com/checkmk/2.1.0p13/check-mk-raw-2.1.0p13_0.focal_amd64.deb" -O /tmp/checkmk-beta.deb
apt-get install -y /tmp/checkmk-stable.deb
omd create --admin-password 'cmk' stable
omd create --admin-password 'd7589df1-01db-4eda-9858-dbcff8d0c361' stable
apt-get install -y /tmp/checkmk-beta.deb
omd create --admin-password 'cmk' beta
omd create --admin-password 'd7589df1-01db-4eda-9858-dbcff8d0c361' beta
omd status -b stable || omd start stable
omd status -b beta || omd start beta
pip install -r /vagrant/requirements.txt
sudo -u vagrant ansible-galaxy collection install -f -r /vagrant/requirements.yml
mkdir -p /home/vagrant/ansible_collections/tribe29/checkmk
rsync -avzh /vagrant/* /home/vagrant/ansible_collections/tribe29/checkmk/
mkdir -p /etc/apt/keyrings
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
apt-get update
apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
usermod -aG docker vagrant
SCRIPT
srv.vm.provision "shell", inline: $script
end
Expand Down Expand Up @@ -90,4 +98,18 @@ Vagrant.configure("2") do |config|
inline: "zypper --quiet up -y"
end

# SLES15
config.vm.define "ansles", autostart: false , primary: false do |srv|
srv.vm.box = "saltstack/cicd-sles15"
srv.vm.network "private_network", ip: "192.168.56.65"
srv.ssh.insert_key = false
srv.vm.provider "virtualbox" do |v|
v.name = 'ansuse'
v.memory = 2048
v.cpus = 2
end
srv.vm.provision "shell",
inline: "zypper --quiet up -y"
end

end
45 changes: 45 additions & 0 deletions changelogs/fragments/agent_role.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
minor_changes:
- Agent role - (Actually in v0.10.0) Fix authentication handling, where several tasks would fail, when using a secret.
- Agent role - Add support for CME.

# https://docs.ansible.com/ansible/latest/community/development_process.html#changelogs-how-to

## Line Format

# When writing a changelog entry, use the following format:

# - scope - description starting with a uppercase letter and ending with a period at the very end. Multiple sentences are allowed.

# The scope is usually a module or plugin name or group of modules or plugins, for example, lookup plugins. While module names can (and should) be mentioned directly (foo_module), plugin names should always be followed by the type (foo inventory plugin).

# For changes that are not really scoped (for example, which affect a whole collection), use the following format:

# - Description starting with an uppercase letter and ending with a dot at the very end. Multiple sentences are allowed.


## Possible keys:

# breaking_changes

# Changes that break existing playbooks or roles. This includes any change to existing behavior that forces users to update tasks. Displayed in both the changelogs and the Porting Guides.
# major_changes

# Major changes to Ansible itself. Generally does not include module or plugin changes. Displayed in both the changelogs and the Porting Guides.
# minor_changes

# Minor changes to Ansible, modules, or plugins. This includes new features, new parameters added to modules, or behavior changes to existing parameters.
# deprecated_features

# Features that have been deprecated and are scheduled for removal in a future release. Displayed in both the changelogs and the Porting Guides.
# removed_features

# Features that were previously deprecated and are now removed. Displayed in both the changelogs and the Porting Guides.
# security_fixes

# Fixes that address CVEs or resolve security concerns. Include links to CVE information.
# bugfixes

# Fixes that resolve issues.
# known_issues

# Known issues that are currently not fixed or will not be fixed.
4 changes: 4 additions & 0 deletions changelogs/fragments/host_group_module.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# https://docs.ansible.com/ansible/latest/community/development_process.html#changelogs-how-to

major_changes:
- Add host_group module.
4 changes: 4 additions & 0 deletions changelogs/fragments/tag_group_module.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# https://docs.ansible.com/ansible/latest/community/development_process.html#changelogs-how-to

major_changes:
- Add tag_group module.
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: checkmk

# The version of the collection. Must be compatible with semantic versioning

version: 0.10.0
version: 0.11.0

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
Expand Down
2 changes: 2 additions & 0 deletions meta/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ action_groups:
- host
- downtime
- rule
- tag_group
- host_group

# plugin_routing:
# modules:
Expand Down
Loading

0 comments on commit bf5c4e7

Please sign in to comment.