Skip to content

Commit e75447d

Browse files
Merge pull request #979 from Checkmk/devel
Release 6.6.1
2 parents d7d7cf8 + fe0334b commit e75447d

File tree

45 files changed

+265
-466
lines changed

Some content is hidden

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

45 files changed

+265
-466
lines changed

.github/labels-issues.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ lookup:host:
8080
lookup:hosts:
8181
- 'Component Name: lookup_hosts'
8282

83+
lookup:ldap_connection:
84+
- 'Component Name: lookup_ldap_connection'
85+
86+
lookup:ldap_connections:
87+
- 'Component Name: lookup_ldap_connections'
88+
8389
lookup:rule:
8490
- 'Component Name: lookup_rule'
8591

.github/labels-prs.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,16 @@ lookup:hosts:
129129
- changed-files:
130130
- any-glob-to-any-file: 'plugins/modules/lookup/hosts.py'
131131

132+
lookup:ldap_connection:
133+
- any:
134+
- changed-files:
135+
- any-glob-to-any-file: 'plugins/modules/lookup/ldap_connection.py'
136+
137+
lookup:ldap_connections:
138+
- any:
139+
- changed-files:
140+
- any-glob-to-any-file: 'plugins/modules/lookup/ldap_connections.py'
141+
132142
lookup:rule:
133143
- any:
134144
- changed-files:

.github/workflows/codeql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
language: [ 'python' ]
20+
language: [ 'python', 'actions' ]
2121
# Learn more about CodeQL language support at https://git.io/codeql-language-support
2222

2323
steps:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build/
88
tests/output
99
playbooks/vars/config.yml
1010
playbooks/test*.yml
11-
*venv/
11+
*venv*/
1212
.direnv/
1313
.vscode/
1414
uv.lock

SUPPORT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ Collection Version | Checkmk Versions | Ansible Versions | Remarks
8282
6.4.1 | 2.2.0p47, 2.3.0p41, 2.4.0p16 | 2.17, 2.18, 2.19 | None
8383
6.5.0 | 2.2.0p47, 2.3.0p41, 2.4.0p17 | 2.18, 2.19, 2.20 | None
8484
6.6.0 | 2.2.0p47, 2.3.0p41, 2.4.0p18 | 2.18, 2.19, 2.20 | None
85+
6.6.1 | 2.2.0p47, 2.3.0p41, 2.4.0p18 | 2.18, 2.19, 2.20 | None

Vagrantfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Vagrant.configure("2") do |config|
3737
grep "alias ic=" /home/vagrant/.bashrc || echo "alias ic='LC_ALL=C.UTF-8 uv run ansible-galaxy collection build --force ~/ansible_collections/checkmk/general && LC_ALL=C.UTF-8 uv run ansible-galaxy collection install -f ./checkmk-general-*.tar.gz && rm ./checkmk-general-*.tar.gz'" >> /home/vagrant/.bashrc
3838
grep "alias ap=" /home/vagrant/.bashrc || echo "alias ap='LC_ALL=C.UTF-8 uv run ansible-playbook -i vagrant, '" >> /home/vagrant/.bashrc
3939
grep "export LC_ALL=C.UTF-8" /home/vagrant/.bashrc || echo "export LC_ALL=C.UTF-8" >> /home/vagrant/.bashrc
40+
grep "export UV_PROJECT_ENVIRONMENT=.venv-vm" /home/vagrant/.bashrc || echo "export UV_PROJECT_ENVIRONMENT=.venv-vm" >> /home/vagrant/.bashrc
4041
hostnamectl set-hostname collection
4142
SCRIPT
4243
srv.vm.provision "shell", inline: $script

ansible.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
library = ./plugins/modules/
1616
module_utils = ./plugins/module_utils/
1717

18-
inventory = ./inventory/hosts.ini
18+
inventory = ./playbooks/inventory/hosts.ini
1919
#inventory = /etc/ansible/hosts
2020
#library = /usr/share/my_modules/
2121
#module_utils = /usr/share/my_module_utils/
@@ -72,7 +72,6 @@ gathering = smart
7272

7373
# additional paths to search for roles in, colon separated
7474
#roles_path = /etc/ansible/roles
75-
roles_path = ./roles
7675

7776
# uncomment this to disable SSH key host checking
7877
#host_key_checking = False

changelogs/fragments/cleanups.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
minor_changes:
2+
- Server role - Minor change to the compatibility message, in case an OS is not supported.
3+
- Clean up some module meta data, playbooks and inventory.
4+
- Bump some build-related dependencies and improve testing logic.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
release_summary: "New years cleaning."

galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name: general
1010

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

13-
version: 6.6.0
13+
version: 6.6.1
1414

1515
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
1616
readme: README.md

0 commit comments

Comments
 (0)