Release 2.5.4.

[nmcli] add connection.slave-type for teamed devices (#2827 ) (#2899 )
* [nmcli] add connection.slave-type for teamed devices * [nmcli] add fragment with changes for #2827 * [nmcli] add tests for network team * [nmcli] fix testing Co-authored-by: Oriol MULA VALLS <oriol.mula@lxp.lu> (cherry picked from commit 2d1527a564) Co-authored-by: omula <joriol.mula@gmail.com>
2026-04-30 10:26:52 +00:00 · 2021-06-29 05:57:50 +02:00 · 2021-06-28 21:12:57 +02:00 · 2021-06-28 07:03:25 +02:00 · 2021-06-27 19:05:38 +02:00 · 2021-06-27 14:19:05 +02:00
2142 changed files with 53206 additions and 73289 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -24,14 +24,14 @@ schedules:
    always: true
    branches:
      include:
-        - stable-5
+        - stable-2
-        - stable-4
+        - stable-3
  - cron: 0 11 * * 0
    displayName: Weekly (old stable branches)
    always: true
    branches:
      include:
-        - stable-3
+        - stable-1
 variables:
  - name: checkoutPath
@@ -48,7 +48,7 @@ variables:
 resources:
  containers:
    - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:3.0.0
+      image: quay.io/ansible/azure-pipelines-test-container:1.9.0
 pool: Standard
@@ -68,32 +68,6 @@ stages:
            - test: 3
            - test: 4
            - test: extra
  - stage: Sanity_2_13
    displayName: Sanity 2.13
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Test {0}
          testFormat: 2.13/sanity/{0}
          targets:
            - test: 1
            - test: 2
            - test: 3
            - test: 4
  - stage: Sanity_2_12
    displayName: Sanity 2.12
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Test {0}
          testFormat: 2.12/sanity/{0}
          targets:
            - test: 1
            - test: 2
            - test: 3
            - test: 4
  - stage: Sanity_2_11
    displayName: Sanity 2.11
    dependsOn: []
@@ -107,6 +81,32 @@ stages:
            - test: 2
            - test: 3
            - test: 4
  - stage: Sanity_2_10
    displayName: Sanity 2.10
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Test {0}
          testFormat: 2.10/sanity/{0}
          targets:
            - test: 1
            - test: 2
            - test: 3
            - test: 4
  - stage: Sanity_2_9
    displayName: Sanity 2.9
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Test {0}
          testFormat: 2.9/sanity/{0}
          targets:
            - test: 1
            - test: 2
            - test: 3
            - test: 4
 ### Units
  - stage: Units_devel
    displayName: Units devel
@@ -117,6 +117,7 @@ stages:
          nameFormat: Python {0}
          testFormat: devel/units/{0}/1
          targets:
            - test: 2.6
            - test: 2.7
            - test: 3.5
            - test: 3.6
@@ -124,31 +125,6 @@ stages:
            - test: 3.8
            - test: 3.9
            - test: '3.10'
  - stage: Units_2_13
    displayName: Units 2.13
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Python {0}
          testFormat: 2.13/units/{0}/1
          targets:
            - test: 2.7
            - test: 3.6
            - test: 3.8
            - test: 3.9
  - stage: Units_2_12
    displayName: Units 2.12
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Python {0}
          testFormat: 2.12/units/{0}/1
          targets:
            - test: 2.6
            - test: 3.5
            - test: 3.8
  - stage: Units_2_11
    displayName: Units 2.11
    dependsOn: []
@@ -162,7 +138,40 @@ stages:
            - test: 2.7
            - test: 3.5
            - test: 3.6
            - test: 3.7
            - test: 3.8
            - test: 3.9
  - stage: Units_2_10
    displayName: Units 2.10
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Python {0}
          testFormat: 2.10/units/{0}/1
          targets:
            - test: 2.6
            - test: 2.7
            - test: 3.5
            - test: 3.6
            - test: 3.7
            - test: 3.8
            - test: 3.9
  - stage: Units_2_9
    displayName: Units 2.9
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Python {0}
          testFormat: 2.9/units/{0}/1
          targets:
            - test: 2.6
            - test: 2.7
            - test: 3.5
            - test: 3.6
            - test: 3.7
            - test: 3.8
 ## Remote
  - stage: Remote_devel
@@ -172,49 +181,15 @@ stages:
      - template: templates/matrix.yml
        parameters:
          testFormat: devel/{0}
          targets:
            - name: macOS 12.0
              test: macos/12.0
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 9.0
              test: rhel/9.0
            - name: FreeBSD 12.3
              test: freebsd/12.3
            - name: FreeBSD 13.1
              test: freebsd/13.1
          groups:
            - 1
            - 2
            - 3
  - stage: Remote_2_13
    displayName: Remote 2.13
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          testFormat: 2.13/{0}
          targets:
            - name: macOS 12.0
              test: macos/12.0
            - name: RHEL 8.5
              test: rhel/8.5
          groups:
            - 1
            - 2
            - 3
  - stage: Remote_2_12
    displayName: Remote 2.12
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          testFormat: 2.12/{0}
          targets:
            - name: macOS 11.1
              test: macos/11.1
-            - name: RHEL 8.4
+            - name: RHEL 7.9
-              test: rhel/8.4
+              test: rhel/7.9
            - name: RHEL 8.3
              test: rhel/8.3
            - name: FreeBSD 12.2
              test: freebsd/12.2
            - name: FreeBSD 13.0
              test: freebsd/13.0
          groups:
@@ -229,16 +204,55 @@ stages:
        parameters:
          testFormat: 2.11/{0}
          targets:
            - name: macOS 11.1
              test: macos/11.1
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.3
              test: rhel/8.3
-            #- name: FreeBSD 12.2
+            - name: FreeBSD 12.2
-            #  test: freebsd/12.2
+              test: freebsd/12.2
          groups:
            - 1
            - 2
  - stage: Remote_2_10
    displayName: Remote 2.10
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          testFormat: 2.10/{0}
          targets:
            - name: OS X 10.11
              test: osx/10.11
            - name: macOS 10.15
              test: macos/10.15
            - name: macOS 11.1
              test: macos/11.1
            - name: RHEL 7.8
              test: rhel/7.8
            - name: RHEL 8.2
              test: rhel/8.2
            - name: FreeBSD 12.1
              test: freebsd/12.1
          groups:
            - 1
            - 2
  - stage: Remote_2_9
    displayName: Remote 2.9
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          testFormat: 2.9/{0}
          targets:
            - name: RHEL 8.2
              test: rhel/8.2
            - name: FreeBSD 12.0
              test: freebsd/12.0
          groups:
            - 1
            - 2
            - 3
 ### Docker
  - stage: Docker_devel
@@ -248,57 +262,25 @@ stages:
      - template: templates/matrix.yml
        parameters:
          testFormat: devel/linux/{0}
          targets:
            - name: CentOS 7
              test: centos7
            - name: Fedora 35
              test: fedora35
            - name: Fedora 36
              test: fedora36
            - name: openSUSE 15
              test: opensuse15
            - name: Ubuntu 20.04
              test: ubuntu2004
            - name: Ubuntu 22.04
              test: ubuntu2204
            - name: Alpine 3
              test: alpine3
          groups:
            - 1
            - 2
            - 3
  - stage: Docker_2_13
    displayName: Docker 2.13
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          testFormat: 2.13/linux/{0}
          targets:
            - name: Fedora 35
              test: fedora35
            - name: openSUSE 15 py2
              test: opensuse15py2
            - name: Alpine 3
              test: alpine3
          groups:
            - 1
            - 2
            - 3
  - stage: Docker_2_12
    displayName: Docker 2.12
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          testFormat: 2.12/linux/{0}
          targets:
            - name: CentOS 6
              test: centos6
            - name: CentOS 7
              test: centos7
            - name: CentOS 8
              test: centos8
            - name: Fedora 33
              test: fedora33
            - name: Fedora 34
              test: fedora34
            - name: openSUSE 15 py2
              test: opensuse15py2
            - name: openSUSE 15 py3
              test: opensuse15
            - name: Ubuntu 18.04
              test: ubuntu1804
            - name: Ubuntu 20.04
              test: ubuntu2004
          groups:
            - 1
            - 2
@@ -311,34 +293,51 @@ stages:
        parameters:
          testFormat: 2.11/linux/{0}
          targets:
-            - name: Fedora 32
+            - name: CentOS 8
-              test: fedora32
+              test: centos8
            - name: Fedora 33
              test: fedora33
-            - name: Alpine 3
+            - name: openSUSE 15 py3
-              test: alpine3
+              test: opensuse15
            - name: Ubuntu 20.04
              test: ubuntu2004
          groups:
            - 1
            - 2
            - 3
-
+  - stage: Docker_2_10
-### Community Docker
+    displayName: Docker 2.10
  - stage: Docker_community_devel
    displayName: Docker (community images) devel
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
-          testFormat: devel/linux-community/{0}
+          testFormat: 2.10/linux/{0}
          targets:
-            - name: Debian Bullseye
+            - name: CentOS 8
-              test: debian-bullseye/3.9
+              test: centos8
-            - name: ArchLinux
+            - name: Fedora 32
-              test: archlinux/3.10
+              test: fedora32
-            - name: CentOS Stream 8
+            - name: openSUSE 15 py3
-              test: centos-stream8/3.8
+              test: opensuse15
            - name: Ubuntu 16.04
              test: ubuntu1604
          groups:
            - 2
            - 3
  - stage: Docker_2_9
    displayName: Docker 2.9
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          testFormat: 2.9/linux/{0}
          targets:
            - name: CentOS 8
              test: centos8
            - name: Fedora 31
              test: fedora31
            - name: openSUSE 15 py3
              test: opensuse15
          groups:
            - 1
            - 2
            - 3
@@ -351,27 +350,6 @@ stages:
        parameters:
          nameFormat: Python {0}
          testFormat: devel/cloud/{0}/1
          targets:
            - test: 2.7
            - test: '3.10'
  - stage: Cloud_2_13
    displayName: Cloud 2.13
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Python {0}
          testFormat: 2.13/cloud/{0}/1
          targets:
            - test: 3.9
  - stage: Cloud_2_12
    displayName: Cloud 2.12
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Python {0}
          testFormat: 2.12/cloud/{0}/1
          targets:
            - test: 3.8
  - stage: Cloud_2_11
@@ -384,31 +362,49 @@ stages:
          testFormat: 2.11/cloud/{0}/1
          targets:
            - test: 2.7
-            - test: 3.5
+            - test: 3.6
-
+  - stage: Cloud_2_10
    displayName: Cloud 2.10
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Python {0}
          testFormat: 2.10/cloud/{0}/1
          targets:
            - test: 3.6
  - stage: Cloud_2_9
    displayName: Cloud 2.9
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: Python {0}
          testFormat: 2.9/cloud/{0}/1
          targets:
            - test: 3.6
  - stage: Summary
    condition: succeededOrFailed()
    dependsOn:
      - Sanity_devel
      - Sanity_2_9
      - Sanity_2_10
      - Sanity_2_11
      - Sanity_2_12
      - Sanity_2_13
      - Units_devel
      - Units_2_9
      - Units_2_10
      - Units_2_11
      - Units_2_12
      - Units_2_13
      - Remote_devel
      - Remote_2_9
      - Remote_2_10
      - Remote_2_11
      - Remote_2_12
      - Remote_2_13
      - Docker_devel
      - Docker_2_9
      - Docker_2_10
      - Docker_2_11
      - Docker_2_12
      - Docker_2_13
      - Docker_community_devel
      - Cloud_devel
      - Cloud_2_9
      - Cloud_2_10
      - Cloud_2_11
      - Cloud_2_12
      - Cloud_2_13
    jobs:
      - template: templates/coverage.yml
--- a/.azure-pipelines/scripts/aggregate-coverage.sh
+++ b/.azure-pipelines/scripts/aggregate-coverage.sh
@@ -11,7 +11,7 @@ mkdir "${agent_temp_directory}/coverage/"
 options=(--venv --venv-system-site-packages --color -v)
-ansible-test coverage combine --group-by command --export "${agent_temp_directory}/coverage/" "${options[@]}"
+ansible-test coverage combine --export "${agent_temp_directory}/coverage/" "${options[@]}"
 if ansible-test coverage analyze targets generate --help >/dev/null 2>&1; then
    # Only analyze coverage if the installed version of ansible-test supports it.
--- a/.azure-pipelines/scripts/publish-codecov.py
+++ b/.azure-pipelines/scripts/publish-codecov.py
@@ -1,101 +0,0 @@
 #!/usr/bin/env python
 """
 Upload code coverage reports to codecov.io.
 Multiple coverage files from multiple languages are accepted and aggregated after upload.
 Python coverage, as well as PowerShell and Python stubs can all be uploaded.
 """
 import argparse
 import dataclasses
 import pathlib
 import shutil
 import subprocess
 import tempfile
 import typing as t
 import urllib.request
@dataclasses.dataclass(frozen=True)
 class CoverageFile:
    name: str
    path: pathlib.Path
    flags: t.List[str]
@dataclasses.dataclass(frozen=True)
 class Args:
    dry_run: bool
    path: pathlib.Path
 def parse_args() -> Args:
    parser = argparse.ArgumentParser()
    parser.add_argument('-n', '--dry-run', action='store_true')
    parser.add_argument('path', type=pathlib.Path)
    args = parser.parse_args()
    # Store arguments in a typed dataclass
    fields = dataclasses.fields(Args)
    kwargs = {field.name: getattr(args, field.name) for field in fields}
    return Args(**kwargs)
 def process_files(directory: pathlib.Path) -> t.Tuple[CoverageFile, ...]:
    processed = []
    for file in directory.joinpath('reports').glob('coverage*.xml'):
        name = file.stem.replace('coverage=', '')
        # Get flags from name
        flags = name.replace('-powershell', '').split('=')  # Drop '-powershell' suffix
        flags = [flag if not flag.startswith('stub') else flag.split('-')[0] for flag in flags]  # Remove "-01" from stub files
        processed.append(CoverageFile(name, file, flags))
    return tuple(processed)
 def upload_files(codecov_bin: pathlib.Path, files: t.Tuple[CoverageFile, ...], dry_run: bool = False) -> None:
    for file in files:
        cmd = [
            str(codecov_bin),
            '--name', file.name,
            '--file', str(file.path),
        ]
        for flag in file.flags:
            cmd.extend(['--flags', flag])
        if dry_run:
            print(f'DRY-RUN: Would run command: {cmd}')
            continue
        subprocess.run(cmd, check=True)
 def download_file(url: str, dest: pathlib.Path, flags: int, dry_run: bool = False) -> None:
    if dry_run:
        print(f'DRY-RUN: Would download {url} to {dest} and set mode to {flags:o}')
        return
    with urllib.request.urlopen(url) as resp:
        with dest.open('w+b') as f:
            # Read data in chunks rather than all at once
            shutil.copyfileobj(resp, f, 64 * 1024)
    dest.chmod(flags)
 def main():
    args = parse_args()
    url = 'https://ansible-ci-files.s3.amazonaws.com/codecov/linux/codecov'
    with tempfile.TemporaryDirectory(prefix='codecov-') as tmpdir:
        codecov_bin = pathlib.Path(tmpdir) / 'codecov'
        download_file(url, codecov_bin, 0o755, args.dry_run)
        files = process_files(args.path)
        upload_files(codecov_bin, files, args.dry_run)
 if __name__ == '__main__':
    main()
--- a/.azure-pipelines/scripts/publish-codecov.sh
+++ b/.azure-pipelines/scripts/publish-codecov.sh
@@ -0,0 +1,27 @@
 #!/usr/bin/env bash
 # Upload code coverage reports to codecov.io.
 # Multiple coverage files from multiple languages are accepted and aggregated after upload.
 # Python coverage, as well as PowerShell and Python stubs can all be uploaded.
 set -o pipefail -eu
 output_path="$1"
 curl --silent --show-error https://ansible-ci-files.s3.us-east-1.amazonaws.com/codecov/codecov.sh > codecov.sh
 for file in "${output_path}"/reports/coverage*.xml; do
    name="${file}"
    name="${name##*/}"  # remove path
    name="${name##coverage=}"  # remove 'coverage=' prefix if present
    name="${name%.xml}"  # remove '.xml' suffix
    bash codecov.sh \
        -f "${file}" \
        -n "${name}" \
        -X coveragepy \
        -X gcov \
        -X fix \
        -X search \
        -X xcode \
        || echo "Failed to upload code coverage report to codecov.io: ${file}"
 done
--- a/.azure-pipelines/scripts/report-coverage.sh
+++ b/.azure-pipelines/scripts/report-coverage.sh
@@ -12,4 +12,4 @@ if ! ansible-test --help >/dev/null 2>&1; then
    pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
 fi
-ansible-test coverage xml --group-by command --stub --venv --venv-system-site-packages --color -v
+ansible-test coverage xml --stub --venv --venv-system-site-packages --color -v
--- a/.azure-pipelines/templates/coverage.yml
+++ b/.azure-pipelines/templates/coverage.yml
@@ -33,7 +33,7 @@ jobs:
          summaryFileLocation: "$(outputPath)/reports/$(pipelinesCoverage).xml"
        displayName: Publish to Azure Pipelines
        condition: gt(variables.coverageFileCount, 0)
-      - bash: .azure-pipelines/scripts/publish-codecov.py "$(outputPath)"
+      - bash: .azure-pipelines/scripts/publish-codecov.sh "$(outputPath)"
        displayName: Publish to codecov.io
        condition: gt(variables.coverageFileCount, 0)
        continueOnError: true
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -1,9 +1,7 @@
 notifications: true
 automerge: true
 files:
  plugins/:
-    supershipit: quidame
+    supershipit: quidame Ajpantuso
  changelogs/: {}
  changelogs/fragments/:
    support: community
  $actions:
@@ -14,69 +12,17 @@ files:
    maintainers: nitzmahone samdoran aminvakil
  $becomes/:
    labels: become
  $becomes/doas.py:
    maintainers: $team_ansible_core
  $becomes/dzdo.py:
    maintainers: $team_ansible_core
  $becomes/ksu.py:
    maintainers: $team_ansible_core
  $becomes/machinectl.py:
    maintainers: $team_ansible_core
  $becomes/pbrun.py:
    maintainers: $team_ansible_core
  $becomes/pfexec.py:
    maintainers: $team_ansible_core
  $becomes/pmrun.py:
    maintainers: $team_ansible_core
  $becomes/sesu.py:
    maintainers: nekonyuu
  $becomes/sudosu.py:
    maintainers: dagwieers
  $caches/:
    labels: cache
  $caches/memcached.py: {}
  $caches/pickle.py:
    maintainers: bcoca
  $caches/redis.py: {}
  $caches/yaml.py:
    maintainers: bcoca
  $callbacks/:
    labels: callbacks
  $callbacks/cgroup_memory_recap.py: {}
  $callbacks/context_demo.py: {}
  $callbacks/counter_enabled.py: {}
  $callbacks/dense.py:
    maintainers: dagwieers
  $callbacks/diy.py:
    maintainers: theque5t
  $callbacks/elastic.py:
    maintainers: v1v
    keywords: apm observability
  $callbacks/hipchat.py: {}
  $callbacks/jabber.py: {}
  $callbacks/loganalytics.py:
    maintainers: zhcli
  $callbacks/logdna.py: {}
  $callbacks/logentries.py: {}
  $callbacks/log_plays.py: {}
  $callbacks/logstash.py:
    maintainers: ujenmr
  $callbacks/mail.py:
    maintainers: dagwieers
  $callbacks/nrdp.py:
    maintainers: rverchere
  $callbacks/null.py: {}
  $callbacks/opentelemetry.py:
    maintainers: v1v
    keywords: opentelemetry observability
  $callbacks/say.py:
    notify: chris-short
    maintainers: $team_macos
    labels: macos say
    keywords: brew cask darwin homebrew macosx macports osx
  $callbacks/selective.py: {}
  $callbacks/slack.py: {}
  $callbacks/splunk.py: {}
  $callbacks/sumologic.py:
    maintainers: ryancurrah
    labels: sumologic
@@ -85,26 +31,16 @@ files:
  $callbacks/unixy.py:
    maintainers: akatch
    labels: unixy
  $callbacks/yaml.py: {}
  $connections/:
    labels: connections
-  $connections/chroot.py: {}
+  $connections/kubectl.py:
-  $connections/funcd.py:
+    maintainers: chouseknecht fabianvf flaper87 maxamillion
-    maintainers: mscherer
+    labels: k8s kubectl
  $connections/iocage.py: {}
  $connections/jail.py:
    maintainers: $team_ansible_core
  $connections/lxc.py: {}
  $connections/lxd.py:
    maintainers: mattclay
    labels: lxd
  $connections/qubes.py:
    maintainers: kushaldas
  $connections/saltstack.py:
    maintainers: mscherer
    labels: saltstack
  $connections/zone.py:
    maintainers: $team_ansible_core
  $doc_fragments/:
    labels: docs_fragments
  $doc_fragments/hpe3par.py:
@@ -118,145 +54,67 @@ files:
  $doc_fragments/xenserver.py:
    maintainers: bvitnik
    labels: xenserver
  $filters/counter.py:
    maintainers: keilr
  $filters/dict.py:
    maintainers: felixfontein
  $filters/dict_kv.py:
    maintainers: giner
  $filters/from_csv.py:
    maintainers: Ajpantuso
  $filters/groupby_as_dict.py:
    maintainers: felixfontein
  $filters/hashids.py:
    maintainers: Ajpantuso
  $filters/hashids_decode.yml:
    maintainers: Ajpantuso
  $filters/hashids_encode.yml:
    maintainers: Ajpantuso
  $filters/jc.py:
    maintainers: kellyjonbrazil
-  $filters/json_query.py: {}
+  $filters/list.py:
  $filters/lists_mergeby.py:
    maintainers: vbotka
-  $filters/random_mac.py: {}
+  $filters/path_join_shim.py:
    maintainers: felixfontein
  $filters/time.py:
    maintainers: resmo
  $filters/unicode_normalize.py:
    maintainers: Ajpantuso
  $filters/to_days.yml:
    maintainers: resmo
  $filters/to_hours.yml:
    maintainers: resmo
  $filters/to_milliseconds.yml:
    maintainers: resmo
  $filters/to_minutes.yml:
    maintainers: resmo
  $filters/to_months.yml:
    maintainers: resmo
  $filters/to_seconds.yml:
    maintainers: resmo
  $filters/to_time_unit.yml:
    maintainers: resmo
  $filters/to_weeks.yml:
    maintainers: resmo
  $filters/to_years.yml:
    maintainers: resmo
  $filters/version_sort.py:
    maintainers: ericzolf
  $httpapis/:
    maintainers: $team_networking
    labels: networking
  $httpapis/ftd.py:
    maintainers: $team_networking annikulin
    labels: cisco ftd networking
    keywords: firepower ftd
  $inventories/:
    labels: inventories
  $inventories/cobbler.py:
    maintainers: opoplawski
  $inventories/gitlab_runners.py:
    maintainers: morph027
  $inventories/linode.py:
    maintainers: $team_linode
    labels: cloud linode
    keywords: linode dynamic inventory script
  $inventories/lxd.py:
    maintainers: conloos
  $inventories/nmap.py: {}
  $inventories/online.py:
    maintainers: remyleone
  $inventories/opennebula.py:
    maintainers: feldsam
    labels: cloud opennebula
    keywords: opennebula dynamic inventory script
  $inventories/proxmox.py:
    maintainers: $team_virt ilijamt
  $inventories/xen_orchestra.py:
    maintainers: ddelnano shinuza
  $inventories/icinga2.py:
    maintainers: BongoEADGC6
  $inventories/scaleway.py:
    maintainers: $team_scaleway
    labels: cloud scaleway
  $inventories/stackpath_compute.py:
    maintainers: shayrybak
  $inventories/virtualbox.py: {}
  $lookups/:
    labels: lookups
  $lookups/cartesian.py: {}
  $lookups/chef_databag.py: {}
  $lookups/collection_version.py:
    maintainers: felixfontein
  $lookups/consul_kv.py: {}
  $lookups/credstash.py: {}
  $lookups/cyberarkpassword.py:
    notify: cyberark-bizdev
    labels: cyberarkpassword
  $lookups/dependent.py:
    maintainers: felixfontein
  $lookups/dig.py:
    maintainers: jpmens
    labels: dig
  $lookups/dnstxt.py:
    maintainers: jpmens
  $lookups/dsv.py:
    maintainers: amigus endlesstrax delineaKrehl tylerezimmerman
  $lookups/etcd3.py:
    maintainers: eric-belhomme
  $lookups/etcd.py:
    maintainers: jpmens
  $lookups/filetree.py:
    maintainers: dagwieers
  $lookups/flattened.py: {}
  $lookups/hiera.py:
    maintainers: jparrill
  $lookups/keyring.py: {}
  $lookups/lastpass.py: {}
  $lookups/lmdb_kv.py:
    maintainers: jpmens
  $lookups/manifold.py:
    maintainers: galanoff
    labels: manifold
  $lookups/onepass:
    maintainers: samdoran
    labels: onepassword
-  $lookups/onepassword.py:
+  $lookups/conjur_variable.py:
-    maintainers: azenk scottsb
+    notify: cyberark-bizdev
-  $lookups/onepassword_raw.py:
+    maintainers: $team_cyberark_conjur
-    maintainers: azenk scottsb
+    labels: conjur_variable
-  $lookups/passwordstore.py: {}
+  $lookups/cyberarkpassword.py:
-  $lookups/random_pet.py:
+    notify: cyberark-bizdev
-    maintainers: Akasurde
+    labels: cyberarkpassword
-  $lookups/random_string.py:
+  $lookups/dig.py:
-    maintainers: Akasurde
+    maintainers: jpmens
-  $lookups/random_words.py:
+    labels: dig
    maintainers: konstruktoid
  $lookups/redis.py:
    maintainers: $team_ansible_core jpmens
  $lookups/revbitspss.py:
    maintainers: RevBits
  $lookups/shelvefile.py: {}
  $lookups/tss.py:
-    maintainers: amigus endlesstrax delineaKrehl tylerezimmerman
+    maintainers: amigus
  $lookups/dsv.py:
    maintainers: amigus
  $lookups/manifold.py:
    maintainers: galanoff
    labels: manifold
  $lookups/nios:
    maintainers: $team_networking sganesh-infoblox
    labels: infoblox networking
  $module_utils/:
    labels: module_utils
  $module_utils/gconftool2.py:
    maintainers: russoz
    labels: gconftool2
  $module_utils/gitlab.py:
    notify: jlozadad
    maintainers: $team_gitlab
@@ -277,14 +135,12 @@ files:
  $module_utils/memset.py:
    maintainers: glitchcrab
    labels: cloud memset
  $module_utils/mh/:
    maintainers: russoz
    labels: module_helper
  $module_utils/module_helper.py:
    maintainers: russoz
    labels: module_helper
-  $module_utils/net_tools/pritunl/:
+  $module_utils/net_tools/nios/api.py:
-    maintainers: Lowess
+    maintainers: $team_networking sganesh-infoblox
    labels: infoblox networking
  $module_utils/oracle/oci_utils.py:
    maintainers: $team_oracle
    labels: cloud
@@ -294,22 +150,18 @@ files:
  $module_utils/redfish_utils.py:
    maintainers: $team_redfish
    labels: redfish_utils
-  $module_utils/remote_management/lxca/common.py:
+  $module_utils/remote_management/dellemc/: rajeevarakkal
-    maintainers: navalkp prabhosa
+  $module_utils/remote_management/lxca/common.py: navalkp prabhosa
  $module_utils/scaleway.py:
    maintainers: $team_scaleway
    labels: cloud scaleway
-  $module_utils/storage/hpe3par/hpe3par.py:
+  $module_utils/storage/hpe3par/hpe3par.py: farhan7500 gautamphegde
    maintainers: farhan7500 gautamphegde
  $module_utils/utm_utils.py:
    maintainers: $team_e_spirit
    labels: utm_utils
  $module_utils/xenserver.py:
    maintainers: bvitnik
    labels: xenserver
  $module_utils/xfconf.py:
    maintainers: russoz
    labels: xfconf
  $modules/cloud/alicloud/:
    maintainers: xiaozhu36
  $modules/cloud/atomic/atomic_container.py:
@@ -334,33 +186,35 @@ files:
    maintainers: zbal
  $modules/cloud/lxc/lxc_container.py:
    maintainers: cloudnull
  $modules/cloud/lxc/lxc_profile.py:
    maintainers: conloos
  $modules/cloud/lxd/:
    ignore: hnakamur
  $modules/cloud/lxd/lxd_profile.py:
    maintainers: conloos
  $modules/cloud/lxd/lxd_project.py:
    maintainers: we10710aa
  $modules/cloud/memset/:
    maintainers: glitchcrab
  $modules/cloud/misc/cloud_init_data_facts.py:
    maintainers: resmo
-  $modules/cloud/misc/proxmox:
+  $modules/cloud/misc/helm.py:
    maintainers: flaper87
  $modules/cloud/misc/proxmox.py:
    maintainers: $team_virt UnderGreen
    labels: proxmox virt
    ignore: skvidal
    keywords: kvm libvirt proxmox qemu
  $modules/cloud/misc/proxmox_kvm.py:
    maintainers: $team_virt helldorado
    labels: proxmox_kvm virt
    ignore: skvidal
    keywords: kvm libvirt proxmox qemu
  $modules/cloud/misc/proxmox_snap.py:
    maintainers: $team_virt
    labels: proxmox virt
    keywords: kvm libvirt proxmox qemu
  $modules/cloud/misc/proxmox.py:
    maintainers: UnderGreen
    ignore: skvidal
  $modules/cloud/misc/proxmox_kvm.py:
    maintainers: helldorado
    ignore: skvidal
  $modules/cloud/misc/proxmox_nic.py:
    maintainers: Kogelvis
  $modules/cloud/misc/proxmox_tasks_info:
    maintainers: paginabianca
  $modules/cloud/misc/proxmox_template.py:
-    maintainers: UnderGreen
+    maintainers: $team_virt UnderGreen
    labels: proxmox_template virt
    ignore: skvidal
    keywords: kvm libvirt proxmox qemu
  $modules/cloud/misc/rhevm.py:
    maintainers: $team_virt TimothyVandenbrande
    labels: rhevm virt
@@ -377,7 +231,7 @@ files:
  $modules/cloud/oneandone/:
    maintainers: aajdinov edevenport
  $modules/cloud/online/:
-    maintainers: remyleone
+    maintainers: sieben
  $modules/cloud/opennebula/:
    maintainers: $team_opennebula
  $modules/cloud/opennebula/one_host.py:
@@ -402,46 +256,20 @@ files:
    maintainers: omgjlk sivel
  $modules/cloud/rackspace/:
    ignore: ryansb sivel
  $modules/cloud/rackspace/rax_cbs.py:
    maintainers: claco
  $modules/cloud/rackspace/rax_cbs_attachments.py:
    maintainers: claco
  $modules/cloud/rackspace/rax_cdb.py:
    maintainers: jails
  $modules/cloud/rackspace/rax_cdb_user.py:
    maintainers: jails
  $modules/cloud/rackspace/rax_cdb_database.py:
    maintainers: jails
  $modules/cloud/rackspace/rax_clb.py:
    maintainers: claco
  $modules/cloud/rackspace/rax_clb_nodes.py:
    maintainers: neuroid
  $modules/cloud/rackspace/rax_clb_ssl.py:
    maintainers: smashwilson
  $modules/cloud/rackspace/rax_files.py:
    maintainers: angstwad
  $modules/cloud/rackspace/rax_files_objects.py:
    maintainers: angstwad
  $modules/cloud/rackspace/rax_identity.py:
    maintainers: claco
  $modules/cloud/rackspace/rax_network.py:
    maintainers: claco omgjlk
  $modules/cloud/rackspace/rax_mon_alarm.py:
    maintainers: smashwilson
  $modules/cloud/rackspace/rax_mon_check.py:
    maintainers: smashwilson
  $modules/cloud/rackspace/rax_mon_entity.py:
    maintainers: smashwilson
  $modules/cloud/rackspace/rax_mon_notification.py:
    maintainers: smashwilson
  $modules/cloud/rackspace/rax_mon_notification_plan.py:
    maintainers: smashwilson
  $modules/cloud/rackspace/rax_queue.py:
    maintainers: claco
  $modules/cloud/scaleway/:
    maintainers: $team_scaleway
  $modules/cloud/scaleway/scaleway_compute_private_network.py:
    maintainers: pastral
  $modules/cloud/scaleway/scaleway_database_backup.py:
    maintainers: guillaume_ro_fr
  $modules/cloud/scaleway/scaleway_image_info.py:
@@ -449,19 +277,13 @@ files:
  $modules/cloud/scaleway/scaleway_ip_info.py:
    maintainers: Spredzy
  $modules/cloud/scaleway/scaleway_organization_info.py:
-    maintainers: Spredzy
+    maintainers: sieben
  $modules/cloud/scaleway/scaleway_private_network.py:
    maintainers: pastral
  $modules/cloud/scaleway/scaleway_security_group.py:
    maintainers: DenBeke
  $modules/cloud/scaleway/scaleway_security_group_info.py:
-    maintainers: Spredzy
+    maintainers: sieben
  $modules/cloud/scaleway/scaleway_security_group_rule.py:
    maintainers: DenBeke
  $modules/cloud/scaleway/scaleway_server_info.py:
    maintainers: Spredzy
  $modules/cloud/scaleway/scaleway_snapshot_info.py:
    maintainers: Spredzy
  $modules/cloud/scaleway/scaleway_volume.py:
    labels: scaleway_volume
    ignore: hekonsek
@@ -513,40 +335,21 @@ files:
    maintainers: john-westcott-iv
  $modules/database/misc/redis.py:
    maintainers: slok
  $modules/database/misc/redis_info.py:
    maintainers: levonet
  $modules/database/misc/redis_data_info.py:
    maintainers: paginabianca
  $modules/database/misc/redis_data.py:
    maintainers: paginabianca
  $modules/database/misc/redis_data_incr.py:
    maintainers: paginabianca
  $modules/database/misc/riak.py:
    maintainers: drewkerrigan jsmartin
  $modules/database/mssql/mssql_db.py:
    maintainers: vedit Jmainguy kenichi-ogawa-1988
    labels: mssql_db
  $modules/database/mssql/mssql_script.py:
    maintainers: kbudde
    labels: mssql_script
  $modules/database/saphana/hana_query.py:
    maintainers: rainerleber
  $modules/database/vertica/:
    maintainers: dareko
  $modules/files/archive.py:
    maintainers: bendoh
  $modules/files/filesize.py:
    maintainers: quidame
  $modules/files/ini_file.py:
    maintainers: jpmens noseka1
  $modules/files/iso_create.py:
    maintainers: Tomorrow9
  $modules/files/iso_extract.py:
    maintainers: dagwieers jhoekx ribbons
  $modules/files/read_csv.py:
    maintainers: dagwieers
  $modules/files/sapcar_extract.py:
    maintainers: RainerLeber
  $modules/files/xattr.py:
    maintainers: bcoca
    labels: xattr
@@ -554,6 +357,8 @@ files:
    maintainers: dagwieers magnus919 tbielawa cmprescott sm4rk0
    labels: m:xml xml
    ignore: magnus919
  $modules/identity/onepassword_facts.py:
    maintainers: Rylon
  $modules/identity/ipa/:
    maintainers: $team_ipa
  $modules/identity/ipa/ipa_pwpolicy.py:
@@ -564,34 +369,15 @@ files:
    maintainers: jparrill
  $modules/identity/keycloak/:
    maintainers: $team_keycloak
  $modules/identity/keycloak/keycloak_authentication.py:
    maintainers: elfelip Gaetan2907
  $modules/identity/keycloak/keycloak_clientscope.py:
    maintainers: Gaetan2907
  $modules/identity/keycloak/keycloak_client_rolemapping.py:
    maintainers: Gaetan2907
  $modules/identity/keycloak/keycloak_group.py:
    maintainers: adamgoossens
  $modules/identity/keycloak/keycloak_identity_provider.py:
    maintainers: laurpaum
  $modules/identity/keycloak/keycloak_realm_info.py:
    maintainers: fynncfchen
  $modules/identity/keycloak/keycloak_realm.py:
    maintainers: kris2kris
  $modules/identity/keycloak/keycloak_role.py:
    maintainers: laurpaum
  $modules/identity/keycloak/keycloak_user_federation.py:
    maintainers: laurpaum
  $modules/identity/onepassword_info.py:
    maintainers: Rylon
  $modules/identity/opendj/opendj_backendprop.py:
    maintainers: dj-wasabi
  $modules/monitoring/airbrake_deployment.py:
    maintainers: phumpal
    labels: airbrake_deployment
    ignore: bpennypacker
  $modules/monitoring/alerta_customer.py:
    maintainers: cwollinger
  $modules/monitoring/bigpanda.py:
    maintainers: hkariti
  $modules/monitoring/circonus_annotation.py:
@@ -600,8 +386,6 @@ files:
    maintainers: n0ts
    labels: datadog_event
    ignore: arturaz
  $modules/monitoring/datadog/datadog_downtime.py:
    maintainers: Datadog
  $modules/monitoring/datadog/datadog_monitor.py:
    maintainers: skornehl
  $modules/monitoring/honeybadger_deployment.py:
@@ -623,7 +407,7 @@ files:
  $modules/monitoring/nagios.py:
    maintainers: tbielawa tgoetheyn
  $modules/monitoring/newrelic_deployment.py:
-    ignore: mcodd
+    maintainers: mcodd
  $modules/monitoring/pagerduty.py:
    maintainers: suprememoocow thaumos
    labels: pagerduty
@@ -663,14 +447,12 @@ files:
    labels: cloudflare_dns
  $modules/net_tools/dnsimple.py:
    maintainers: drcapulet
  $modules/net_tools/dnsimple_info.py:
    maintainers: edhilgendorf
  $modules/net_tools/dnsmadeeasy.py:
    maintainers: briceburg
  $modules/net_tools/gandi_livedns.py:
    maintainers: gthiemonge
  $modules/net_tools/haproxy.py:
    maintainers: ravibhure Normo
  $modules/net_tools/:
    maintainers: nerzhul
  $modules/net_tools/infinity/infinity.py:
    maintainers: MeganLiu
  $modules/net_tools/ip_netns.py:
@@ -681,6 +463,8 @@ files:
    maintainers: akostyuk
  $modules/net_tools/ipwcli_dns.py:
    maintainers: cwollinger
  $modules/net_tools/ldap/ldap_attr.py:
    maintainers: jtyr
  $modules/net_tools/ldap/ldap_attrs.py:
    maintainers: drybjed jtyr noles
  $modules/net_tools/ldap/ldap_entry.py:
@@ -694,28 +478,39 @@ files:
    ignore: andyhky
  $modules/net_tools/netcup_dns.py:
    maintainers: nbuchwitz
  $modules/net_tools/nsupdate.py:
    maintainers: nerzhul
  $modules/net_tools/omapi_host.py:
-    maintainers: amasolov nerzhul
+    maintainers: amasolov
-  $modules/net_tools/pritunl/:
+  $modules/net_tools/nios/:
-    maintainers: Lowess
+    maintainers: $team_networking
    labels: infoblox networking
  $modules/net_tools/nios/nios_fixed_address.py:
    maintainers: sjaiswal
  $modules/net_tools/nios/nios_nsgroup.py:
    maintainers: ebirn sjaiswal
  $modules/net_tools/nios/nios_ptr_record.py:
    maintainers: clementtrebuchet
  $modules/net_tools/nios/nios_srv_record.py:
    maintainers: brampling
  $modules/net_tools/nios/nios_txt_record.py:
    maintainers: coreywan
  $modules/net_tools/nmcli.py:
    maintainers: alcamie101
  $modules/net_tools/snmp_facts.py:
    maintainers: ogenstad ujwalkomarla
  $modules/notification/osx_say.py:
    maintainers: ansible mpdehaan
    labels: _osx_say
    deprecated: true
  $modules/notification/bearychat.py:
    maintainers: tonyseek
  $modules/notification/campfire.py:
    maintainers: fabulops
  $modules/notification/catapult.py:
    maintainers: Jmainguy
-  $modules/notification/cisco_webex.py:
+  $modules/notification/cisco_spark.py:
    maintainers: drew-russell
  $modules/notification/discord.py:
    maintainers: cwollinger
  $modules/notification/flowdock.py:
-    ignore: mcodd
+    maintainers: mcodd
  $modules/notification/grove.py:
    maintainers: zimbatm
  $modules/notification/hipchat.py:
@@ -741,13 +536,13 @@ files:
  $modules/notification/pushbullet.py:
    maintainers: willybarro
  $modules/notification/pushover.py:
-    maintainers: weaselkeeper wopfel
+    maintainers: weaselkeeper
  $modules/notification/rocketchat.py:
    maintainers: Deepakkothandan
    labels: rocketchat
    ignore: ramondelafuente
  $modules/notification/say.py:
-    maintainers: $team_ansible_core mpdehaan
+    maintainers: ansible mpdehaan
  $modules/notification/sendgrid.py:
    maintainers: makaimc
  $modules/notification/slack.py:
@@ -755,28 +550,24 @@ files:
  $modules/notification/syslogger.py:
    maintainers: garbled1
  $modules/notification/telegram.py:
-    maintainers: tyouxa loms lomserman
+    maintainers: tyouxa loms
  $modules/notification/twilio.py:
    maintainers: makaimc
  $modules/notification/typetalk.py:
    maintainers: tksmd
  $modules/packaging/language/ansible_galaxy_install.py:
    maintainers: russoz
  $modules/packaging/language/bower.py:
    maintainers: mwarkentin
  $modules/packaging/language/bundler.py:
    maintainers: thoiberg
  $modules/packaging/language/cargo.py:
    maintainers: radek-sprta
  $modules/packaging/language/composer.py:
    maintainers: dmtrs
    ignore: resmo
  $modules/packaging/language/cpanm.py:
-    maintainers: fcuny russoz
+    maintainers: fcuny
  $modules/packaging/language/easy_install.py:
    maintainers: mattupstate
  $modules/packaging/language/gem.py:
-    maintainers: $team_ansible_core johanwiren
+    maintainers: ansible johanwiren
    labels: gem
  $modules/packaging/language/maven_artifact.py:
    maintainers: tumbl3w33d turb
@@ -791,22 +582,16 @@ files:
    ignore: jle64
  $modules/packaging/language/pip_package_info.py:
    maintainers: bcoca matburt maxamillion
  $modules/packaging/language/pipx.py:
    maintainers: russoz
  $modules/packaging/language/yarn.py:
    maintainers: chrishoffman verkaufer
  $modules/packaging/os/apk.py:
    maintainers: tdtrask
    labels: apk
    ignore: kbrebanov
  $modules/packaging/os/apt_repo.py:
    maintainers: obirvalger
  $modules/packaging/os/apt_rpm.py:
    maintainers: evgkrsk
  $modules/packaging/os/copr.py:
    maintainers: schlupov
  $modules/packaging/os/dnf_versionlock.py:
    maintainers: moreda
  $modules/packaging/os/flatpak.py:
    maintainers: $team_flatpak
  $modules/packaging/os/flatpak_remote.py:
@@ -855,12 +640,9 @@ files:
  $modules/packaging/os/opkg.py:
    maintainers: skinp
  $modules/packaging/os/pacman.py:
-    maintainers: elasticdog indrajitr tchernomax jraby
+    maintainers: elasticdog indrajitr tchernomax
    labels: pacman
    ignore: elasticdog
  $modules/packaging/os/pacman_key.py:
    maintainers: grawlinson
    labels: pacman
  $modules/packaging/os/pkgin.py:
    maintainers: $team_solaris L2G jasperla szinck martinm82
    labels: pkgin solaris
@@ -903,9 +685,6 @@ files:
  $modules/packaging/os/snap.py:
    maintainers: angristan vcarceler
    labels: snap
  $modules/packaging/os/snap_alias.py:
    maintainers: russoz
    labels: snap
  $modules/packaging/os/sorcery.py:
    maintainers: vaygr
  $modules/packaging/os/svr4pkg.py:
@@ -934,6 +713,12 @@ files:
    ignore: matze
  $modules/remote_management/cobbler/:
    maintainers: dagwieers
  $modules/remote_management/dellemc/:
    maintainers: rajeevarakkal
  $modules/remote_management/dellemc/idrac_server_config_profile.py:
    maintainers: jagadeeshnv
  $modules/remote_management/dellemc/ome_device_info.py:
    maintainers: Sajna-Shetty
  $modules/remote_management/hpilo/:
    maintainers: haad
    ignore: dagwieers
@@ -949,14 +734,12 @@ files:
  $modules/remote_management/manageiq/:
    labels: manageiq
    maintainers: $team_manageiq
  $modules/remote_management/manageiq/manageiq_alert_profiles.py:
    maintainers: elad661
  $modules/remote_management/manageiq/manageiq_alerts.py:
    maintainers: elad661
  $modules/remote_management/manageiq/manageiq_group.py:
    maintainers: evertmulder
  $modules/remote_management/manageiq/manageiq_tenant.py:
    maintainers: evertmulder
  $modules/remote_management/oneview/oneview_datacenter_facts.py:
    maintainers: aalexmonteiro madhav-bharadwaj ricardogpsf soodpr
  $modules/remote_management/oneview/:
    maintainers: adriane-cardozo fgbulsoni tmiotto
  $modules/remote_management/oneview/oneview_datacenter_info.py:
@@ -1001,20 +784,27 @@ files:
    maintainers: markuman
  $modules/source_control/gitlab/gitlab_runner.py:
    maintainers: SamyCoenen
  $modules/source_control/gitlab/gitlab_user.py:
    maintainers: LennertMertens stgrace
  $modules/source_control/gitlab/gitlab_branch.py:
    maintainers: paytroff
  $modules/source_control/hg.py:
    maintainers: yeukhon
  $modules/storage/emc/emc_vnx_sg_member.py:
    maintainers: remixtj
  $modules/storage/glusterfs/:
    maintainers: devyanikota
  $modules/storage/glusterfs/gluster_peer.py:
    maintainers: sac
  $modules/storage/glusterfs/gluster_volume.py:
    maintainers: rosmo
  $modules/storage/hpe3par/ss_3par_cpg.py:
    maintainers: farhan7500 gautamphegde
  $modules/storage/ibm/:
    maintainers: tzure
-  $modules/storage/pmem/pmem.py:
+  $modules/storage/infinidat/:
-    maintainers: mizumm
+    maintainers: vmalloc GR360RY
  $modules/storage/netapp/:
    maintainers: $team_netapp
  $modules/storage/purestorage/:
    maintainers: $team_purestorage
    labels: pure_storage
  $modules/storage/vexata/:
    maintainers: vexata
  $modules/storage/zfs/:
@@ -1025,6 +815,9 @@ files:
    maintainers: johanwiren
  $modules/storage/zfs/zfs_delegate_admin.py:
    maintainers: natefoo
  $modules/system/python_requirements_facts.py:
    maintainers: willthames
    ignore: ryansb
  $modules/system/aix:
    maintainers: $team_aix
    labels: aix
@@ -1032,9 +825,7 @@ files:
  $modules/system/alternatives.py:
    maintainers: mulby
    labels: alternatives
-    ignore: DavidWittman jiuka
+    ignore: DavidWittman
  $modules/system/aix_lvol.py:
    maintainers: adejoux
  $modules/system/awall.py:
    maintainers: tdtrask
  $modules/system/beadm.py:
@@ -1052,7 +843,7 @@ files:
  $modules/system/dpkg_divert.py:
    maintainers: quidame
  $modules/system/facter.py:
-    maintainers: $team_ansible_core gamethis
+    maintainers: ansible gamethis
    labels: facter
  $modules/system/filesystem.py:
    maintainers: pilou- abulimov quidame
@@ -1060,26 +851,17 @@ files:
  $modules/system/gconftool2.py:
    maintainers: Akasurde kevensen
    labels: gconftool2
  $modules/system/gconftool2_info.py:
    maintainers: russoz
    labels: gconftool2
  $modules/system/homectl.py:
    maintainers: jameslivulpi
  $modules/system/interfaces_file.py:
    maintainers: obourdon hryamzik
    labels: interfaces_file
  $modules/system/iptables_state.py:
    maintainers: quidame
  $modules/system/keyring.py:
    maintainers: ahussey-redhat
  $modules/system/keyring_info.py:
    maintainers: ahussey-redhat
  $modules/system/shutdown.py:
    maintainers: nitzmahone samdoran aminvakil
  $modules/system/java_cert.py:
    maintainers: haad absynth76
  $modules/system/java_keystore.py:
-    maintainers: Mogztter quidame
+    maintainers: Mogztter
  $modules/system/kernel_blacklist.py:
    maintainers: matze
  $modules/system/launchd.py:
@@ -1093,7 +875,7 @@ files:
  $modules/system/lvg.py:
    maintainers: abulimov
  $modules/system/lvol.py:
-    maintainers: abulimov jhoekx zigaSRC unkaputtbar112
+    maintainers: abulimov jhoekx
  $modules/system/make.py:
    maintainers: LinusU
  $modules/system/mksysb.py:
@@ -1106,7 +888,7 @@ files:
  $modules/system/nosh.py:
    maintainers: tacatac
  $modules/system/ohai.py:
-    maintainers: $team_ansible_core mpdehaan
+    maintainers: ansible mpdehaan
    labels: ohai
  $modules/system/open_iscsi.py:
    maintainers: srvg
@@ -1135,8 +917,6 @@ files:
    ignore: ryansb
  $modules/system/runit.py:
    maintainers: jsumners
  $modules/system/sap_task_list_execute:
    maintainers: rainerleber
  $modules/system/sefcontext.py:
    maintainers: dagwieers
  $modules/system/selinux_permissive.py:
@@ -1149,10 +929,6 @@ files:
    maintainers: $team_solaris pmarkham
    labels: solaris
    keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
  $modules/system/ssh_config.py:
    maintainers: gaqzi Akasurde
  $modules/system/sudoers.py:
    maintainers: JonEllis
  $modules/system/svc.py:
    maintainers: bcoca
  $modules/system/syspatch.py:
@@ -1168,38 +944,35 @@ files:
    maintainers: ahtik ovcharenko pyykkis
    labels: ufw
  $modules/system/vdo.py:
-    maintainers: rhawalsh bgurney-rh
+    maintainers: rhawalsh
  $modules/system/xfconf.py:
    maintainers: russoz jbenden
    labels: xfconf
  $modules/system/xfconf_info.py:
    maintainers: russoz
    labels: xfconf
  $modules/system/xfs_quota.py:
    maintainers: bushvin
  $modules/web_infrastructure/jenkins_job_facts.py:
    maintainers: stpierre
  $modules/web_infrastructure/nginx_status_facts.py:
    maintainers: resmo
  $modules/web_infrastructure/apache2_mod_proxy.py:
    maintainers: oboukili
  $modules/web_infrastructure/apache2_module.py:
-    maintainers: berendt n0trax
+    maintainers: berendt n0trax robinro
    ignore: robinro
  $modules/web_infrastructure/deploy_helper.py:
    maintainers: ramondelafuente
  $modules/web_infrastructure/django_manage.py:
-    maintainers: russoz
+    maintainers: scottanderson42 russoz tastychutney
    ignore: scottanderson42 tastychutney
    labels: django_manage
  $modules/web_infrastructure/ejabberd_user.py:
    maintainers: privateip
  $modules/web_infrastructure/gunicorn.py:
    maintainers: agmezr
  $modules/web_infrastructure/htpasswd.py:
-    maintainers: $team_ansible_core
+    maintainers: ansible
    labels: htpasswd
  $modules/web_infrastructure/jboss.py:
    maintainers: $team_jboss jhoekx
    labels: jboss
  $modules/web_infrastructure/jenkins_build.py:
    maintainers: brettmilford unnecessary-username
  $modules/web_infrastructure/jenkins_job.py:
    maintainers: sermilrod
  $modules/web_infrastructure/jenkins_job_info.py:
@@ -1209,19 +982,12 @@ files:
  $modules/web_infrastructure/jenkins_script.py:
    maintainers: hogarthj
  $modules/web_infrastructure/jira.py:
-    maintainers: Slezhuk tarka pertoft
+    maintainers: Slezhuk tarka
    ignore: DWSR
    labels: jira
  $modules/web_infrastructure/nginx_status_info.py:
    maintainers: resmo
-  $modules/web_infrastructure/rundeck_acl_policy.py:
+  $modules/web_infrastructure/:
    maintainers: nerzhul
  $modules/web_infrastructure/rundeck_project.py:
    maintainers: nerzhul
  $modules/web_infrastructure/rundeck_job_run.py:
    maintainers: phsmith
  $modules/web_infrastructure/rundeck_job_executions_info.py:
    maintainers: phsmith
  $modules/web_infrastructure/sophos_utm/:
    maintainers: $team_e_spirit
    keywords: sophos utm
@@ -1231,20 +997,10 @@ files:
  $modules/web_infrastructure/sophos_utm/utm_proxy_exception.py:
    maintainers: $team_e_spirit RickS-C137
    keywords: sophos utm
  $modules/web_infrastructure/sophos_utm/utm_ca_host_key_cert.py:
    maintainers: stearz
  $modules/web_infrastructure/sophos_utm/utm_ca_host_key_cert_info.py:
    maintainers: stearz
  $modules/web_infrastructure/sophos_utm/utm_network_interface_address.py:
    maintainers: steamx
  $modules/web_infrastructure/sophos_utm/utm_network_interface_address_info.py:
    maintainers: steamx
  $modules/web_infrastructure/supervisorctl.py:
    maintainers: inetfuture mattupstate
  $modules/web_infrastructure/taiga_issue.py:
    maintainers: lekum
  $tests/a_module.py:
    maintainers: felixfontein
 #########################
  tests/:
    labels: tests
@@ -1260,26 +1016,24 @@ files:
 macros:
  actions: plugins/action
  becomes: plugins/become
  caches: plugins/cache
  callbacks: plugins/callback
  cliconfs: plugins/cliconf
  connections: plugins/connection
  doc_fragments: plugins/doc_fragments
  filters: plugins/filter
  httpapis: plugins/httpapi
  inventories: plugins/inventory
  lookups: plugins/lookup
  module_utils: plugins/module_utils
  modules: plugins/modules
  terminals: plugins/terminal
  tests: plugins/test
  team_ansible_core:
  team_aix: MorrisA bcoca d-little flynn1973 gforster kairoaraujo marvin-sinister mator molekuul ramooncamacho wtcross
  team_bsd: JoergFiedler MacLemon bcoca dch jasperla mekanix opoplawski overhacked tuxillo
  team_consul: sgargan
  team_cyberark_conjur: jvanderhoof ryanprior
  team_e_spirit: MatrixCrawler getjack
  team_flatpak: JayKayy oolongbrothers
-  team_gitlab: Lunik Shaps dj-wasabi marwatk waheedi zanssa scodeman metanovii sh0shin nejch lgatellier suukit
+  team_gitlab: Lunik Shaps dj-wasabi marwatk waheedi zanssa scodeman metanovii
  team_hpux: bcoca davx8342
  team_huawei: QijunPan TommyLike edisonxiang freesky-edward hwDCN niuzhenguo xuxiaowei0512 yanzhangi zengchen1024 zhongjun2
  team_ipa: Akasurde Nosmoht fxfitz justchris1
@@ -1288,13 +1042,14 @@ macros:
  team_linode: InTheCloudDan decentral1se displague rmcintosh Charliekenney23 LBGarber
  team_macos: Akasurde kyleabenson martinm82 danieljaouen indrajitr
  team_manageiq: abellotti cben gtanzillo yaacov zgalor dkorn evertmulder
  team_netapp: amit0701 carchi8py hulquest lmprice lonico ndswartz schmots1
  team_networking: NilashishC Qalthos danielmellado ganeshrn justjais trishnaguha sganesh-infoblox privateip
  team_opennebula: ilicmilan meerkampdvv rsmontero xorel nilsding
  team_oracle: manojmeda mross22 nalsaber
  team_purestorage: bannaych dnix101 genegr lionmax opslounge raekins sdodsley sile16
-  team_redfish: mraineri tomasg2012 xmadsen renxulei rajeevkallur bhavya06
+  team_redfish: mraineri tomasg2012 xmadsen renxulei
  team_rhn: FlossWare alikins barnabycourt vritant
-  team_scaleway: remyleone abarbare
+  team_scaleway: QuentinBrosse abarbare jerome-quere kindermoumoute remyleone sieben
  team_solaris: bcoca fishman jasperla jpdasma mator scathatheworm troy2914 xen0l
-  team_suse: commel evrardjp lrupp toabctl AnderEnder alxgu andytom sealor
+  team_suse: commel dcermak evrardjp lrupp toabctl AnderEnder alxgu andytom sealor
  team_virt: joshainglis karmab tleguern Thulium-Drake Ajpantuso
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,149 +0,0 @@
 ---
 name: Bug report
 description: Create a report to help us improve
 body:
 - type: markdown
  attributes:
    value: |
      ⚠
      Verify first that your issue is not [already reported on GitHub][issue search].
      Also test if the latest release and devel branch are affected too.
      *Complete **all** sections as described, this form is processed automatically.*
      [issue search]: https://github.com/ansible-collections/community.general/search?q=is%3Aissue&type=issues
 - type: textarea
  attributes:
    label: Summary
    description: Explain the problem briefly below.
    placeholder: >-
      When I try to do X with the collection from the main branch on GitHub, Y
      breaks in a way Z under the env E. Here are all the details I know
      about this problem...
  validations:
    required: true
 - type: dropdown
  attributes:
    label: Issue Type
    # FIXME: Once GitHub allows defining the default choice, update this
    options:
    - Bug Report
  validations:
    required: true
 - type: textarea
  attributes:
    # For smaller collections we could use a multi-select and hardcode the list
    # May generate this list via GitHub action and walking files under https://github.com/ansible-collections/community.general/tree/main/plugins
    # Select from list, filter as you type (`mysql` would only show the 3 mysql components)
    # OR freeform - doesn't seem to be supported in adaptivecards
    label: Component Name
    description: >-
      Write the short name of the module, plugin, task or feature below,
      *use your best guess if unsure*.
    placeholder: dnf, apt, yum, pip, user etc.
  validations:
    required: true
 - type: textarea
  attributes:
    label: Ansible Version
    description: >-
      Paste verbatim output from `ansible --version` between
      tripple backticks.
    value: |
      ```console (paste below)
      $ ansible --version
      ```
  validations:
    required: true
 - type: textarea
  attributes:
    label: Community.general Version
    description: >-
      Paste verbatim output from "ansible-galaxy collection list community.general"
      between tripple backticks.
    value: |
      ```console (paste below)
      $ ansible-galaxy collection list community.general
      ```
  validations:
    required: true
 - type: textarea
  attributes:
    label: Configuration
    description: >-
      If this issue has an example piece of YAML that can help to reproduce this problem, please provide it.
      This can be a piece of YAML from, e.g., an automation, script, scene or configuration.
      Paste verbatim output from `ansible-config dump --only-changed` between quotes
    value: |
      ```console (paste below)
      $ ansible-config dump --only-changed
      ```
 - type: textarea
  attributes:
    label: OS / Environment
    description: >-
      Provide all relevant information below, e.g. target OS versions,
      network device firmware, etc.
    placeholder: RHEL 8, CentOS Stream etc.
  validations:
    required: false
 - type: textarea
  attributes:
    label: Steps to Reproduce
    description: |
      Describe exactly how to reproduce the problem, using a minimal test-case. It would *really* help us understand your problem if you could also passed any playbooks, configs and commands you used.
      **HINT:** You can paste https://gist.github.com links for larger files.
    value: |
      <!--- Paste example playbooks or commands between quotes below -->
      ```yaml (paste below)
      ```
  validations:
    required: true
 - type: textarea
  attributes:
    label: Expected Results
    description: >-
      Describe what you expected to happen when running the steps above.
    placeholder: >-
      I expected X to happen because I assumed Y.
      that it did not.
  validations:
    required: true
 - type: textarea
  attributes:
    label: Actual Results
    description: |
      Describe what actually happened. If possible run with extra verbosity (`-vvvv`).
      Paste verbatim command output between quotes.
    value: |
      ```console (paste below)
      ```
 - type: checkboxes
  attributes:
    label: Code of Conduct
    description: |
      Read the [Ansible Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html?utm_medium=github&utm_source=issue_form--ansible-collections) first.
    options:
    - label: I agree to follow the Ansible Code of Conduct
      required: true
 ...
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,27 +0,0 @@
 ---
 # Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
 blank_issues_enabled: false  # default: true
 contact_links:
 - name: Security bug report
  url: https://docs.ansible.com/ansible-core/devel/community/reporting_bugs_and_features.html?utm_medium=github&utm_source=issue_template_chooser_ansible_collections
  about: |
    Please learn how to report security vulnerabilities here.
    For all security related bugs, email security@ansible.com
    instead of using this issue tracker and you will receive
    a prompt response.
    For more information, see
    https://docs.ansible.com/ansible/latest/community/reporting_bugs_and_features.html
 - name: Ansible Code of Conduct
  url: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html?utm_medium=github&utm_source=issue_template_chooser_ansible_collections
  about: Be nice to other members of the community.
 - name: Talks to the community
  url: https://docs.ansible.com/ansible/latest/community/communication.html?utm_medium=github&utm_source=issue_template_chooser#mailing-list-information
  about: Please ask and answer usage questions here
 - name: Working groups
  url: https://github.com/ansible/community/wiki
  about: Interested in improving a specific area? Become a part of a working group!
 - name: For Enterprise
  url: https://www.ansible.com/products/engine?utm_medium=github&utm_source=issue_template_chooser_ansible_collections
  about: Red Hat offers support for the Ansible Automation Platform
--- a/.github/ISSUE_TEMPLATE/documentation_report.yml
+++ b/.github/ISSUE_TEMPLATE/documentation_report.yml
@@ -1,125 +0,0 @@
 ---
 name: Documentation Report
 description: Ask us about docs
 # NOTE: issue body is enabled to allow screenshots
 body:
 - type: markdown
  attributes:
    value: |
      ⚠
      Verify first that your issue is not [already reported on GitHub][issue search].
      Also test if the latest release and devel branch are affected too.
      *Complete **all** sections as described, this form is processed automatically.*
      [issue search]: https://github.com/ansible-collections/community.general/search?q=is%3Aissue&type=issues
 - type: textarea
  attributes:
    label: Summary
    description: |
      Explain the problem briefly below, add suggestions to wording or structure.
      **HINT:** Did you know the documentation has an `Edit on GitHub` link on every page?
    placeholder: >-
      I was reading the Collection documentation of version X and I'm having
      problems understanding Y. It would be very helpful if that got
      rephrased as Z.
  validations:
    required: true
 - type: dropdown
  attributes:
    label: Issue Type
    # FIXME: Once GitHub allows defining the default choice, update this
    options:
    - Documentation Report
  validations:
    required: true
 - type: input
  attributes:
    label: Component Name
    description: >-
      Write the short name of the rst file, module, plugin, task or
      feature below, *use your best guess if unsure*.
    placeholder: mysql_user
  validations:
    required: true
 - type: textarea
  attributes:
    label: Ansible Version
    description: >-
      Paste verbatim output from `ansible --version` between
      tripple backticks.
    value: |
      ```console (paste below)
      $ ansible --version
      ```
  validations:
    required: false
 - type: textarea
  attributes:
    label: Community.general Version
    description: >-
      Paste verbatim output from "ansible-galaxy collection list community.general"
      between tripple backticks.
    value: |
      ```console (paste below)
      $ ansible-galaxy collection list community.general
      ```
  validations:
    required: true
 - type: textarea
  attributes:
    label: Configuration
    description: >-
      Paste verbatim output from `ansible-config dump --only-changed` between quotes.
    value: |
      ```console (paste below)
      $ ansible-config dump --only-changed
      ```
  validations:
    required: false
 - type: textarea
  attributes:
    label: OS / Environment
    description: >-
      Provide all relevant information below, e.g. OS version,
      browser, etc.
    placeholder: Fedora 33, Firefox etc.
  validations:
    required: false
 - type: textarea
  attributes:
    label: Additional Information
    description: |
      Describe how this improves the documentation, e.g. before/after situation or screenshots.
      **Tip:** It's not possible to upload the screenshot via this field directly but you can use the last textarea in this form to attach them.
      **HINT:** You can paste https://gist.github.com links for larger files.
    placeholder: >-
      When the improvement is applied, it makes it more straightforward
      to understand X.
  validations:
    required: false
 - type: checkboxes
  attributes:
    label: Code of Conduct
    description: |
      Read the [Ansible Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html?utm_medium=github&utm_source=issue_form--ansible-collections) first.
    options:
    - label: I agree to follow the Ansible Code of Conduct
      required: true
 ...
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,69 +0,0 @@
 ---
 name: Feature request
 description: Suggest an idea for this project
 body:
 - type: markdown
  attributes:
    value: |
      ⚠
      Verify first that your issue is not [already reported on GitHub][issue search].
      Also test if the latest release and devel branch are affected too.
      *Complete **all** sections as described, this form is processed automatically.*
      [issue search]: https://github.com/ansible-collections/community.general/search?q=is%3Aissue&type=issues
 - type: textarea
  attributes:
    label: Summary
    description: Describe the new feature/improvement briefly below.
    placeholder: >-
      I am trying to do X with the collection from the main branch on GitHub and
      I think that implementing a feature Y would be very helpful for me and
      every other user of community.general because of Z.
  validations:
    required: true
 - type: dropdown
  attributes:
    label: Issue Type
    # FIXME: Once GitHub allows defining the default choice, update this
    options:
    - Feature Idea
  validations:
    required: true
 - type: input
  attributes:
    label: Component Name
    description: >-
      Write the short name of the module, plugin, task or feature below,
      *use your best guess if unsure*.
    placeholder: dnf, apt, yum, pip, user etc.
  validations:
    required: true
 - type: textarea
  attributes:
    label: Additional Information
    description: |
      Describe how the feature would be used, why it is needed and what it would solve.
      **HINT:** You can paste https://gist.github.com links for larger files.
    value: |
      <!--- Paste example playbooks or commands between quotes below -->
      ```yaml (paste below)
      ```
  validations:
    required: false
 - type: checkboxes
  attributes:
    label: Code of Conduct
    description: |
      Read the [Ansible Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html?utm_medium=github&utm_source=issue_form--ansible-collections) first.
    options:
    - label: I agree to follow the Ansible Code of Conduct
      required: true
 ...
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +0,0 @@
 ---
 version: 2
 updates:
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
      interval: "weekly"
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -4,21 +4,14 @@ on:
  schedule:
    - cron: '26 19 * * 1'
 permissions:
  contents: read
 jobs:
  CodeQL-Build:
    permissions:
      actions: read  # for github/codeql-action/init to get workflow details
      contents: read  # for actions/checkout to fetch code
      security-events: write  # for github/codeql-action/autobuild to send a status report
    runs-on: ubuntu-latest
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
      with:
        # We must fetch at least the immediate parents so that if this is
        # a pull request then we can checkout the head.
@@ -31,7 +24,7 @@ jobs:
    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
      # Override language selection by uncommenting this and choosing your languages
      # with:
      #   languages: go, javascript, csharp, python, cpp, java
@@ -39,7 +32,7 @@ jobs:
    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v1
    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -53,4 +46,4 @@ jobs:
    #   make release
    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-# Created by https://www.toptal.com/developers/gitignore/api/vim,git,macos,linux,pydev,emacs,dotenv,python,windows,webstorm,pycharm+all,jupyternotebooks
+# Created by https://www.gitignore.io/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
-# Edit at https://www.toptal.com/developers/gitignore?templates=vim,git,macos,linux,pydev,emacs,dotenv,python,windows,webstorm,pycharm+all,jupyternotebooks
+# Edit at https://www.gitignore.io/?templates=git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
 ### dotenv ###
 .env
@@ -71,19 +71,7 @@ flycheck_*.el
 *_LOCAL_*.txt
 *_REMOTE_*.txt
-### JupyterNotebooks ###
+#!! ERROR: jupyternotebook is undefined. Use list command to see defined gitignore types !!#
 # gitignore template for Jupyter Notebooks
 # website: http://jupyter.org/
 .ipynb_checkpoints
 */.ipynb_checkpoints/*
 # IPython
 profile_default/
 ipython_config.py
 # Remove previous ipynb_checkpoints
 #   git rm -r .ipynb_checkpoints/
 ### Linux ###
@@ -99,41 +87,8 @@ ipython_config.py
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
 ### macOS ###
 # General
 .DS_Store
 .AppleDouble
 .LSOverride
 # Icon must end with two \r
 Icon
 # Thumbnails
 ._*
 # Files that might appear in the root of a volume
 .DocumentRevisions-V100
 .fseventsd
 .Spotlight-V100
 .TemporaryItems
 .Trashes
 .VolumeIcon.icns
 .com.apple.timemachine.donotpresent
 # Directories potentially created on remote AFP share
 .AppleDB
 .AppleDesktop
 Network Trash Folder
 Temporary Items
 .apdisk
 ### macOS Patch ###
 # iCloud generated files
 *.icloud
 ### PyCharm+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 # User-specific stuff
@@ -143,9 +98,6 @@ Temporary Items
 .idea/**/dictionaries
 .idea/**/shelf
 # AWS User-specific
 .idea/**/aws.xml
 # Generated files
 .idea/**/contentModel.xml
@@ -166,9 +118,6 @@ Temporary Items
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
 # .idea/artifacts
 # .idea/compiler.xml
 # .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
@@ -196,9 +145,6 @@ atlassian-ide-plugin.xml
 # Cursive Clojure plugin
 .idea/replstate.xml
 # SonarLint plugin
 .idea/sonarlint/
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
@@ -212,13 +158,20 @@ fabric.properties
 .idea/caches/build_file_checksums.ser
 ### PyCharm+all Patch ###
-# Ignore everything but code style settings and run configurations
+# Ignores the whole .idea folder and all .iml files
-# that are supposed to be shared within teams.
+# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
-.idea/*
+.idea/
-!.idea/codeStyles
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
-!.idea/runConfigurations
+
 *.iml
 modules.xml
 .idea/misc.xml
 *.ipr
 # Sonarlint plugin
 .idea/sonarlint
 ### pydev ###
 .pydevproject
@@ -245,6 +198,7 @@ parts/
 sdist/
 var/
 wheels/
 pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -271,25 +225,13 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
 *.py,cover
 .hypothesis/
 .pytest_cache/
 cover/
 # Translations
 *.mo
 *.pot
 # Django stuff:
 *.log
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
 # Flask stuff:
 instance/
 .webassets-cache
 # Scrapy stuff:
 .scrapy
@@ -297,17 +239,10 @@ instance/
 docs/_build/
 # PyBuilder
 .pybuilder/
 target/
 # Jupyter Notebook
 # IPython
 # pyenv
-#   For a library or package, you might want to ignore these files since the code is
+.python-version
 #   intended to run in multiple environments; otherwise, check them in:
 # .python-version
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
@@ -316,39 +251,12 @@ target/
 #   install all needed dependencies.
 #Pipfile.lock
-# poetry
+# celery beat schedule file
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
 #   commonly ignored for libraries.
 #   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
 #poetry.lock
 # pdm
 #   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
 #pdm.lock
 #   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
 #   in version control.
 #   https://pdm.fming.dev/#use-with-ide
 .pdm.toml
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
 # Celery stuff
 celerybeat-schedule
 celerybeat.pid
 # SageMath parsed files
 *.sage.py
 # Environments
 .venv
 env/
 venv/
 ENV/
 env.bak/
 venv.bak/
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -356,6 +264,10 @@ venv.bak/
 # Rope project settings
 .ropeproject
 # Mr Developer
 .mr.developer.cfg
 .project
 # mkdocs documentation
 /site
@@ -367,23 +279,9 @@ dmypy.json
 # Pyre type checker
 .pyre/
 # pytype static type analyzer
 .pytype/
 # Cython debug symbols
 cython_debug/
 # PyCharm
 #  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 ### Vim ###
 # Swap
 [._]*.s[a-v][a-z]
 !*.svg  # comment out if you don't need vector files
 [._]*.sw[a-p]
 [._]s[a-rt-v][a-z]
 [._]ss[a-gi-z]
@@ -401,13 +299,11 @@ tags
 [._]*.un~
 ### WebStorm ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 # User-specific stuff
 # AWS User-specific
 # Generated files
 # Sensitive or high-churn files
@@ -418,9 +314,6 @@ tags
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
 # .idea/artifacts
 # .idea/compiler.xml
 # .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
@@ -441,8 +334,6 @@ tags
 # Cursive Clojure plugin
 # SonarLint plugin
 # Crashlytics plugin (for Android Studio and IntelliJ)
 # Editor-based Rest Client
@@ -458,27 +349,15 @@ tags
 # *.ipr
 # Sonarlint plugin
 # https://plugins.jetbrains.com/plugin/7973-sonarlint
 .idea/**/sonarlint/
 # SonarQube Plugin
 # https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
 .idea/**/sonarIssues.xml
 # Markdown Navigator plugin
 # https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
 .idea/**/markdown-navigator.xml
 .idea/**/markdown-navigator-enh.xml
 .idea/**/markdown-navigator/
 # Cache file creation bug
 # See https://youtrack.jetbrains.com/issue/JBR-2257
 .idea/$CACHE_FILE$
 # CodeStream plugin
 # https://plugins.jetbrains.com/plugin/12206-codestream
 .idea/codestream.xml
 ### Windows ###
 # Windows thumbnail cache files
 Thumbs.db
@@ -505,4 +384,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
-# End of https://www.toptal.com/developers/gitignore/api/vim,git,macos,linux,pydev,emacs,dotenv,python,windows,webstorm,pycharm+all,jupyternotebooks
+# End of https://www.gitignore.io/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,19 +0,0 @@
 ---
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v4.0.1
    hooks:
      - id: trailing-whitespace
      - id: end-of-file-fixer
      - id: mixed-line-ending
        args: [--fix=lf]
      - id: fix-encoding-pragma
      - id: check-ast
      - id: check-merge-conflict
      - id: check-symlinks
  - repo: https://github.com/pre-commit/pygrep-hooks
    rev: v1.9.0
    hooks:
      - id: rst-backticks
        types: [file]
        files: changelogs/fragments/.*\.(yml|yaml)$
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,10 +23,9 @@ Note that reviewing does not only mean code review, but also offering comments o
 Also, consider taking up a valuable, reviewed, but abandoned pull request which you could politely ask the original authors to complete yourself.
 * Try committing your changes with an informative but short commit message.
-* Do not squash your commits and force-push to your branch if not needed. Reviews of your pull request are much easier with individual commits to comprehend the pull request history. All commits of your pull request branch will be squashed into one commit by GitHub upon merge.
+* All commits of a pull request branch will be squashed into one commit at last. That does not mean you must have only one commit on your pull request, though!
-* Do not add merge commits to your PR. The bot will complain and you will have to rebase ([instructions for rebasing](https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html)) to remove them before your PR can be merged. To avoid that git automatically does merges during pulls, you can configure it to do rebases instead by running `git config pull.rebase true` inside the repository checkout.
+* Please try not to force-push if it is not needed, so reviewers and other users looking at your pull request later can see the pull request commit history.
-* Make sure your PR includes a [changelog fragment](https://docs.ansible.com/ansible/devel/community/development_process.html#changelogs-how-to). (You must not include a fragment for new modules or new plugins, except for test and filter plugins. Also you shouldn't include one for docs-only changes. If you're not sure, simply don't include one, we'll tell you whether one is needed or not :) )
+* Do not add merge commits to your PR. The bot will complain and you will have to rebase ([instructions for rebasing](https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html)) to remove them before your PR can be merged. To avoid that git automatically does merges during pulls, you can configure it to do rebases instead by running `git config pull.rebase true` inside the respository checkout.
 * Avoid reformatting unrelated parts of the codebase in your PR. These types of changes will likely be requested for reversion, create additional work for reviewers, and may cause approval to be delayed.
 You can also read [our Quick-start development guide](https://github.com/ansible/community-docs/blob/main/create_pr_quick_start_guide.rst).
@@ -35,109 +34,3 @@ You can also read [our Quick-start development guide](https://github.com/ansible
 If you want to test a PR locally, refer to [our testing guide](https://github.com/ansible/community-docs/blob/main/test_pr_locally_guide.rst) for instructions on how do it quickly.
 If you find any inconsistencies or places in this document which can be improved, feel free to raise an issue or pull request to fix it.
 ## Run sanity, unit or integration tests locally
 You have to check out the repository into a specific path structure to be able to run `ansible-test`. The path to the git checkout must end with `.../ansible_collections/community/general`. Please see [our testing guide](https://github.com/ansible/community-docs/blob/main/test_pr_locally_guide.rst) for instructions on how to check out the repository into a correct path structure. The short version of these instructions is:
 ```.bash
 mkdir -p ~/dev/ansible_collections/community
 git clone https://github.com/ansible-collections/community.general.git ~/dev/ansible_collections/community/general
 cd ~/dev/ansible_collections/community/general
 ```
 Then you can run `ansible-test` (which is a part of [ansible-core](https://pypi.org/project/ansible-core/)) inside the checkout. The following example commands expect that you have installed Docker or Podman. Note that Podman has only been supported by more recent ansible-core releases. If you are using Docker, the following will work with Ansible 2.9+.
 The following commands show how to run sanity tests:
 ```.bash
 # Run sanity tests for all files in the collection:
 ansible-test sanity --docker -v
 # Run sanity tests for the given files and directories:
 ansible-test sanity --docker -v plugins/modules/system/pids.py tests/integration/targets/pids/
 ```
 The following commands show how to run unit tests:
 ```.bash
 # Run all unit tests:
 ansible-test units --docker -v
 # Run all unit tests for one Python version (a lot faster):
 ansible-test units --docker -v --python 3.8
 # Run a specific unit test (for the nmcli module) for one Python version:
 ansible-test units --docker -v --python 3.8 tests/unit/plugins/modules/net_tools/test_nmcli.py
 ```
 The following commands show how to run integration tests:
 ```.bash
 # Run integration tests for the interfaces_files module in a Docker container using the
 # fedora35 operating system image (the supported images depend on your ansible-core version):
 ansible-test integration --docker fedora35 -v interfaces_file
 # Run integration tests for the flattened lookup **without any isolation**:
 ansible-test integration -v lookup_flattened
 ```
 If you are unsure about the integration test target name for a module or plugin, you can take a look in `tests/integration/targets/`. Tests for plugins have the plugin type prepended.
 ## Creating new modules or plugins
 Creating new modules and plugins requires a bit more work than other Pull Requests.
 1. Please make sure that your new module or plugin is of interest to a larger audience. Very specialized modules or plugins that
   can only be used by very few people should better be added to more specialized collections.
 2. Please do not add more than one plugin/module in one PR, especially if it is the first plugin/module you are contributing.
   That makes it easier for reviewers, and increases the chance that your PR will get merged. If you plan to contribute a group
   of plugins/modules (say, more than a module and a corresponding ``_info`` module), please mention that in the first PR. In
   such cases, you also have to think whether it is better to publish the group of plugins/modules in a new collection.
 3. When creating a new module or plugin, please make sure that you follow various guidelines:
   - Follow [development conventions](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_best_practices.html);
   - Follow [documentation standards](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_documenting.html) and
     the [Ansible style guide](https://docs.ansible.com/ansible/devel/dev_guide/style_guide/index.html#style-guide);
   - Make sure your modules and plugins are [GPL-3.0-or-later](https://www.gnu.org/licenses/gpl-3.0-standalone.html) licensed
     (new module_utils can also be [BSD-2-clause](https://opensource.org/licenses/BSD-2-Clause) licensed);
   - Make sure that new plugins and modules have tests (unit tests, integration tests, or both); it is preferable to have some tests
     which run in CI.
 4. For modules and action plugins, make sure to create your module/plugin in the correct subdirectory, and add a redirect entry
   in `meta/runtime.yml`. For example, for the `aerospike_migrations` module located in
   `plugins/modules/database/aerospike/aerospike_migrations.py`, you need to create the following entry:
   ```.yaml
       aerospike_migrations:
         redirect: community.general.database.aerospike.aerospike_migrations
   ```
   Here, the relative path `database/aerospike/` is inserted into the module's FQCN (Fully Qualified Collection Name) after the
   collection's name and before the module's name. This must not be done for other plugin types but modules and action plugins!
   - Action plugins need to be accompanied by a module, even if the module file only contains documentation
     (`DOCUMENTATION`, `EXAMPLES` and `RETURN`). The module must have the same name and directory path in `plugins/modules/`
     than the action plugin has in `plugins/action/`.
 5. Make sure to add a BOTMETA entry for your new module/plugin in `.github/BOTMETA.yml`. Search for other plugins/modules in the
   same directory to see how entries could look. You should list all authors either as `maintainers` or under `ignore`. People
   listed as `maintainers` will be pinged for new issues and PRs that modify the module/plugin or its tests.
   When you add a new plugin/module, we expect that you perform maintainer duty for at least some time after contributing it.
 ## pre-commit
 To help ensure high-quality contributions this repository includes a [pre-commit](https://pre-commit.com) configuration which
 corrects and tests against common issues that would otherwise cause CI to fail. To begin using these pre-commit hooks see
 the [Installation](#installation) section below.
 This is optional and not required to contribute to this repository.
 ### Installation
 Follow the [instructions](https://pre-commit.com/#install) provided with pre-commit and run `pre-commit install` under the repository base. If for any reason you would like to disable the pre-commit hooks run `pre-commit uninstall`.
 This is optional to run it locally.
 You can trigger it locally with `pre-commit run --all-files` or even to run only for a given file `pre-commit run --files YOUR_FILE`.
--- a/PSF-license.txt
+++ b/PSF-license.txt
@@ -1,48 +0,0 @@
 PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 --------------------------------------------
 1. This LICENSE AGREEMENT is between the Python Software Foundation
 ("PSF"), and the Individual or Organization ("Licensee") accessing and
 otherwise using this software ("Python") in source or binary form and
 its associated documentation.
 2. Subject to the terms and conditions of this License Agreement, PSF hereby
 grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
 analyze, test, perform and/or display publicly, prepare derivative works,
 distribute, and otherwise use Python alone or in any derivative version,
 provided, however, that PSF's License Agreement and PSF's notice of copyright,
 i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Python Software Foundation;
 All Rights Reserved" are retained in Python alone or in any derivative version
 prepared by Licensee.
 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python or any part thereof, and wants to make
 the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
 the changes made to Python.
 4. PSF is making Python available to Licensee on an "AS IS"
 basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
 FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
 INFRINGE ANY THIRD PARTY RIGHTS.
 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
 A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
 OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
 6. This License Agreement will automatically terminate upon a material
 breach of its terms and conditions.
 7. Nothing in this License Agreement shall be deemed to create any
 relationship of agency, partnership, or joint venture between PSF and
 Licensee.  This License Agreement does not grant permission to use PSF
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 8. By copying, installing or otherwise using Python, Licensee
 agrees to be bound by the terms and conditions of this License
 Agreement.
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Community General Collection
-[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-5)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
+[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-2)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
 [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/community.general)](https://codecov.io/gh/ansible-collections/community.general)
 This repository contains the `community.general` Ansible Collection. The collection is a part of the Ansible package and includes many modules and plugins supported by Ansible community which are not part of more specialized community collections.
@@ -17,9 +17,7 @@ If you encounter abusive behavior violating the [Ansible Code of Conduct](https:
 ## Tested with Ansible
-Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13 releases and the current development version of ansible-core. Ansible-core versions before 2.11.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases.
+Tested with the current Ansible 2.9, ansible-base 2.10 and ansible-core 2.11 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported.
 Parts of this collection will not work with ansible-core 2.11 on Python 3.12+.
 ## External requirements
@@ -60,9 +58,7 @@ See [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_gui
 ## Contributing to this collection
-The content of this collection is made by good people just like you, a community of individuals collaborating on making the world better through developing automation software.
+The content of this collection is made by good people like you, a community of individuals collaborating on making the world better through developing automation software.
 We are actively accepting new contributors.
 All types of contributions are very welcome.
@@ -78,21 +74,7 @@ Also for some notes specific to this collection see [our CONTRIBUTING documentat
 See [here](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#testing-collections).
-## Collection maintenance
+### Communication
 To learn how to maintain / become a maintainer of this collection, refer to:
 * [Committer guidelines](https://github.com/ansible-collections/community.general/blob/main/commit-rights.md).
 * [Maintainer guidelines](https://github.com/ansible/community-docs/blob/main/maintaining.rst).
 It is necessary for maintainers of this collection to be subscribed to:
 * The collection itself (the `Watch` button → `All Activity` in the upper right corner of the repository's homepage).
 * The "Changes Impacting Collection Contributors and Maintainers" [issue](https://github.com/ansible-collections/overview/issues/45).
 They also should be subscribed to Ansible's [The Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn).
 ## Communication
 We announce important development changes and releases through Ansible's [The Bullhorn newsletter](https://eepurl.com/gZmiEP). If you are a collection developer, be sure you are subscribed.
@@ -102,21 +84,26 @@ We take part in the global quarterly [Ansible Contributor Summit](https://github
 For more information about communities, meetings and agendas see [Community Wiki](https://github.com/ansible/community/wiki/Community).
-For more information about communication, refer to Ansible's the [Communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
+For more information about communication, refer to the [Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
-## Publishing New Version
+### Publishing New Version
-See the [Releasing guidelines](https://github.com/ansible/community-docs/blob/main/releasing_collections.rst) to learn how to release this collection.
+Basic instructions without release branches:
 1. Create `changelogs/fragments/<version>.yml` with `release_summary:` section (which must be a string, not a list).
 2. Run `antsibull-changelog release --collection-flatmap yes`
 3. Make sure `CHANGELOG.rst` and `changelogs/changelog.yaml` are added to git, and the deleted fragments have been removed.
 4. Tag the commit with `<version>`. Push changes and tag to the main repository.
 ## Release notes
-See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-5/CHANGELOG.rst).
+See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-2/CHANGELOG.rst).
 ## Roadmap
-In general, we plan to release a major version every six months, and minor versions every two months. Major versions can contain breaking changes, while minor versions only contain new features and bugfixes.
+See [this issue](https://github.com/ansible-collections/community.general/issues/582) for information on releasing, versioning and deprecation.
-See [this issue](https://github.com/ansible-collections/community.general/issues/582) for information on releasing, versioning, and deprecation.
+In general, we plan to release a major version every six months, and minor versions every two months. Major versions can contain breaking changes, while minor versions only contain new features and bugfixes.
 ## More information
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
--- a/commit-rights.md
+++ b/commit-rights.md
@@ -68,7 +68,7 @@ Individuals who have been asked to become a part of this group have generally be
 | Name                | GitHub ID            | IRC Nick           | Other                |
 | ------------------- | -------------------- | ------------------ | -------------------- |
 | Alexei Znamensky    | russoz               | russoz             |                      |
 | Amin Vakil          | aminvakil            | aminvakil          |                      |
 | Andrew Klychkov     | andersson007         | andersson007_      |                      |
 | Andrew Pantuso      | Ajpantuso            | ajpantuso          |                      |
 | Felix Fontein       | felixfontein         | felixfontein       |                      |
 | John R Barker       | gundalow             | gundalow           |                      |
--- a/docs/docsite/extra-docs.yml
+++ b/docs/docsite/extra-docs.yml
@@ -1,6 +0,0 @@
 ---
 sections:
  - title: Guides
    toctree:
      - filter_guide
      - test_guide
--- a/docs/docsite/helper/lists_mergeby/default-common.yml
+++ b/docs/docsite/helper/lists_mergeby/default-common.yml
@@ -1,13 +0,0 @@
 list1:
  - name: foo
    extra: true
  - name: bar
    extra: false
  - name: meh
    extra: true
 list2:
  - name: foo
    path: /foo
  - name: baz
    path: /baz
--- a/docs/docsite/helper/lists_mergeby/default-recursive-true.yml
+++ b/docs/docsite/helper/lists_mergeby/default-recursive-true.yml
@@ -1,19 +0,0 @@
 list1:
  - name: myname01
    param01:
      x: default_value
      y: default_value
      list:
        - default_value
  - name: myname02
    param01: [1, 1, 2, 3]
 list2:
  - name: myname01
    param01:
      y: patch_value
      z: patch_value
      list:
        - patch_value
  - name: myname02
    param01: [3, 4, 4, {key: value}]
--- a/docs/docsite/helper/lists_mergeby/example-001.yml
+++ b/docs/docsite/helper/lists_mergeby/example-001.yml
@@ -1,10 +0,0 @@
 ---
 - name: 1. Merge two lists by common attribute 'name'
  include_vars:
    dir: example-001_vars
 - debug:
    var: list3
  when: debug|d(false)|bool
 - template:
    src: list3.out.j2
    dest: example-001.out
--- a/docs/docsite/helper/lists_mergeby/example-001_vars/default-common.yml
+++ b/docs/docsite/helper/lists_mergeby/example-001_vars/default-common.yml
@@ -1 +0,0 @@
 ../default-common.yml
--- a/docs/docsite/helper/lists_mergeby/example-001_vars/list3.yml
+++ b/docs/docsite/helper/lists_mergeby/example-001_vars/list3.yml
@@ -1,2 +0,0 @@
 list3: "{{ list1|
           community.general.lists_mergeby(list2, 'name') }}"
--- a/docs/docsite/helper/lists_mergeby/example-002.yml
+++ b/docs/docsite/helper/lists_mergeby/example-002.yml
@@ -1,10 +0,0 @@
 ---
 - name: 2. Merge two lists by common attribute 'name'
  include_vars:
    dir: example-002_vars
 - debug:
    var: list3
  when: debug|d(false)|bool
 - template:
    src: list3.out.j2
    dest: example-002.out
--- a/docs/docsite/helper/lists_mergeby/example-002_vars/default-common.yml
+++ b/docs/docsite/helper/lists_mergeby/example-002_vars/default-common.yml
@@ -1 +0,0 @@
 ../default-common.yml
--- a/docs/docsite/helper/lists_mergeby/example-002_vars/list3.yml
+++ b/docs/docsite/helper/lists_mergeby/example-002_vars/list3.yml
@@ -1,2 +0,0 @@
 list3: "{{ [list1, list2]|
           community.general.lists_mergeby('name') }}"
--- a/docs/docsite/helper/lists_mergeby/example-003.yml
+++ b/docs/docsite/helper/lists_mergeby/example-003.yml
@@ -1,10 +0,0 @@
 ---
 - name: 3. Merge recursive by 'name', replace lists (default)
  include_vars:
    dir: example-003_vars
 - debug:
    var: list3
  when: debug|d(false)|bool
 - template:
    src: list3.out.j2
    dest: example-003.out
--- a/docs/docsite/helper/lists_mergeby/example-003_vars/default-recursive-true.yml
+++ b/docs/docsite/helper/lists_mergeby/example-003_vars/default-recursive-true.yml
@@ -1 +0,0 @@
 ../default-recursive-true.yml
--- a/docs/docsite/helper/lists_mergeby/example-003_vars/list3.yml
+++ b/docs/docsite/helper/lists_mergeby/example-003_vars/list3.yml
@@ -1,3 +0,0 @@
 list3: "{{ [list1, list2]|
           community.general.lists_mergeby('name',
                                           recursive=true) }}"
--- a/docs/docsite/helper/lists_mergeby/example-004.yml
+++ b/docs/docsite/helper/lists_mergeby/example-004.yml
@@ -1,10 +0,0 @@
 ---
 - name: 4. Merge recursive by 'name', keep lists
  include_vars:
    dir: example-004_vars
 - debug:
    var: list3
  when: debug|d(false)|bool
 - template:
    src: list3.out.j2
    dest: example-004.out
--- a/docs/docsite/helper/lists_mergeby/example-004_vars/default-recursive-true.yml
+++ b/docs/docsite/helper/lists_mergeby/example-004_vars/default-recursive-true.yml
@@ -1 +0,0 @@
 ../default-recursive-true.yml
--- a/docs/docsite/helper/lists_mergeby/example-004_vars/list3.yml
+++ b/docs/docsite/helper/lists_mergeby/example-004_vars/list3.yml
@@ -1,4 +0,0 @@
 list3: "{{ [list1, list2]|
           community.general.lists_mergeby('name',
                                           recursive=true,
                                           list_merge='keep') }}"
--- a/docs/docsite/helper/lists_mergeby/example-005.yml
+++ b/docs/docsite/helper/lists_mergeby/example-005.yml
@@ -1,10 +0,0 @@
 ---
 - name: 5. Merge recursive by 'name', append lists
  include_vars:
    dir: example-005_vars
 - debug:
    var: list3
  when: debug|d(false)|bool
 - template:
    src: list3.out.j2
    dest: example-005.out
--- a/docs/docsite/helper/lists_mergeby/example-005_vars/default-recursive-true.yml
+++ b/docs/docsite/helper/lists_mergeby/example-005_vars/default-recursive-true.yml
@@ -1 +0,0 @@
 ../default-recursive-true.yml
--- a/docs/docsite/helper/lists_mergeby/example-005_vars/list3.yml
+++ b/docs/docsite/helper/lists_mergeby/example-005_vars/list3.yml
@@ -1,4 +0,0 @@
 list3: "{{ [list1, list2]|
           community.general.lists_mergeby('name',
                                           recursive=true,
                                           list_merge='append') }}"
--- a/docs/docsite/helper/lists_mergeby/example-006.yml
+++ b/docs/docsite/helper/lists_mergeby/example-006.yml
@@ -1,10 +0,0 @@
 ---
 - name: 6. Merge recursive by 'name', prepend lists
  include_vars:
    dir: example-006_vars
 - debug:
    var: list3
  when: debug|d(false)|bool
 - template:
    src: list3.out.j2
    dest: example-006.out
--- a/docs/docsite/helper/lists_mergeby/example-006_vars/default-recursive-true.yml
+++ b/docs/docsite/helper/lists_mergeby/example-006_vars/default-recursive-true.yml
@@ -1 +0,0 @@
 ../default-recursive-true.yml
--- a/docs/docsite/helper/lists_mergeby/example-006_vars/list3.yml
+++ b/docs/docsite/helper/lists_mergeby/example-006_vars/list3.yml
@@ -1,4 +0,0 @@
 list3: "{{ [list1, list2]|
           community.general.lists_mergeby('name',
                                           recursive=true,
                                           list_merge='prepend') }}"
--- a/docs/docsite/helper/lists_mergeby/example-007.yml
+++ b/docs/docsite/helper/lists_mergeby/example-007.yml
@@ -1,10 +0,0 @@
 ---
 - name: 7. Merge recursive by 'name', append lists 'remove present'
  include_vars:
    dir: example-007_vars
 - debug:
    var: list3
  when: debug|d(false)|bool
 - template:
    src: list3.out.j2
    dest: example-007.out
--- a/docs/docsite/helper/lists_mergeby/example-007_vars/default-recursive-true.yml
+++ b/docs/docsite/helper/lists_mergeby/example-007_vars/default-recursive-true.yml
@@ -1 +0,0 @@
 ../default-recursive-true.yml
--- a/docs/docsite/helper/lists_mergeby/example-007_vars/list3.yml
+++ b/docs/docsite/helper/lists_mergeby/example-007_vars/list3.yml
@@ -1,4 +0,0 @@
 list3: "{{ [list1, list2]|
           community.general.lists_mergeby('name',
                                           recursive=true,
                                           list_merge='append_rp') }}"
--- a/docs/docsite/helper/lists_mergeby/example-008.yml
+++ b/docs/docsite/helper/lists_mergeby/example-008.yml
@@ -1,10 +0,0 @@
 ---
 - name: 8. Merge recursive by 'name', prepend lists 'remove present'
  include_vars:
    dir: example-008_vars
 - debug:
    var: list3
  when: debug|d(false)|bool
 - template:
    src: list3.out.j2
    dest: example-008.out
--- a/docs/docsite/helper/lists_mergeby/example-008_vars/default-recursive-true.yml
+++ b/docs/docsite/helper/lists_mergeby/example-008_vars/default-recursive-true.yml
@@ -1 +0,0 @@
 ../default-recursive-true.yml
--- a/docs/docsite/helper/lists_mergeby/example-008_vars/list3.yml
+++ b/docs/docsite/helper/lists_mergeby/example-008_vars/list3.yml
@@ -1,4 +0,0 @@
 list3: "{{ [list1, list2]|
           community.general.lists_mergeby('name',
                                           recursive=true,
                                           list_merge='prepend_rp') }}"
--- a/docs/docsite/helper/lists_mergeby/examples.yml
+++ b/docs/docsite/helper/lists_mergeby/examples.yml
@@ -1,50 +0,0 @@
 ---
 examples:
  - label: 'In the example below the lists are merged by the attribute ``name``:'
    file: example-001_vars/list3.yml
    lang: 'yaml+jinja'
  - label: 'This produces:'
    file: example-001.out
    lang: 'yaml'
  - label: 'It is possible to use a list of lists as an input of the filter:'
    file: example-002_vars/list3.yml
    lang: 'yaml+jinja'
  - label: 'This produces the same result as in the previous example:'
    file: example-002.out
    lang: 'yaml'
  - label: 'Example ``list_merge=replace`` (default):'
    file: example-003_vars/list3.yml
    lang: 'yaml+jinja'
  - label: 'This produces:'
    file: example-003.out
    lang: 'yaml'
  - label: 'Example ``list_merge=keep``:'
    file: example-004_vars/list3.yml
    lang: 'yaml+jinja'
  - label: 'This produces:'
    file: example-004.out
    lang: 'yaml'
  - label: 'Example ``list_merge=append``:'
    file: example-005_vars/list3.yml
    lang: 'yaml+jinja'
  - label: 'This produces:'
    file: example-005.out
    lang: 'yaml'
  - label: 'Example ``list_merge=prepend``:'
    file: example-006_vars/list3.yml
    lang: 'yaml+jinja'
  - label: 'This produces:'
    file: example-006.out
    lang: 'yaml'
  - label: 'Example ``list_merge=append_rp``:'
    file: example-007_vars/list3.yml
    lang: 'yaml+jinja'
  - label: 'This produces:'
    file: example-007.out
    lang: 'yaml'
  - label: 'Example ``list_merge=prepend_rp``:'
    file: example-008_vars/list3.yml
    lang: 'yaml+jinja'
  - label: 'This produces:'
    file: example-008.out
    lang: 'yaml'
--- a/docs/docsite/helper/lists_mergeby/examples_all.rst.j2
+++ b/docs/docsite/helper/lists_mergeby/examples_all.rst.j2
@@ -1,8 +0,0 @@
 {% for i in examples %}
 {{ i.label }}
 .. code-block:: {{ i.lang }}
  {{ lookup('file', i.file)|indent(2) }}
 {% endfor %}
--- a/docs/docsite/helper/lists_mergeby/filter_guide_abstract_informations_merging_lists_of_dictionaries.rst.j2
+++ b/docs/docsite/helper/lists_mergeby/filter_guide_abstract_informations_merging_lists_of_dictionaries.rst.j2
@@ -1,57 +0,0 @@
 Merging lists of dictionaries
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 If you have two or more lists of dictionaries and want to combine them into a list of merged dictionaries, where the dictionaries are merged by an attribute, you can use the ``lists_mergeby`` filter.
 .. note:: The output of the examples in this section use the YAML callback plugin. Quoting: "Ansible output that can be quite a bit easier to read than the default JSON formatting." See :ref:`the documentation for the community.general.yaml callback plugin <ansible_collections.community.general.yaml_callback>`.
 Let us use the lists below in the following examples:
 .. code-block:: yaml
  {{ lookup('file', 'default-common.yml')|indent(2) }}
 {% for i in examples[0:2] %}
 {{ i.label }}
 .. code-block:: {{ i.lang }}
  {{ lookup('file', i.file)|indent(2) }}
 {% endfor %}
 .. versionadded:: 2.0.0
 {% for i in examples[2:4] %}
 {{ i.label }}
 .. code-block:: {{ i.lang }}
  {{ lookup('file', i.file)|indent(2) }}
 {% endfor %}
 The filter also accepts two optional parameters: ``recursive`` and ``list_merge``. These parameters are only supported when used with ansible-base 2.10 or ansible-core, but not with Ansible 2.9. This is available since community.general 4.4.0.
 **recursive**
    Is a boolean, default to ``False``. Should the ``community.general.lists_mergeby`` recursively merge nested hashes. Note: It does not depend on the value of the ``hash_behaviour`` setting in ``ansible.cfg``.
 **list_merge**
    Is a string, its possible values are ``replace`` (default), ``keep``, ``append``, ``prepend``, ``append_rp`` or ``prepend_rp``. It modifies the behaviour of ``community.general.lists_mergeby`` when the hashes to merge contain arrays/lists.
 The examples below set ``recursive=true`` and display the differences among all six options of ``list_merge``. Functionality of the parameters is exactly the same as in the filter ``combine``. See :ref:`Combining hashes/dictionaries <combine_filter>` to learn details about these options.
 Let us use the lists below in the following examples
 .. code-block:: yaml
  {{ lookup('file', 'default-recursive-true.yml')|indent(2) }}
 {% for i in examples[4:16] %}
 {{ i.label }}
 .. code-block:: {{ i.lang }}
  {{ lookup('file', i.file)|indent(2) }}
 {% endfor %}
--- a/docs/docsite/helper/lists_mergeby/list3.out.j2
+++ b/docs/docsite/helper/lists_mergeby/list3.out.j2
@@ -1,2 +0,0 @@
 list3:
 {{ list3|to_nice_yaml(indent=0) }}
--- a/docs/docsite/helper/lists_mergeby/playbook.yml
+++ b/docs/docsite/helper/lists_mergeby/playbook.yml
@@ -1,59 +0,0 @@
 ---
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # 1) Run all examples and create example-XXX.out
 # shell> ansible-playbook playbook.yml -e examples=true
 #
 # 2) Optionally, for testing, create examples_all.rst
 # shell> ansible-playbook playbook.yml -e examples_all=true
 #
 # 3) Create docs REST files
 # shell> ansible-playbook playbook.yml -e merging_lists_of_dictionaries=true
 #
 # Notes:
 # * Use YAML callback, e.g. set ANSIBLE_STDOUT_CALLBACK=community.general.yaml
 # * Use sphinx-view to render and review the REST files
 #   shell> sphinx-view <path_to_helper>/examples_all.rst
 # * Proofread and copy completed docs *.rst files into the directory rst.
 # * Then delete the *.rst and *.out files from this directory. Do not
 #   add *.rst and *.out in this directory to the version control.
 #
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # community.general/docs/docsite/helper/lists_mergeby/playbook.yml
 - hosts: localhost
  gather_facts: false
  tasks:
    - block:
        - import_tasks: example-001.yml
          tags: t001
        - import_tasks: example-002.yml
          tags: t002
        - import_tasks: example-003.yml
          tags: t003
        - import_tasks: example-004.yml
          tags: t004
        - import_tasks: example-005.yml
          tags: t005
        - import_tasks: example-006.yml
          tags: t006
        - import_tasks: example-007.yml
          tags: t007
        - import_tasks: example-008.yml
          tags: t008
      when: examples|d(false)|bool
    - block:
        - include_vars: examples.yml
        - template:
            src: examples_all.rst.j2
            dest: examples_all.rst
      when: examples_all|d(false)|bool
    - block:
        - include_vars: examples.yml
        - template:
            src: filter_guide_abstract_informations_merging_lists_of_dictionaries.rst.j2
            dest: filter_guide_abstract_informations_merging_lists_of_dictionaries.rst
      when: merging_lists_of_dictionaries|d(false)|bool
--- a/docs/docsite/links.yml
+++ b/docs/docsite/links.yml
@@ -1,23 +0,0 @@
 ---
 edit_on_github:
  repository: ansible-collections/community.general
  branch: main
  path_prefix: ''
 extra_links:
  - description: Submit a bug report
    url: https://github.com/ansible-collections/community.general/issues/new?assignees=&labels=&template=bug_report.yml
  - description: Request a feature
    url: https://github.com/ansible-collections/community.general/issues/new?assignees=&labels=&template=feature_request.yml
 communication:
  matrix_rooms:
    - topic: General usage and support questions
      room: '#users:ansible.im'
  irc_channels:
    - topic: General usage and support questions
      network: Libera
      channel: '#ansible'
  mailing_lists:
    - topic: Ansible Project List
      url: https://groups.google.com/g/ansible-project
--- a/docs/docsite/rst/filter_guide.rst
+++ b/docs/docsite/rst/filter_guide.rst
@@ -1,19 +0,0 @@
 .. _ansible_collections.community.general.docsite.filter_guide:
 community.general Filter Guide
 ==============================
 The :ref:`community.general collection <plugins_in_community.general>` offers several useful filter plugins.
 .. toctree::
   :maxdepth: 2
   filter_guide_paths
   filter_guide_abstract_informations
   filter_guide_working_with_times
   filter_guide_working_with_versions
   filter_guide_creating_identifiers
   filter_guide_conversions
   filter_guide_selecting_json_data
   filter_guide_working_with_unicode
--- a/docs/docsite/rst/filter_guide_abstract_informations.rst
+++ b/docs/docsite/rst/filter_guide_abstract_informations.rst
@@ -1,10 +0,0 @@
 Abstract transformations
 ------------------------
 .. toctree::
   :maxdepth: 1
   filter_guide_abstract_informations_dictionaries
   filter_guide_abstract_informations_grouping
   filter_guide_abstract_informations_merging_lists_of_dictionaries
   filter_guide_abstract_informations_counting_elements_in_sequence
--- a/docs/docsite/rst/filter_guide_abstract_informations_counting_elements_in_sequence.rst
+++ b/docs/docsite/rst/filter_guide_abstract_informations_counting_elements_in_sequence.rst
@@ -1,77 +0,0 @@
 Counting elements in a sequence
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The ``community.general.counter`` filter plugin allows you to count (hashable) elements in a sequence. Elements are returned as dictionary keys and their counts are stored as dictionary values.
 .. code-block:: yaml+jinja
    - name: Count character occurrences in a string
      debug:
        msg: "{{ 'abccbaabca' | community.general.counter }}"
    - name: Count items in a list
      debug:
        msg: "{{ ['car', 'car', 'bike', 'plane', 'bike'] | community.general.counter }}"
 This produces:
 .. code-block:: ansible-output
    TASK [Count character occurrences in a string] ********************************************
    ok: [localhost] => {
        "msg": {
            "a": 4,
            "b": 3,
            "c": 3
        }
    }
    TASK [Count items in a list] **************************************************************
    ok: [localhost] => {
        "msg": {
            "bike": 2,
            "car": 2,
            "plane": 1
        }
    }
 This plugin is useful for selecting resources based on current allocation:
 .. code-block:: yaml+jinja
    - name: Get ID of SCSI controller(s) with less than 4 disks attached and choose the one with the least disks
      debug:
        msg: >-
          {{
             ( disks | dict2items | map(attribute='value.adapter') | list
               | community.general.counter | dict2items
               | rejectattr('value', '>=', 4) | sort(attribute='value') | first
             ).key
          }}
      vars:
        disks:
          sda:
            adapter: scsi_1
          sdb:
            adapter: scsi_1
          sdc:
            adapter: scsi_1
          sdd:
            adapter: scsi_1
          sde:
            adapter: scsi_2
          sdf:
            adapter: scsi_3
          sdg:
            adapter: scsi_3
 This produces:
 .. code-block:: ansible-output
    TASK [Get ID of SCSI controller(s) with less than 4 disks attached and choose the one with the least disks]
    ok: [localhost] => {
        "msg": "scsi_2"
    }
 .. versionadded:: 4.3.0
--- a/docs/docsite/rst/filter_guide_abstract_informations_dictionaries.rst
+++ b/docs/docsite/rst/filter_guide_abstract_informations_dictionaries.rst
@@ -1,119 +0,0 @@
 Dictionaries
 ^^^^^^^^^^^^
 You can use the ``dict_kv`` filter to create a single-entry dictionary with ``value | community.general.dict_kv(key)``:
 .. code-block:: yaml+jinja
    - name: Create a single-entry dictionary
      debug:
        msg: "{{ myvar | community.general.dict_kv('thatsmyvar') }}"
      vars:
        myvar: myvalue
    - name: Create a list of dictionaries where the 'server' field is taken from a list
      debug:
        msg: >-
          {{ myservers | map('community.general.dict_kv', 'server')
                       | map('combine', common_config) }}
      vars:
        common_config:
          type: host
          database: all
        myservers:
        - server1
        - server2
 This produces:
 .. code-block:: ansible-output
    TASK [Create a single-entry dictionary]  **************************************************
    ok: [localhost] => {
        "msg": {
            "thatsmyvar": "myvalue"
        }
    }
    TASK [Create a list of dictionaries where the 'server' field is taken from a list]  *******
    ok: [localhost] => {
        "msg": [
            {
                "database": "all",
                "server": "server1",
                "type": "host"
            },
            {
                "database": "all",
                "server": "server2",
                "type": "host"
            }
        ]
    }
 .. versionadded:: 2.0.0
 If you need to convert a list of key-value pairs to a dictionary, you can use the ``dict`` function. Unfortunately, this function cannot be used with ``map``. For this, the ``community.general.dict`` filter can be used:
 .. code-block:: yaml+jinja
    - name: Create a dictionary with the dict function
      debug:
        msg: "{{ dict([[1, 2], ['a', 'b']]) }}"
    - name: Create a dictionary with the community.general.dict filter
      debug:
        msg: "{{ [[1, 2], ['a', 'b']] | community.general.dict }}"
    - name: Create a list of dictionaries with map and the community.general.dict filter
      debug:
        msg: >-
          {{ values | map('zip', ['k1', 'k2', 'k3'])
                    | map('map', 'reverse')
                    | map('community.general.dict') }}
      vars:
        values:
          - - foo
            - 23
            - a
          - - bar
            - 42
            - b
 This produces:
 .. code-block:: ansible-output
    TASK [Create a dictionary with the dict function]  ****************************************
    ok: [localhost] => {
        "msg": {
            "1": 2,
            "a": "b"
        }
    }
    TASK [Create a dictionary with the community.general.dict filter]  ************************
    ok: [localhost] => {
        "msg": {
            "1": 2,
            "a": "b"
        }
    }
    TASK [Create a list of dictionaries with map and the community.general.dict filter]  ******
    ok: [localhost] => {
        "msg": [
            {
                "k1": "foo",
                "k2": 23,
                "k3": "a"
            },
            {
                "k1": "bar",
                "k2": 42,
                "k3": "b"
            }
        ]
    }
 .. versionadded:: 3.0.0
--- a/docs/docsite/rst/filter_guide_abstract_informations_grouping.rst
+++ b/docs/docsite/rst/filter_guide_abstract_informations_grouping.rst
@@ -1,98 +0,0 @@
 Grouping
 ^^^^^^^^
 If you have a list of dictionaries, the Jinja2 ``groupby`` filter allows to group the list by an attribute. This results in a list of ``(grouper, list)`` namedtuples, where ``list`` contains all dictionaries where the selected attribute equals ``grouper``. If you know that for every ``grouper``, there will be a most one entry in that list, you can use the ``community.general.groupby_as_dict`` filter to convert the original list into a dictionary which maps ``grouper`` to the corresponding dictionary.
 One example is ``ansible_facts.mounts``, which is a list of dictionaries where each has one ``device`` element to indicate the device which is mounted. Therefore, ``ansible_facts.mounts | community.general.groupby_as_dict('device')`` is a dictionary mapping a device to the mount information:
 .. code-block:: yaml+jinja
    - name: Output mount facts grouped by device name
      debug:
        var: ansible_facts.mounts | community.general.groupby_as_dict('device')
    - name: Output mount facts grouped by mount point
      debug:
        var: ansible_facts.mounts | community.general.groupby_as_dict('mount')
 This produces:
 .. code-block:: ansible-output
    TASK [Output mount facts grouped by device name] ******************************************
    ok: [localhost] => {
        "ansible_facts.mounts | community.general.groupby_as_dict('device')": {
            "/dev/sda1": {
                "block_available": 2000,
                "block_size": 4096,
                "block_total": 2345,
                "block_used": 345,
                "device": "/dev/sda1",
                "fstype": "ext4",
                "inode_available": 500,
                "inode_total": 512,
                "inode_used": 12,
                "mount": "/boot",
                "options": "rw,relatime,data=ordered",
                "size_available": 56821,
                "size_total": 543210,
                "uuid": "ab31cade-d9c1-484d-8482-8a4cbee5241a"
            },
            "/dev/sda2": {
                "block_available": 1234,
                "block_size": 4096,
                "block_total": 12345,
                "block_used": 11111,
                "device": "/dev/sda2",
                "fstype": "ext4",
                "inode_available": 1111,
                "inode_total": 1234,
                "inode_used": 123,
                "mount": "/",
                "options": "rw,relatime",
                "size_available": 42143,
                "size_total": 543210,
                "uuid": "abcdef01-2345-6789-0abc-def012345678"
            }
        }
    }
    TASK [Output mount facts grouped by mount point] ******************************************
    ok: [localhost] => {
        "ansible_facts.mounts | community.general.groupby_as_dict('mount')": {
            "/": {
                "block_available": 1234,
                "block_size": 4096,
                "block_total": 12345,
                "block_used": 11111,
                "device": "/dev/sda2",
                "fstype": "ext4",
                "inode_available": 1111,
                "inode_total": 1234,
                "inode_used": 123,
                "mount": "/",
                "options": "rw,relatime",
                "size_available": 42143,
                "size_total": 543210,
                "uuid": "bdf50b7d-4859-40af-8665-c637ee7a7808"
            },
            "/boot": {
                "block_available": 2000,
                "block_size": 4096,
                "block_total": 2345,
                "block_used": 345,
                "device": "/dev/sda1",
                "fstype": "ext4",
                "inode_available": 500,
                "inode_total": 512,
                "inode_used": 12,
                "mount": "/boot",
                "options": "rw,relatime,data=ordered",
                "size_available": 56821,
                "size_total": 543210,
                "uuid": "ab31cade-d9c1-484d-8482-8a4cbee5241a"
            }
        }
    }
 .. versionadded: 3.0.0
--- a/docs/docsite/rst/filter_guide_abstract_informations_merging_lists_of_dictionaries.rst
+++ b/docs/docsite/rst/filter_guide_abstract_informations_merging_lists_of_dictionaries.rst
@@ -1,292 +0,0 @@
 Merging lists of dictionaries
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 If you have two or more lists of dictionaries and want to combine them into a list of merged dictionaries, where the dictionaries are merged by an attribute, you can use the ``lists_mergeby`` filter.
 .. note:: The output of the examples in this section use the YAML callback plugin. Quoting: "Ansible output that can be quite a bit easier to read than the default JSON formatting." See :ref:`the documentation for the community.general.yaml callback plugin <ansible_collections.community.general.yaml_callback>`.
 Let us use the lists below in the following examples:
 .. code-block:: yaml
  list1:
    - name: foo
      extra: true
    - name: bar
      extra: false
    - name: meh
      extra: true
  list2:
    - name: foo
      path: /foo
    - name: baz
      path: /baz
 In the example below the lists are merged by the attribute ``name``:
 .. code-block:: yaml+jinja
  list3: "{{ list1|
             community.general.lists_mergeby(list2, 'name') }}"
 This produces:
 .. code-block:: yaml
  list3:
  - extra: false
    name: bar
  - name: baz
    path: /baz
  - extra: true
    name: foo
    path: /foo
  - extra: true
    name: meh
 .. versionadded:: 2.0.0
 It is possible to use a list of lists as an input of the filter:
 .. code-block:: yaml+jinja
  list3: "{{ [list1, list2]|
             community.general.lists_mergeby('name') }}"
 This produces the same result as in the previous example:
 .. code-block:: yaml
  list3:
  - extra: false
    name: bar
  - name: baz
    path: /baz
  - extra: true
    name: foo
    path: /foo
  - extra: true
    name: meh
 The filter also accepts two optional parameters: ``recursive`` and ``list_merge``. These parameters are only supported when used with ansible-base 2.10 or ansible-core, but not with Ansible 2.9. This is available since community.general 4.4.0.
 **recursive**
    Is a boolean, default to ``False``. Should the ``community.general.lists_mergeby`` recursively merge nested hashes. Note: It does not depend on the value of the ``hash_behaviour`` setting in ``ansible.cfg``.
 **list_merge**
    Is a string, its possible values are ``replace`` (default), ``keep``, ``append``, ``prepend``, ``append_rp`` or ``prepend_rp``. It modifies the behaviour of ``community.general.lists_mergeby`` when the hashes to merge contain arrays/lists.
 The examples below set ``recursive=true`` and display the differences among all six options of ``list_merge``. Functionality of the parameters is exactly the same as in the filter ``combine``. See :ref:`Combining hashes/dictionaries <combine_filter>` to learn details about these options.
 Let us use the lists below in the following examples
 .. code-block:: yaml
  list1:
    - name: myname01
      param01:
        x: default_value
        y: default_value
        list:
          - default_value
    - name: myname02
      param01: [1, 1, 2, 3]
  list2:
    - name: myname01
      param01:
        y: patch_value
        z: patch_value
        list:
          - patch_value
    - name: myname02
      param01: [3, 4, 4, {key: value}]
 Example ``list_merge=replace`` (default):
 .. code-block:: yaml+jinja
  list3: "{{ [list1, list2]|
             community.general.lists_mergeby('name',
                                             recursive=true) }}"
 This produces:
 .. code-block:: yaml
  list3:
  - name: myname01
    param01:
      list:
      - patch_value
      x: default_value
      y: patch_value
      z: patch_value
  - name: myname02
    param01:
    - 3
    - 4
    - 4
    - key: value
 Example ``list_merge=keep``:
 .. code-block:: yaml+jinja
  list3: "{{ [list1, list2]|
             community.general.lists_mergeby('name',
                                             recursive=true,
                                             list_merge='keep') }}"
 This produces:
 .. code-block:: yaml
  list3:
  - name: myname01
    param01:
      list:
      - default_value
      x: default_value
      y: patch_value
      z: patch_value
  - name: myname02
    param01:
    - 1
    - 1
    - 2
    - 3
 Example ``list_merge=append``:
 .. code-block:: yaml+jinja
  list3: "{{ [list1, list2]|
             community.general.lists_mergeby('name',
                                             recursive=true,
                                             list_merge='append') }}"
 This produces:
 .. code-block:: yaml
  list3:
  - name: myname01
    param01:
      list:
      - default_value
      - patch_value
      x: default_value
      y: patch_value
      z: patch_value
  - name: myname02
    param01:
    - 1
    - 1
    - 2
    - 3
    - 3
    - 4
    - 4
    - key: value
 Example ``list_merge=prepend``:
 .. code-block:: yaml+jinja
  list3: "{{ [list1, list2]|
             community.general.lists_mergeby('name',
                                             recursive=true,
                                             list_merge='prepend') }}"
 This produces:
 .. code-block:: yaml
  list3:
  - name: myname01
    param01:
      list:
      - patch_value
      - default_value
      x: default_value
      y: patch_value
      z: patch_value
  - name: myname02
    param01:
    - 3
    - 4
    - 4
    - key: value
    - 1
    - 1
    - 2
    - 3
 Example ``list_merge=append_rp``:
 .. code-block:: yaml+jinja
  list3: "{{ [list1, list2]|
             community.general.lists_mergeby('name',
                                             recursive=true,
                                             list_merge='append_rp') }}"
 This produces:
 .. code-block:: yaml
  list3:
  - name: myname01
    param01:
      list:
      - default_value
      - patch_value
      x: default_value
      y: patch_value
      z: patch_value
  - name: myname02
    param01:
    - 1
    - 1
    - 2
    - 3
    - 4
    - 4
    - key: value
 Example ``list_merge=prepend_rp``:
 .. code-block:: yaml+jinja
  list3: "{{ [list1, list2]|
             community.general.lists_mergeby('name',
                                             recursive=true,
                                             list_merge='prepend_rp') }}"
 This produces:
 .. code-block:: yaml
  list3:
  - name: myname01
    param01:
      list:
      - patch_value
      - default_value
      x: default_value
      y: patch_value
      z: patch_value
  - name: myname02
    param01:
    - 3
    - 4
    - 4
    - key: value
    - 1
    - 1
    - 2
--- a/docs/docsite/rst/filter_guide_conversions.rst
+++ b/docs/docsite/rst/filter_guide_conversions.rst
@@ -1,108 +0,0 @@
 Conversions
 -----------
 Parsing CSV files
 ^^^^^^^^^^^^^^^^^
 Ansible offers the :ref:`community.general.read_csv module <ansible_collections.community.general.read_csv_module>` to read CSV files. Sometimes you need to convert strings to CSV files instead. For this, the ``from_csv`` filter exists.
 .. code-block:: yaml+jinja
    - name: "Parse CSV from string"
      debug:
        msg: "{{ csv_string | community.general.from_csv }}"
      vars:
        csv_string: |
          foo,bar,baz
          1,2,3
          you,this,then
 This produces:
 .. code-block:: ansible-output
    TASK [Parse CSV from string] **************************************************************
    ok: [localhost] => {
        "msg": [
            {
                "bar": "2",
                "baz": "3",
                "foo": "1"
            },
            {
                "bar": "this",
                "baz": "then",
                "foo": "you"
            }
        ]
    }
 The ``from_csv`` filter has several keyword arguments to control its behavior:
 :dialect: Dialect of the CSV file. Default is ``excel``. Other possible choices are ``excel-tab`` and ``unix``. If one of ``delimiter``, ``skipinitialspace`` or ``strict`` is specified, ``dialect`` is ignored.
 :fieldnames: A set of column names to use. If not provided, the first line of the CSV is assumed to contain the column names.
 :delimiter: Sets the delimiter to use. Default depends on the dialect used.
 :skipinitialspace: Set to ``true`` to ignore space directly after the delimiter. Default depends on the dialect used (usually ``false``).
 :strict: Set to ``true`` to error out on invalid CSV input.
 .. versionadded: 3.0.0
 Converting to JSON
 ^^^^^^^^^^^^^^^^^^
 `JC <https://pypi.org/project/jc/>`_ is a CLI tool and Python library which allows to interpret output of various CLI programs as JSON. It is also available as a filter in community.general. This filter needs the `jc Python library <https://pypi.org/project/jc/>`_ installed on the controller.
 .. code-block:: yaml+jinja
    - name: Run 'ls' to list files in /
      command: ls /
      register: result
    - name: Parse the ls output
      debug:
        msg: "{{ result.stdout | community.general.jc('ls') }}"
 This produces:
 .. code-block:: ansible-output
    TASK [Run 'ls' to list files in /] ********************************************************
    changed: [localhost]
    TASK [Parse the ls output] ****************************************************************
    ok: [localhost] => {
        "msg": [
            {
                "filename": "bin"
            },
            {
                "filename": "boot"
            },
            {
                "filename": "dev"
            },
            {
                "filename": "etc"
            },
            {
                "filename": "home"
            },
            {
                "filename": "lib"
            },
            {
                "filename": "proc"
            },
            {
                "filename": "root"
            },
            {
                "filename": "run"
            },
            {
                "filename": "tmp"
            }
        ]
    }
 .. versionadded: 2.0.0
--- a/docs/docsite/rst/filter_guide_creating_identifiers.rst
+++ b/docs/docsite/rst/filter_guide_creating_identifiers.rst
@@ -1,80 +0,0 @@
 Creating identifiers
 --------------------
 The following filters allow to create identifiers.
 Hashids
 ^^^^^^^
 `Hashids <https://hashids.org/>`_ allow to convert sequences of integers to short unique string identifiers. This filter needs the `hashids Python library <https://pypi.org/project/hashids/>`_ installed on the controller.
 .. code-block:: yaml+jinja
    - name: "Create hashid"
      debug:
        msg: "{{ [1234, 5, 6] | community.general.hashids_encode }}"
    - name: "Decode hashid"
      debug:
        msg: "{{ 'jm2Cytn' | community.general.hashids_decode }}"
 This produces:
 .. code-block:: ansible-output
    TASK [Create hashid] **********************************************************************
    ok: [localhost] => {
        "msg": "jm2Cytn"
    }
    TASK [Decode hashid] **********************************************************************
    ok: [localhost] => {
        "msg": [
            1234,
            5,
            6
        ]
    }
 The hashids filters accept keyword arguments to allow fine-tuning the hashids generated:
 :salt: String to use as salt when hashing.
 :alphabet: String of 16 or more unique characters to produce a hash.
 :min_length: Minimum length of hash produced.
 .. versionadded: 3.0.0
 Random MACs
 ^^^^^^^^^^^
 You can use the ``random_mac`` filter to complete a partial `MAC address <https://en.wikipedia.org/wiki/MAC_address>`_ to a random 6-byte MAC address.
 .. code-block:: yaml+jinja
    - name: "Create a random MAC starting with ff:"
      debug:
        msg: "{{ 'FF' | community.general.random_mac }}"
    - name: "Create a random MAC starting with 00:11:22:"
      debug:
        msg: "{{ '00:11:22' | community.general.random_mac }}"
 This produces:
 .. code-block:: ansible-output
    TASK [Create a random MAC starting with ff:] **********************************************
    ok: [localhost] => {
        "msg": "ff:69:d3:78:7f:b4"
    }
    TASK [Create a random MAC starting with 00:11:22:] ****************************************
    ok: [localhost] => {
        "msg": "00:11:22:71:5d:3b"
    }
 You can also initialize the random number generator from a seed to create random-but-idempotent MAC addresses:
 .. code-block:: yaml+jinja
    "{{ '52:54:00' | community.general.random_mac(seed=inventory_hostname) }}"
--- a/docs/docsite/rst/filter_guide_paths.rst
+++ b/docs/docsite/rst/filter_guide_paths.rst
@@ -1,14 +0,0 @@
 Paths
 -----
 The ``path_join`` filter has been added in ansible-base 2.10. If you want to use this filter, but also need to support Ansible 2.9, you can use ``community.general``'s ``path_join`` shim, ``community.general.path_join``. This filter redirects to ``path_join`` for ansible-base 2.10 and ansible-core 2.11 or newer, and re-implements the filter for Ansible 2.9.
 .. code-block:: yaml+jinja
    # ansible-base 2.10 or newer:
    path: {{ ('/etc', path, 'subdir', file) | path_join }}
    # Also works with Ansible 2.9:
    path: {{ ('/etc', path, 'subdir', file) | community.general.path_join }}
 .. versionadded:: 3.0.0
--- a/docs/docsite/rst/filter_guide_selecting_json_data.rst
+++ b/docs/docsite/rst/filter_guide_selecting_json_data.rst
@@ -1,144 +0,0 @@
 .. _ansible_collections.community.general.docsite.json_query_filter:
 Selecting JSON data: JSON queries
 ---------------------------------
 To select a single element or a data subset from a complex data structure in JSON format (for example, Ansible facts), use the ``json_query`` filter.  The ``json_query`` filter lets you query a complex JSON structure and iterate over it using a loop structure.
 .. note:: You must manually install the **jmespath** dependency on the Ansible controller before using this filter. This filter is built upon **jmespath**, and you can use the same syntax. For examples, see `jmespath examples <http://jmespath.org/examples.html>`_.
 Consider this data structure:
 .. code-block:: yaml+jinja
    {
        "domain_definition": {
            "domain": {
                "cluster": [
                    {
                        "name": "cluster1"
                    },
                    {
                        "name": "cluster2"
                    }
                ],
                "server": [
                    {
                        "name": "server11",
                        "cluster": "cluster1",
                        "port": "8080"
                    },
                    {
                        "name": "server12",
                        "cluster": "cluster1",
                        "port": "8090"
                    },
                    {
                        "name": "server21",
                        "cluster": "cluster2",
                        "port": "9080"
                    },
                    {
                        "name": "server22",
                        "cluster": "cluster2",
                        "port": "9090"
                    }
                ],
                "library": [
                    {
                        "name": "lib1",
                        "target": "cluster1"
                    },
                    {
                        "name": "lib2",
                        "target": "cluster2"
                    }
                ]
            }
        }
    }
 To extract all clusters from this structure, you can use the following query:
 .. code-block:: yaml+jinja
    - name: Display all cluster names
      ansible.builtin.debug:
        var: item
      loop: "{{ domain_definition | community.general.json_query('domain.cluster[*].name') }}"
 To extract all server names:
 .. code-block:: yaml+jinja
    - name: Display all server names
      ansible.builtin.debug:
        var: item
      loop: "{{ domain_definition | community.general.json_query('domain.server[*].name') }}"
 To extract ports from cluster1:
 .. code-block:: yaml+jinja
    - name: Display all ports from cluster1
      ansible.builtin.debug:
        var: item
      loop: "{{ domain_definition | community.general.json_query(server_name_cluster1_query) }}"
      vars:
        server_name_cluster1_query: "domain.server[?cluster=='cluster1'].port"
 .. note:: You can use a variable to make the query more readable.
 To print out the ports from cluster1 in a comma separated string:
 .. code-block:: yaml+jinja
    - name: Display all ports from cluster1 as a string
      ansible.builtin.debug:
        msg: "{{ domain_definition | community.general.json_query('domain.server[?cluster==`cluster1`].port') | join(', ') }}"
 .. note:: In the example above, quoting literals using backticks avoids escaping quotes and maintains readability.
 You can use YAML `single quote escaping <https://yaml.org/spec/current.html#id2534365>`_:
 .. code-block:: yaml+jinja
    - name: Display all ports from cluster1
      ansible.builtin.debug:
        var: item
      loop: "{{ domain_definition | community.general.json_query('domain.server[?cluster==''cluster1''].port') }}"
 .. note:: Escaping single quotes within single quotes in YAML is done by doubling the single quote.
 To get a hash map with all ports and names of a cluster:
 .. code-block:: yaml+jinja
    - name: Display all server ports and names from cluster1
      ansible.builtin.debug:
        var: item
      loop: "{{ domain_definition | community.general.json_query(server_name_cluster1_query) }}"
      vars:
        server_name_cluster1_query: "domain.server[?cluster=='cluster2'].{name: name, port: port}"
 To extract ports from all clusters with name starting with 'server1':
 .. code-block:: yaml+jinja
    - name: Display all ports from cluster1
      ansible.builtin.debug:
        msg: "{{ domain_definition | to_json | from_json | community.general.json_query(server_name_query) }}"
      vars:
        server_name_query: "domain.server[?starts_with(name,'server1')].port"
 To extract ports from all clusters with name containing 'server1':
 .. code-block:: yaml+jinja
    - name: Display all ports from cluster1
      ansible.builtin.debug:
        msg: "{{ domain_definition | to_json | from_json | community.general.json_query(server_name_query) }}"
      vars:
        server_name_query: "domain.server[?contains(name,'server1')].port"
 .. note:: while using ``starts_with`` and ``contains``, you have to use `` to_json | from_json `` filter for correct parsing of data structure.
--- a/docs/docsite/rst/filter_guide_working_with_times.rst
+++ b/docs/docsite/rst/filter_guide_working_with_times.rst
@@ -1,84 +0,0 @@
 Working with times
 ------------------
 The ``to_time_unit`` filter allows to convert times from a human-readable string to a unit. For example, ``'4h 30min 12second' | community.general.to_time_unit('hour')`` gives the number of hours that correspond to 4 hours, 30 minutes and 12 seconds.
 There are shorthands to directly convert to various units, like ``to_hours``, ``to_minutes``, ``to_seconds``, and so on. The following table lists all units that can be used:
 .. list-table:: Units
   :widths: 25 25 25 25
   :header-rows: 1
   * - Unit name
     - Unit value in seconds
     - Unit strings for filter
     - Shorthand filter
   * - Millisecond
     - 1/1000 second
     - ``ms``, ``millisecond``, ``milliseconds``, ``msec``, ``msecs``, ``msecond``, ``mseconds``
     - ``to_milliseconds``
   * - Second
     - 1 second
     - ``s``, ``sec``, ``secs``, ``second``, ``seconds``
     - ``to_seconds``
   * - Minute
     - 60 seconds
     - ``m``, ``min``, ``mins``, ``minute``, ``minutes``
     - ``to_minutes``
   * - Hour
     - 60*60 seconds
     - ``h``, ``hour``, ``hours``
     - ``to_hours``
   * - Day
     - 24*60*60 seconds
     - ``d``, ``day``, ``days``
     - ``to_days``
   * - Week
     - 7*24*60*60 seconds
     - ``w``, ``week``, ``weeks``
     - ``to_weeks``
   * - Month
     - 30*24*60*60 seconds
     - ``mo``, ``month``, ``months``
     - ``to_months``
   * - Year
     - 365*24*60*60 seconds
     - ``y``, ``year``, ``years``
     - ``to_years``
 Note that months and years are using a simplified representation: a month is 30 days, and a year is 365 days. If you need different definitions of months or years, you can pass them as keyword arguments. For example, if you want a year to be 365.25 days, and a month to be 30.5 days, you can write ``'11months 4' | community.general.to_years(year=365.25, month=30.5)``. These keyword arguments can be specified to ``to_time_unit`` and to all shorthand filters.
 .. code-block:: yaml+jinja
    - name: Convert string to seconds
      debug:
        msg: "{{ '30h 20m 10s 123ms' | community.general.to_time_unit('seconds') }}"
    - name: Convert string to hours
      debug:
        msg: "{{ '30h 20m 10s 123ms' | community.general.to_hours }}"
    - name: Convert string to years (using 365.25 days == 1 year)
      debug:
        msg: "{{ '400d 15h' | community.general.to_years(year=365.25) }}"
 This produces:
 .. code-block:: ansible-output
    TASK [Convert string to seconds] **********************************************************
    ok: [localhost] => {
        "msg": "109210.123"
    }
    TASK [Convert string to hours] ************************************************************
    ok: [localhost] => {
        "msg": "30.336145277778"
    }
    TASK [Convert string to years (using 365.25 days == 1 year)] ******************************
    ok: [localhost] => {
        "msg": "1.096851471595"
    }
 .. versionadded: 0.2.0
--- a/docs/docsite/rst/filter_guide_working_with_unicode.rst
+++ b/docs/docsite/rst/filter_guide_working_with_unicode.rst
@@ -1,30 +0,0 @@
 Working with Unicode
 ---------------------
 `Unicode <https://unicode.org/main.html>`_ makes it possible to produce two strings which may be visually equivalent, but are comprised of distinctly different characters/character sequences. To address this ``Unicode`` defines `normalization forms <https://unicode.org/reports/tr15/>`_ which avoid these distinctions by choosing a unique character sequence for a given visual representation.
 You can use the ``community.general.unicode_normalize`` filter to normalize ``Unicode`` strings within your playbooks.
 .. code-block:: yaml+jinja
    - name: Compare Unicode representations
      debug:
        msg: "{{ with_combining_character | community.general.unicode_normalize == without_combining_character }}"
      vars:
        with_combining_character: "{{ 'Mayagu\u0308ez' }}"
        without_combining_character: Mayagüez
 This produces:
 .. code-block:: ansible-output
    TASK [Compare Unicode representations] ********************************************************
    ok: [localhost] => {
        "msg": true
    }
 The ``community.general.unicode_normalize`` filter accepts a keyword argument to select the ``Unicode`` form used to normalize the input string.
 :form: One of ``'NFC'`` (default), ``'NFD'``, ``'NFKC'``, or ``'NFKD'``. See the `Unicode reference <https://unicode.org/reports/tr15/>`_ for more information.
 .. versionadded:: 3.7.0
--- a/docs/docsite/rst/filter_guide_working_with_versions.rst
+++ b/docs/docsite/rst/filter_guide_working_with_versions.rst
@@ -1,34 +0,0 @@
 Working with versions
 ---------------------
 If you need to sort a list of version numbers, the Jinja ``sort`` filter is problematic. Since it sorts lexicographically, ``2.10`` will come before ``2.9``. To treat version numbers correctly, you can use the ``version_sort`` filter:
 .. code-block:: yaml+jinja
    - name: Sort list by version number
      debug:
        var: ansible_versions | community.general.version_sort
      vars:
        ansible_versions:
          - '2.8.0'
          - '2.11.0'
          - '2.7.0'
          - '2.10.0'
          - '2.9.0'
 This produces:
 .. code-block:: ansible-output
    TASK [Sort list by version number] ********************************************************
    ok: [localhost] => {
        "ansible_versions | community.general.version_sort": [
            "2.7.0",
            "2.8.0",
            "2.9.0",
            "2.10.0",
            "2.11.0"
        ]
    }
 .. versionadded: 2.2.0
--- a/docs/docsite/rst/test_guide.rst
+++ b/docs/docsite/rst/test_guide.rst
@@ -1,28 +0,0 @@
 .. _ansible_collections.community.general.docsite.test_guide:
 community.general Test (Plugin) Guide
 =====================================
 The :ref:`community.general collection <plugins_in_community.general>` offers currently one test plugin.
 .. contents:: Topics
 Feature Tests
 -------------
 The ``a_module`` test allows to check whether a given string refers to an existing module or action plugin. This can be useful in roles, which can use this to ensure that required modules are present ahead of time.
 .. code-block:: yaml+jinja
    - name: Make sure that community.aws.route53 is available
      assert:
        that:
          - >
            'community.aws.route53' is community.general.a_module
    - name: Make sure that community.general.does_not_exist is not a module or action plugin
      assert:
        that:
          - "'community.general.does_not_exist' is not community.general.a_module"
 .. versionadded:: 4.0.0
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: community
 name: general
-version: 5.3.0
+version: 2.5.4
 readme: README.md
 authors:
  - Ansible (https://github.com/ansible)
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
--- a/plugins/action/iptables_state.py
+++ b/plugins/action/iptables_state.py
@@ -0,0 +1 @@
 ./system/iptables_state.py
--- a/plugins/action/shutdown.py
+++ b/plugins/action/shutdown.py
@@ -0,0 +1 @@
 ./system/shutdown.py
--- a/plugins/action/system/iptables_state.py
+++ b/plugins/action/system/iptables_state.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # Copyright: (c) 2020, quidame <quidame@poivron.org>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/action/system/shutdown.py
+++ b/plugins/action/system/shutdown.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # Copyright: (c) 2020, Amin Vakil <info@aminvakil.com>
 # Copyright: (c) 2016-2018, Matt Davis <mdavis@ansible.com>
 # Copyright: (c) 2018, Sam Doran <sdoran@redhat.com>
@@ -8,7 +7,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 from ansible.errors import AnsibleError, AnsibleConnectionFailure
-from ansible.module_utils.common.text.converters import to_native, to_text
+from ansible.module_utils._text import to_native, to_text
 from ansible.module_utils.common.collections import is_string
 from ansible.plugins.action import ActionBase
 from ansible.utils.display import Display
--- a/plugins/become/doas.py
+++ b/plugins/become/doas.py
@@ -9,7 +9,7 @@ DOCUMENTATION = '''
    short_description: Do As user
    description:
        - This become plugins allows your remote/login user to execute commands as another user via the doas utility.
-    author: Ansible Core Team
+    author: ansible (@core)
    options:
        become_user:
            description: User you 'become' to execute the task
@@ -81,7 +81,7 @@ DOCUMENTATION = '''
 import re
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.plugins.become import BecomeBase
--- a/plugins/become/dzdo.py
+++ b/plugins/become/dzdo.py
@@ -8,7 +8,7 @@ DOCUMENTATION = '''
    short_description: Centrify's Direct Authorize
    description:
        - This become plugins allows your remote/login user to execute commands as another user via the dzdo utility.
-    author: Ansible Core Team
+    author: ansible (@core)
    options:
        become_user:
            description: User you 'become' to execute the task
--- a/plugins/become/ksu.py
+++ b/plugins/become/ksu.py
@@ -9,7 +9,7 @@ DOCUMENTATION = '''
    short_description: Kerberos substitute user
    description:
        - This become plugins allows your remote/login user to execute commands as another user via the ksu utility.
-    author: Ansible Core Team
+    author: ansible (@core)
    options:
        become_user:
            description: User you 'become' to execute the task
@@ -82,7 +82,7 @@ DOCUMENTATION = '''
 import re
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.plugins.become import BecomeBase
--- a/plugins/become/machinectl.py
+++ b/plugins/become/machinectl.py
@@ -9,7 +9,7 @@ DOCUMENTATION = '''
    short_description: Systemd's machinectl privilege escalation
    description:
        - This become plugins allows your remote/login user to execute commands as another user via the machinectl utility.
-    author: Ansible Core Team
+    author: ansible (@core)
    options:
        become_user:
            description: User you 'become' to execute the task
@@ -66,46 +66,15 @@ DOCUMENTATION = '''
            ini:
              - section: machinectl_become_plugin
                key: password
    notes:
      - When not using this plugin with user C(root), it only works correctly with a polkit rule which will alter
        the behaviour of machinectl. This rule must alter the prompt behaviour to ask directly for the user credentials,
        if the user is allowed to perform the action (take a look at the examples section).
        If such a rule is not present the plugin only work if it is used in context with the root user,
        because then no further prompt will be shown by machinectl.
 '''
 EXAMPLES = r'''
 # A polkit rule needed to use the module with a non-root user.
 # See the Notes section for details.
 60-machinectl-fast-user-auth.rules: |
    polkit.addRule(function(action, subject) {
        if(action.id == "org.freedesktop.machine1.host-shell" && subject.isInGroup("wheel")) {
            return polkit.Result.AUTH_SELF_KEEP;
        }
    });
 '''
 from re import compile as re_compile
 from ansible.plugins.become import BecomeBase
 from ansible.module_utils._text import to_bytes
 ansi_color_codes = re_compile(to_bytes(r'\x1B\[[0-9;]+m'))
 class BecomeModule(BecomeBase):
    name = 'community.general.machinectl'
    prompt = 'Password: '
    fail = ('==== AUTHENTICATION FAILED ====',)
    success = ('==== AUTHENTICATION COMPLETE ====',)
    @staticmethod
    def remove_ansi_codes(line):
        return ansi_color_codes.sub(b"", line)
    def build_become_command(self, cmd, shell):
        super(BecomeModule, self).build_become_command(cmd, shell)
@@ -117,15 +86,3 @@ class BecomeModule(BecomeBase):
        flags = self.get_option('become_flags')
        user = self.get_option('become_user')
        return '%s -q shell %s %s@ %s' % (become, flags, user, cmd)
    def check_success(self, b_output):
        b_output = self.remove_ansi_codes(b_output)
        return super().check_success(b_output)
    def check_incorrect_password(self, b_output):
        b_output = self.remove_ansi_codes(b_output)
        return super().check_incorrect_password(b_output)
    def check_missing_password(self, b_output):
        b_output = self.remove_ansi_codes(b_output)
        return super().check_missing_password(b_output)
--- a/plugins/become/pbrun.py
+++ b/plugins/become/pbrun.py
@@ -9,7 +9,7 @@ DOCUMENTATION = '''
    short_description: PowerBroker run
    description:
        - This become plugins allows your remote/login user to execute commands as another user via the pbrun utility.
-    author: Ansible Core Team
+    author: ansible (@core)
    options:
        become_user:
            description: User you 'become' to execute the task
--- a/plugins/become/pfexec.py
+++ b/plugins/become/pfexec.py
@@ -9,7 +9,7 @@ DOCUMENTATION = '''
    short_description: profile based execution
    description:
        - This become plugins allows your remote/login user to execute commands as another user via the pfexec utility.
-    author: Ansible Core Team
+    author: ansible (@core)
    options:
        become_user:
            description:
--- a/plugins/become/pmrun.py
+++ b/plugins/become/pmrun.py
@@ -9,7 +9,7 @@ DOCUMENTATION = '''
    short_description: Privilege Manager run
    description:
        - This become plugins allows your remote/login user to execute commands as another user via the pmrun utility.
-    author: Ansible Core Team
+    author: ansible (@core)
    options:
        become_exe:
            description: Sudo executable
--- a/plugins/cache/memcached.py
+++ b/plugins/cache/memcached.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (c) 2014, Brian Coca, Josh Drake, et al
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -20,7 +19,6 @@ DOCUMENTATION = '''
          - List of connection information for the memcached DBs
        default: ['127.0.0.1:11211']
        type: list
        elements: string
        env:
          - name: ANSIBLE_CACHE_PLUGIN_CONNECTION
        ini:
@@ -155,12 +153,12 @@ class CacheModuleKeys(MutableSet):
    def __len__(self):
        return len(self._keyset)
-    def add(self, value):
+    def add(self, key):
-        self._keyset[value] = time.time()
+        self._keyset[key] = time.time()
        self._cache.set(self.PREFIX, self._keyset)
-    def discard(self, value):
+    def discard(self, key):
-        del self._keyset[value]
+        del self._keyset[key]
        self._cache.set(self.PREFIX, self._keyset)
    def remove_by_timerange(self, s_min, s_max):
@@ -176,11 +174,20 @@ class CacheModule(BaseCacheModule):
    def __init__(self, *args, **kwargs):
        connection = ['127.0.0.1:11211']
-        super(CacheModule, self).__init__(*args, **kwargs)
+        try:
-        if self.get_option('_uri'):
+            super(CacheModule, self).__init__(*args, **kwargs)
-            connection = self.get_option('_uri')
+            if self.get_option('_uri'):
-        self._timeout = self.get_option('_timeout')
+                connection = self.get_option('_uri')
-        self._prefix = self.get_option('_prefix')
+            self._timeout = self.get_option('_timeout')
            self._prefix = self.get_option('_prefix')
        except KeyError:
            # TODO: remove once we no longer support Ansible 2.9
            if not ansible_base_version.startswith('2.9.'):
                raise AnsibleError("Do not import CacheModules directly. Use ansible.plugins.loader.cache_loader instead.")
            if C.CACHE_PLUGIN_CONNECTION:
                connection = C.CACHE_PLUGIN_CONNECTION.split(',')
            self._timeout = C.CACHE_PLUGIN_TIMEOUT
            self._prefix = C.CACHE_PLUGIN_PREFIX
        if not HAS_MEMCACHE:
            raise AnsibleError("python-memcached is required for the memcached fact cache")
--- a/plugins/cache/pickle.py
+++ b/plugins/cache/pickle.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (c) 2017, Brian Coca
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/cache/redis.py
+++ b/plugins/cache/redis.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (c) 2014, Brian Coca, Josh Drake, et al
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -68,7 +67,7 @@ import json
 from ansible import constants as C
 from ansible.errors import AnsibleError
-from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils._text import to_native
 from ansible.parsing.ajson import AnsibleJSONEncoder, AnsibleJSONDecoder
 from ansible.plugins.cache import BaseCacheModule
 from ansible.release import __version__ as ansible_base_version
@@ -99,13 +98,23 @@ class CacheModule(BaseCacheModule):
    def __init__(self, *args, **kwargs):
        uri = ''
-        super(CacheModule, self).__init__(*args, **kwargs)
+        try:
-        if self.get_option('_uri'):
+            super(CacheModule, self).__init__(*args, **kwargs)
-            uri = self.get_option('_uri')
+            if self.get_option('_uri'):
-        self._timeout = float(self.get_option('_timeout'))
+                uri = self.get_option('_uri')
-        self._prefix = self.get_option('_prefix')
+            self._timeout = float(self.get_option('_timeout'))
-        self._keys_set = self.get_option('_keyset_name')
+            self._prefix = self.get_option('_prefix')
-        self._sentinel_service_name = self.get_option('_sentinel_service_name')
+            self._keys_set = self.get_option('_keyset_name')
            self._sentinel_service_name = self.get_option('_sentinel_service_name')
        except KeyError:
            # TODO: remove once we no longer support Ansible 2.9
            if not ansible_base_version.startswith('2.9.'):
                raise AnsibleError("Do not import CacheModules directly. Use ansible.plugins.loader.cache_loader instead.")
            if C.CACHE_PLUGIN_CONNECTION:
                uri = C.CACHE_PLUGIN_CONNECTION
            self._timeout = float(C.CACHE_PLUGIN_TIMEOUT)
            self._prefix = C.CACHE_PLUGIN_PREFIX
            self._keys_set = 'ansible_cache_keys'
        if not HAS_REDIS:
            raise AnsibleError("The 'redis' python module (version 2.4.5 or newer) is required for the redis fact cache, 'pip install redis'")
--- a/plugins/cache/yaml.py
+++ b/plugins/cache/yaml.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (c) 2017, Brian Coca
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/callback/context_demo.py
+++ b/plugins/callback/context_demo.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (C) 2012, Michael DeHaan, <michael.dehaan@gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/callback/counter_enabled.py
+++ b/plugins/callback/counter_enabled.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (c) 2018, Ivan Aragones Muniesa <ivan.aragones.muniesa@gmail.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 '''
@@ -45,8 +44,6 @@ class CallbackModule(CallbackBase):
    _task_total = 0
    _host_counter = 1
    _host_total = 0
    _current_batch_total = 0
    _previous_batch_total = 0
    def __init__(self):
        super(CallbackModule, self).__init__()
@@ -78,11 +75,8 @@ class CallbackModule(CallbackBase):
        self._display.banner(msg)
        self._play = play
        self._previous_batch_total = self._current_batch_total
        self._current_batch_total = self._previous_batch_total + len(self._all_vars()['vars']['ansible_play_batch'])
        self._host_total = len(self._all_vars()['vars']['ansible_play_hosts_all'])
        self._task_total = len(self._play.get_tasks()[0])
        self._task_counter = 1
    def v2_playbook_on_stats(self, stats):
        self._display.banner("PLAY RECAP")
@@ -150,7 +144,7 @@ class CallbackModule(CallbackBase):
            path = task.get_path()
            if path:
                self._display.display("task path: %s" % path, color=C.COLOR_DEBUG)
-        self._host_counter = self._previous_batch_total
+        self._host_counter = 0
        self._task_counter += 1
    def v2_runner_on_ok(self, result):
--- a/plugins/callback/dense.py
+++ b/plugins/callback/dense.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (c) 2016, Dag Wieers <dag@wieers.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/callback/diy.py
+++ b/plugins/callback/diy.py
@@ -792,7 +792,7 @@ from ansible.utils.color import colorize, hostcolor
 from ansible.template import Templar
 from ansible.vars.manager import VariableManager
 from ansible.plugins.callback.default import CallbackModule as Default
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._text import to_text
 class DummyStdout(object):
--- a/plugins/callback/elastic.py
+++ b/plugins/callback/elastic.py
@@ -1,423 +0,0 @@
 # (C) 2021, Victor Martinez <VictorMartinezRubio@gmail.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 DOCUMENTATION = '''
    author: Victor Martinez (@v1v)  <VictorMartinezRubio@gmail.com>
    name: elastic
    type: notification
    short_description: Create distributed traces for each Ansible task in Elastic APM
    version_added: 3.8.0
    description:
      - This callback creates distributed traces for each Ansible task in Elastic APM.
      - You can configure the plugin with environment variables.
      - See U(https://www.elastic.co/guide/en/apm/agent/python/current/configuration.html).
    options:
      hide_task_arguments:
        default: false
        type: bool
        description:
          - Hide the arguments for a task.
        env:
          - name: ANSIBLE_OPENTELEMETRY_HIDE_TASK_ARGUMENTS
      apm_service_name:
        default: ansible
        type: str
        description:
          - The service name resource attribute.
        env:
          - name: ELASTIC_APM_SERVICE_NAME
      apm_server_url:
        type: str
        description:
          - Use the APM server and its environment variables.
        env:
          - name: ELASTIC_APM_SERVER_URL
      apm_secret_token:
        type: str
        description:
          - Use the APM server token
        env:
          - name: ELASTIC_APM_SECRET_TOKEN
      apm_api_key:
        type: str
        description:
          - Use the APM API key
        env:
          - name: ELASTIC_APM_API_KEY
      apm_verify_server_cert:
        default: true
        type: bool
        description:
          - Verifies the SSL certificate if an HTTPS connection.
        env:
          - name: ELASTIC_APM_VERIFY_SERVER_CERT
      traceparent:
        type: str
        description:
          - The L(W3C Trace Context header traceparent,https://www.w3.org/TR/trace-context-1/#traceparent-header).
        env:
          - name: TRACEPARENT
    requirements:
      - elastic-apm (Python library)
 '''
 EXAMPLES = '''
 examples: |
  Enable the plugin in ansible.cfg:
    [defaults]
    callbacks_enabled = community.general.elastic
  Set the environment variable:
    export ELASTIC_APM_SERVER_URL=<your APM server URL)>
    export ELASTIC_APM_SERVICE_NAME=your_service_name
    export ELASTIC_APM_API_KEY=your_APM_API_KEY
 '''
 import getpass
 import socket
 import time
 import uuid
 from collections import OrderedDict
 from os.path import basename
 from ansible.errors import AnsibleError, AnsibleRuntimeError
 from ansible.module_utils.six import raise_from
 from ansible.plugins.callback import CallbackBase
 try:
    from elasticapm import Client, capture_span, trace_parent_from_string, instrument, label
 except ImportError as imp_exc:
    ELASTIC_LIBRARY_IMPORT_ERROR = imp_exc
 else:
    ELASTIC_LIBRARY_IMPORT_ERROR = None
 class TaskData:
    """
    Data about an individual task.
    """
    def __init__(self, uuid, name, path, play, action, args):
        self.uuid = uuid
        self.name = name
        self.path = path
        self.play = play
        self.host_data = OrderedDict()
        self.start = time.time()
        self.action = action
        self.args = args
    def add_host(self, host):
        if host.uuid in self.host_data:
            if host.status == 'included':
                # concatenate task include output from multiple items
                host.result = '%s\n%s' % (self.host_data[host.uuid].result, host.result)
            else:
                return
        self.host_data[host.uuid] = host
 class HostData:
    """
    Data about an individual host.
    """
    def __init__(self, uuid, name, status, result):
        self.uuid = uuid
        self.name = name
        self.status = status
        self.result = result
        self.finish = time.time()
 class ElasticSource(object):
    def __init__(self, display):
        self.ansible_playbook = ""
        self.ansible_version = None
        self.session = str(uuid.uuid4())
        self.host = socket.gethostname()
        try:
            self.ip_address = socket.gethostbyname(socket.gethostname())
        except Exception as e:
            self.ip_address = None
        self.user = getpass.getuser()
        self._display = display
    def start_task(self, tasks_data, hide_task_arguments, play_name, task):
        """ record the start of a task for one or more hosts """
        uuid = task._uuid
        if uuid in tasks_data:
            return
        name = task.get_name().strip()
        path = task.get_path()
        action = task.action
        args = None
        if not task.no_log and not hide_task_arguments:
            args = ', '.join(('%s=%s' % a for a in task.args.items()))
        tasks_data[uuid] = TaskData(uuid, name, path, play_name, action, args)
    def finish_task(self, tasks_data, status, result):
        """ record the results of a task for a single host """
        task_uuid = result._task._uuid
        if hasattr(result, '_host') and result._host is not None:
            host_uuid = result._host._uuid
            host_name = result._host.name
        else:
            host_uuid = 'include'
            host_name = 'include'
        task = tasks_data[task_uuid]
        if self.ansible_version is None and result._task_fields['args'].get('_ansible_version'):
            self.ansible_version = result._task_fields['args'].get('_ansible_version')
        task.add_host(HostData(host_uuid, host_name, status, result))
    def generate_distributed_traces(self, tasks_data, status, end_time, traceparent, apm_service_name,
                                    apm_server_url, apm_verify_server_cert, apm_secret_token, apm_api_key):
        """ generate distributed traces from the collected TaskData and HostData """
        tasks = []
        parent_start_time = None
        for task_uuid, task in tasks_data.items():
            if parent_start_time is None:
                parent_start_time = task.start
            tasks.append(task)
        apm_cli = self.init_apm_client(apm_server_url, apm_service_name, apm_verify_server_cert, apm_secret_token, apm_api_key)
        if apm_cli:
            instrument()  # Only call this once, as early as possible.
            if traceparent:
                parent = trace_parent_from_string(traceparent)
                apm_cli.begin_transaction("Session", trace_parent=parent, start=parent_start_time)
            else:
                apm_cli.begin_transaction("Session", start=parent_start_time)
            # Populate trace metadata attributes
            if self.ansible_version is not None:
                label(ansible_version=self.ansible_version)
            label(ansible_session=self.session, ansible_host_name=self.host, ansible_host_user=self.user)
            if self.ip_address is not None:
                label(ansible_host_ip=self.ip_address)
            for task_data in tasks:
                for host_uuid, host_data in task_data.host_data.items():
                    self.create_span_data(apm_cli, task_data, host_data)
            apm_cli.end_transaction(name=__name__, result=status, duration=end_time - parent_start_time)
    def create_span_data(self, apm_cli, task_data, host_data):
        """ create the span with the given TaskData and HostData """
        name = '[%s] %s: %s' % (host_data.name, task_data.play, task_data.name)
        message = "success"
        status = "success"
        enriched_error_message = None
        if host_data.status == 'included':
            rc = 0
        else:
            res = host_data.result._result
            rc = res.get('rc', 0)
            if host_data.status == 'failed':
                message = self.get_error_message(res)
                enriched_error_message = self.enrich_error_message(res)
                status = "failure"
            elif host_data.status == 'skipped':
                if 'skip_reason' in res:
                    message = res['skip_reason']
                else:
                    message = 'skipped'
                status = "unknown"
        with capture_span(task_data.name,
                          start=task_data.start,
                          span_type="ansible.task.run",
                          duration=host_data.finish - task_data.start,
                          labels={"ansible.task.args": task_data.args,
                                  "ansible.task.message": message,
                                  "ansible.task.module": task_data.action,
                                  "ansible.task.name": name,
                                  "ansible.task.result": rc,
                                  "ansible.task.host.name": host_data.name,
                                  "ansible.task.host.status": host_data.status}) as span:
            span.outcome = status
            if 'failure' in status:
                exception = AnsibleRuntimeError(message="{0}: {1} failed with error message {2}".format(task_data.action, name, enriched_error_message))
                apm_cli.capture_exception(exc_info=(type(exception), exception, exception.__traceback__), handled=True)
    def init_apm_client(self, apm_server_url, apm_service_name, apm_verify_server_cert, apm_secret_token, apm_api_key):
        if apm_server_url:
            return Client(service_name=apm_service_name,
                          server_url=apm_server_url,
                          verify_server_cert=False,
                          secret_token=apm_secret_token,
                          api_key=apm_api_key,
                          use_elastic_traceparent_header=True,
                          debug=True)
    @staticmethod
    def get_error_message(result):
        if result.get('exception') is not None:
            return ElasticSource._last_line(result['exception'])
        return result.get('msg', 'failed')
    @staticmethod
    def _last_line(text):
        lines = text.strip().split('\n')
        return lines[-1]
    @staticmethod
    def enrich_error_message(result):
        message = result.get('msg', 'failed')
        exception = result.get('exception')
        stderr = result.get('stderr')
        return ('message: "{0}"\nexception: "{1}"\nstderr: "{2}"').format(message, exception, stderr)
 class CallbackModule(CallbackBase):
    """
    This callback creates distributed traces with Elastic APM.
    """
    CALLBACK_VERSION = 2.0
    CALLBACK_TYPE = 'notification'
    CALLBACK_NAME = 'community.general.elastic'
    CALLBACK_NEEDS_ENABLED = True
    def __init__(self, display=None):
        super(CallbackModule, self).__init__(display=display)
        self.hide_task_arguments = None
        self.apm_service_name = None
        self.ansible_playbook = None
        self.traceparent = False
        self.play_name = None
        self.tasks_data = None
        self.errors = 0
        self.disabled = False
        if ELASTIC_LIBRARY_IMPORT_ERROR:
            raise_from(
                AnsibleError('The `elastic-apm` must be installed to use this plugin'),
                ELASTIC_LIBRARY_IMPORT_ERROR)
        self.tasks_data = OrderedDict()
        self.elastic = ElasticSource(display=self._display)
    def set_options(self, task_keys=None, var_options=None, direct=None):
        super(CallbackModule, self).set_options(task_keys=task_keys,
                                                var_options=var_options,
                                                direct=direct)
        self.hide_task_arguments = self.get_option('hide_task_arguments')
        self.apm_service_name = self.get_option('apm_service_name')
        if not self.apm_service_name:
            self.apm_service_name = 'ansible'
        self.apm_server_url = self.get_option('apm_server_url')
        self.apm_secret_token = self.get_option('apm_secret_token')
        self.apm_api_key = self.get_option('apm_api_key')
        self.apm_verify_server_cert = self.get_option('apm_verify_server_cert')
        self.traceparent = self.get_option('traceparent')
    def v2_playbook_on_start(self, playbook):
        self.ansible_playbook = basename(playbook._file_name)
    def v2_playbook_on_play_start(self, play):
        self.play_name = play.get_name()
    def v2_runner_on_no_hosts(self, task):
        self.elastic.start_task(
            self.tasks_data,
            self.hide_task_arguments,
            self.play_name,
            task
        )
    def v2_playbook_on_task_start(self, task, is_conditional):
        self.elastic.start_task(
            self.tasks_data,
            self.hide_task_arguments,
            self.play_name,
            task
        )
    def v2_playbook_on_cleanup_task_start(self, task):
        self.elastic.start_task(
            self.tasks_data,
            self.hide_task_arguments,
            self.play_name,
            task
        )
    def v2_playbook_on_handler_task_start(self, task):
        self.elastic.start_task(
            self.tasks_data,
            self.hide_task_arguments,
            self.play_name,
            task
        )
    def v2_runner_on_failed(self, result, ignore_errors=False):
        self.errors += 1
        self.elastic.finish_task(
            self.tasks_data,
            'failed',
            result
        )
    def v2_runner_on_ok(self, result):
        self.elastic.finish_task(
            self.tasks_data,
            'ok',
            result
        )
    def v2_runner_on_skipped(self, result):
        self.elastic.finish_task(
            self.tasks_data,
            'skipped',
            result
        )
    def v2_playbook_on_include(self, included_file):
        self.elastic.finish_task(
            self.tasks_data,
            'included',
            included_file
        )
    def v2_playbook_on_stats(self, stats):
        if self.errors == 0:
            status = "success"
        else:
            status = "failure"
        self.elastic.generate_distributed_traces(
            self.tasks_data,
            status,
            time.time(),
            self.traceparent,
            self.apm_service_name,
            self.apm_server_url,
            self.apm_verify_server_cert,
            self.apm_secret_token,
            self.apm_api_key
        )
    def v2_runner_on_async_failed(self, result, **kwargs):
        self.errors += 1
--- a/plugins/callback/hipchat.py
+++ b/plugins/callback/hipchat.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (C) 2014, Matt Martz <matt@sivel.net>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/callback/jabber.py
+++ b/plugins/callback/jabber.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2016 maxn nikolaev.makc@gmail.com
 # Copyright (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/plugins/callback/log_plays.py
+++ b/plugins/callback/log_plays.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (C) 2012, Michael DeHaan, <michael.dehaan@gmail.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -12,7 +11,7 @@ DOCUMENTATION = '''
    type: notification
    short_description: write playbook output to log file
    description:
-      - This callback writes playbook output to a file per host in the C(/var/log/ansible/hosts) directory
+      - This callback writes playbook output to a file per host in the `/var/log/ansible/hosts` directory
    requirements:
     - Whitelist in configuration
     - A writeable /var/log/ansible/hosts directory by the user executing Ansible on the controller
@@ -32,7 +31,7 @@ import time
 import json
 from ansible.utils.path import makedirs_safe
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.module_utils.common._collections_compat import MutableMapping
 from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase
--- a/plugins/callback/loganalytics.py
+++ b/plugins/callback/loganalytics.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 from __future__ import (absolute_import, division, print_function)
--- a/plugins/callback/logdna.py
+++ b/plugins/callback/logdna.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (c) 2018, Samir Musali <samir.musali@logdna.com>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -78,7 +77,7 @@ def get_mac():
 # Getting hostname of system:
 def get_hostname():
-    return str(socket.gethostname()).split('.local', 1)[0]
+    return str(socket.gethostname()).split('.local')[0]
 # Getting IP of system:
--- a/plugins/callback/logentries.py
+++ b/plugins/callback/logentries.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (c) 2015, Logentries.com, Jimmy Tang <jimmy.tang@logentries.com>
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -112,7 +111,7 @@ try:
 except ImportError:
    HAS_FLATDICT = False
-from ansible.module_utils.common.text.converters import to_bytes, to_text
+from ansible.module_utils._text import to_bytes, to_text
 from ansible.plugins.callback import CallbackBase
 # Todo:
--- a/plugins/callback/logstash.py
+++ b/plugins/callback/logstash.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (C) 2020, Yevhen Khmelenko <ujenmr@gmail.com>
 # (C) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
@@ -45,7 +44,7 @@ DOCUMENTATION = r'''
            version_added: 1.0.0
        default: ansible
      pre_command:
-        description: Executes command before run and its result is added to the C(ansible_pre_command_output) logstash field.
+        description: Executes command before run and result put to ansible_pre_command_output field.
        version_added: 2.0.0
        ini:
          - section: callback_logstash
@@ -94,7 +93,6 @@ ansible.cfg: |
 import os
 import json
 from ansible import context
 import socket
 import uuid
 import logging
@@ -153,11 +151,11 @@ class CallbackModule(CallbackBase):
                self.base_data['ansible_pre_command_output'] = os.popen(
                    self.ls_pre_command).read()
-            if context.CLIARGS is not None:
+            if self._options is not None:
-                self.base_data['ansible_checkmode'] = context.CLIARGS.get('check')
+                self.base_data['ansible_checkmode'] = self._options.check
-                self.base_data['ansible_tags'] = context.CLIARGS.get('tags')
+                self.base_data['ansible_tags'] = self._options.tags
-                self.base_data['ansible_skip_tags'] = context.CLIARGS.get('skip_tags')
+                self.base_data['ansible_skip_tags'] = self._options.skip_tags
-                self.base_data['inventory'] = context.CLIARGS.get('inventory')
+                self.base_data['inventory'] = self._options.inventory
    def set_options(self, task_keys=None, var_options=None, direct=None):
        super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)
--- a/plugins/callback/mail.py
+++ b/plugins/callback/mail.py
@@ -11,16 +11,14 @@ name: mail
 type: notification
 short_description: Sends failure events via email
 description:
- This callback will report failures via email.
+- This callback will report failures via email
 author:
 - Dag Wieers (@dagwieers)
 requirements:
 - whitelisting in configuration
 options:
  mta:
-    description:
+    description: Mail Transfer Agent, server that accepts SMTP
        - Mail Transfer Agent, server that accepts SMTP.
    type: str
    env:
        - name: SMTPHOST
    ini:
@@ -28,57 +26,43 @@ options:
          key: smtphost
    default: localhost
  mtaport:
-    description:
+    description: Mail Transfer Agent Port, port at which server SMTP
        - Mail Transfer Agent Port.
        - Port at which server SMTP.
    type: int
    ini:
        - section: callback_mail
          key: smtpport
    default: 25
  to:
-    description:
+    description: Mail recipient
        - Mail recipient.
    type: list
    elements: str
    ini:
        - section: callback_mail
          key: to
-    default: [root]
+    default: root
  sender:
-    description:
+    description: Mail sender
        - Mail sender.
        - Note that this will be required from community.general 6.0.0 on.
    type: str
    ini:
        - section: callback_mail
          key: sender
  cc:
-    description:
+    description: CC'd recipient
        - CC'd recipients.
    type: list
    elements: str
    ini:
        - section: callback_mail
          key: cc
  bcc:
-    description:
+    description: BCC'd recipient
        - BCC'd recipients.
    type: list
    elements: str
    ini:
        - section: callback_mail
          key: bcc
 notes:
 - "TODO: expand configuration options now that plugins can leverage Ansible's configuration"
 '''
 import json
 import os
 import re
 import email.utils
 import smtplib
 from ansible.module_utils.six import string_types
-from ansible.module_utils.common.text.converters import to_bytes
+from ansible.module_utils._text import to_bytes
 from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase
@@ -104,13 +88,9 @@ class CallbackModule(CallbackBase):
        super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)
        self.sender = self.get_option('sender')
        if self.sender is None:
            self._display.deprecated(
                'The sender for the mail callback has not been specified. This will be an error in the future',
                version='6.0.0', collection_name='community.general')
        self.to = self.get_option('to')
        self.smtphost = self.get_option('mta')
-        self.smtpport = self.get_option('mtaport')
+        self.smtpport = int(self.get_option('mtaport'))
        self.cc = self.get_option('cc')
        self.bcc = self.get_option('bcc')
@@ -120,34 +100,28 @@ class CallbackModule(CallbackBase):
        smtp = smtplib.SMTP(self.smtphost, port=self.smtpport)
-        sender_address = email.utils.parseaddr(self.sender)
+        b_sender = to_bytes(self.sender)
-        if self.to:
+        b_to = to_bytes(self.to)
-            to_addresses = email.utils.getaddresses(self.to)
+        b_cc = to_bytes(self.cc)
        b_bcc = to_bytes(self.bcc)
        b_subject = to_bytes(subject)
        b_body = to_bytes(body)
        b_content = b'From: %s\n' % b_sender
        b_content += b'To: %s\n' % b_to
        if self.cc:
-            cc_addresses = email.utils.getaddresses(self.cc)
+            b_content += b'Cc: %s\n' % b_cc
        b_content += b'Subject: %s\n\n' % b_subject
        b_content += b_body
        b_addresses = b_to.split(b',')
        if self.cc:
            b_addresses += b_cc.split(b',')
        if self.bcc:
-            bcc_addresses = email.utils.getaddresses(self.bcc)
+            b_addresses += b_bcc.split(b',')
-        content = 'Date: %s\n' % email.utils.formatdate()
+        for b_address in b_addresses:
-        content += 'From: %s\n' % email.utils.formataddr(sender_address)
+            smtp.sendmail(b_sender, b_address, b_content)
        if self.to:
            content += 'To: %s\n' % ', '.join([email.utils.formataddr(pair) for pair in to_addresses])
        if self.cc:
            content += 'Cc: %s\n' % ', '.join([email.utils.formataddr(pair) for pair in cc_addresses])
        content += 'Message-ID: %s\n' % email.utils.make_msgid()
        content += 'Subject: %s\n\n' % subject.strip()
        content += body
        addresses = to_addresses
        if self.cc:
            addresses += cc_addresses
        if self.bcc:
            addresses += bcc_addresses
        if not addresses:
            self._display.warning('No receiver has been specified for the mail callback plugin.')
        smtp.sendmail(self.sender, [address for name, address in addresses], to_bytes(content))
        smtp.quit()
--- a/plugins/callback/nrdp.py
+++ b/plugins/callback/nrdp.py
@@ -10,23 +10,22 @@ DOCUMENTATION = '''
    name: nrdp
    type: notification
    author: "Remi VERCHERE (@rverchere)"
-    short_description: Post task results to a Nagios server through nrdp
+    short_description: post task result to a nagios server through nrdp
    description:
-        - This callback send playbook result to Nagios.
+        - this callback send playbook result to nagios
-        - Nagios shall use NRDP to recive passive events.
+        - nagios shall use NRDP to recive passive events
-        - The passive check is sent to a dedicated host/service for Ansible.
+        - the passive check is sent to a dedicated host/service for ansible
    options:
        url:
-            description: URL of the nrdp server.
+            description: url of the nrdp server
-            required: true
+            required: True
            env:
                - name : NRDP_URL
            ini:
                - section: callback_nrdp
                  key: url
            type: string
        validate_certs:
-            description: Validate the SSL certificate of the nrdp server. (Used for HTTPS URLs.)
+            description: (bool) validate the SSL certificate of the nrdp server. (For HTTPS url)
            env:
                - name: NRDP_VALIDATE_CERTS
            ini:
@@ -34,43 +33,38 @@ DOCUMENTATION = '''
                  key: validate_nrdp_certs
                - section: callback_nrdp
                  key: validate_certs
-            type: boolean
+            default: False
            default: false
            aliases: [ validate_nrdp_certs ]
        token:
-            description: Token to be allowed to push nrdp events.
+            description: token to be allowed to push nrdp events
-            required: true
+            required: True
            env:
                - name: NRDP_TOKEN
            ini:
                - section: callback_nrdp
                  key: token
            type: string
        hostname:
-            description: Hostname where the passive check is linked to.
+            description: hostname where the passive check is linked to
-            required: true
+            required: True
            env:
                - name : NRDP_HOSTNAME
            ini:
                - section: callback_nrdp
                  key: hostname
            type: string
        servicename:
-            description: Service where the passive check is linked to.
+            description: service where the passive check is linked to
-            required: true
+            required: True
            env:
                - name : NRDP_SERVICENAME
            ini:
                - section: callback_nrdp
                  key: servicename
            type: string
 '''
 import os
 import json
 from ansible.module_utils.six.moves.urllib.parse import urlencode
 from ansible.module_utils.common.text.converters import to_bytes
 from ansible.module_utils.urls import open_url
 from ansible.plugins.callback import CallbackBase
@@ -144,7 +138,7 @@ class CallbackModule(CallbackBase):
        body = {
            'cmd': 'submitcheck',
            'token': self.token,
-            'XMLDATA': to_bytes(xmldata)
+            'XMLDATA': bytes(xmldata)
        }
        try:
--- a/plugins/callback/null.py
+++ b/plugins/callback/null.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # (c) 2017 Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
--- a/Show More
+++ b/Show More
		`@@ -1,2 +0,0 @@`
			`list3: "{{ list1\|`
			`community.general.lists_mergeby(list2, 'name') }}"`
		`@@ -1,2 +0,0 @@`
			`list3: "{{ [list1, list2]\|`
			`community.general.lists_mergeby('name') }}"`
		`@@ -1,2 +0,0 @@`
			`list3:`
			`{{ list3\|to_nice_yaml(indent=0) }}`