Ubuntu image update

.ansible-lint-ignore

@@ -0,0 +1,2 @@
+# This file contains ignores rule violations for ansible-lint
+roles/agent/tasks/start.yml schema[tasks]

.circleci/config.yml

@@ -8,14 +8,23 @@ workflows:
           matrix: &matrix
             parameters:
               # ansible is branch name in ansible/ansible git repo
-              ansible:
-                - stable-2.9
-                - stable-2.10
-                - stable-2.11
-                - stable-2.12
-                - stable-2.13
-                - stable-2.14
-
+              ansible: ["stable-2.9", "stable-2.10", "stable-2.11", "stable-2.12", "stable-2.13", "stable-2.14", "stable-2.15"]
+              image_ubuntu: ["ubuntu-2004:202101-01", "ubuntu-2204:2023.07.2"]
+            exclude:
+              - ansible: "stable-2.9"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.10"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.11"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.12"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.13"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.14"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.15"
+                image_ubuntu: "ubuntu-2004:202101-01"
 
       - unit_test:
           matrix: *matrix
@@ -24,13 +33,51 @@ workflows:
           requires:
             - sanity_test
             - unit_test
-          matrix: *matrix
+          matrix:
+            parameters:
+              # ansible is branch name in ansible/ansible git repo
+              ansible: ["stable-2.9", "stable-2.10", "stable-2.11", "stable-2.12", "stable-2.13", "stable-2.14", "stable-2.15"]
+              image_ubuntu: ["ubuntu-2004:202101-01", "ubuntu-2204:2023.07.2"]
+            exclude:
+              - ansible: "stable-2.9"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.10"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.11"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.12"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.13"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.14"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.15"
+                image_ubuntu: "ubuntu-2004:202101-01"
 
       - integration_test_galaxy:
           filters: { branches: { only: [ stable ] } }
           requires:
             - integration_test_git
-          matrix: *matrix
+          matrix:
+            parameters:
+              # ansible is branch name in ansible/ansible git repo
+              ansible: ["stable-2.9", "stable-2.10", "stable-2.11", "stable-2.12", "stable-2.13", "stable-2.14", "stable-2.15"]
+              image_ubuntu: ["ubuntu-2004:202101-01", "ubuntu-2204:2023.07.2"]
+            exclude:
+              - ansible: "stable-2.9"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.10"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.11"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.12"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.13"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.14"
+                image_ubuntu: "ubuntu-2204:2023.07.2"
+              - ansible: "stable-2.15"
+                image_ubuntu: "ubuntu-2004:202101-01"
 
   cron_master:
     triggers:
@@ -56,17 +103,18 @@ workflows:
           cron: "12 5 * * 2,5"
           filters: { branches: { only: [ master ] } }
     jobs:
-      - sanity_test:
+      - sanity_test_devel:
           matrix: &devel-matrix
             parameters:
               ansible: [ devel ]
+              image_ubuntu: [ "ubuntu-2204:2023.07.2" ]
 
       - unit_test:
           matrix: *devel-matrix
 
       - integration_test_git:
           requires:
-            - sanity_test
+            - sanity_test_devel
             - unit_test
           matrix: *devel-matrix
 
@@ -84,8 +132,11 @@ jobs:
       ansible:
         description: Ansible version to use
         type: string
+      image_ubuntu: 
+        description: Ubuntu image
+        type: string
     machine: &ci-machine
-      image: ubuntu-2004:202101-01
+      image: << parameters.image_ubuntu >>
     working_directory: ~/ansible_collections/sensu/sensu_go
     steps:
       - wrapper:
@@ -94,11 +145,36 @@ jobs:
           test_commands:
             - run: make sanity
 
+  sanity_test_devel:
+    parameters:
+      ansible:
+        description: Ansible version to use
+        type: string
+      image_ubuntu: 
+        description: Ubuntu image
+        type: string
+    machine: *ci-machine
+    working_directory: ~/ansible_collections/sensu/sensu_go
+    steps:
+      - wrapper:
+          ansible: << parameters.ansible >>
+          kind: sanity
+          test_commands:
+            - run: pip3 install -r sanity.requirements -r collection.requirements
+            - run: python3 --version
+            - run: ansible --version
+            # ansible-lint can't find roles for some reason;
+            # pylint inside ansible-test finds them ...
+            - run: ansible-test sanity
+
   unit_test:
     parameters:
       ansible:
         description: Ansible version to use
         type: string
+      image_ubuntu:
+        description: Ubuntu image
+        type: string
     machine: *ci-machine
     working_directory: ~/ansible_collections/sensu/sensu_go
     steps:
@@ -119,9 +195,17 @@ jobs:
       ansible:
         description: Ansible version to use
         type: string
+      image_ubuntu:
+        description: Ubuntu image
+        type: string
     machine: *ci-machine
     working_directory: ~/sensu_go
     steps:
+      - run:
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y dbus
+          #  service dbus start  # Start D-Bus service
       - wrapper:
           ansible: << parameters.ansible >>
           kind: integration
@@ -136,6 +220,9 @@ jobs:
       ansible:
         description: Ansible version to use
         type: string
+      image_ubuntu:
+        description: Ubuntu image
+        type: string
     machine: *ci-machine
     working_directory: ~/sensu_go
     steps:

docker/centos-7.docker

@@ -18,6 +18,7 @@ RUN ( \
     /usr/bin/python /usr/bin/python2-config sudo \
     yum-plugin-ovl bash iproute; \
   sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf; \
+  yum -y update systemd; \
   yum clean all; \
   chmod 777 /root;
 

integration.requirements

@@ -1,4 +1,5 @@
-molecule ~= 5.0.1
+molecule ~= 6.0.1; python_version >= "3.10"
+molecule ~= 5.0.1; python_version < "3.10"
 molecule-docker ~= 2.1.0
 pytest
 pytest-molecule ~= 2.0.0

plugins/modules/datastore.py

@@ -43,6 +43,7 @@
       - The maximum number of connections to hold in the PostgreSQL connection
         pool.
     type: int
+    default: 0
   max_conn_lifetime:
     description:
       - Maximum time a connection can persist before being destroyed.

roles/agent/handlers/main.yml

@@ -1,13 +1,13 @@
 ---
 - name: Restart Linux agent
-  service:
+  ansible.builtin.service:
     name: sensu-agent
     state: restarted
   when: manage_sensu_agent_service | default(False)
 
 - name: Restart Windows agent
   action:
-    module: win_service
+    module: ansible.windows.win_service
     name: SensuAgent
     state: restarted
   when: manage_sensu_agent_service | default(False)

roles/agent/tasks/configure.yml

@@ -1,8 +1,8 @@
 ---
 - name: Configure agent (Linux)
-  include_tasks: linux/configure.yml
+  ansible.builtin.include_tasks: linux/configure.yml
   when: ansible_facts.os_family != "Windows"
 
 - name: Configure agent (Windows)
-  include_tasks: windows/configure.yml
+  ansible.builtin.include_tasks: windows/configure.yml
   when: ansible_facts.os_family == "Windows"

roles/agent/tasks/linux/configure.yml

@@ -1,9 +1,9 @@
 ---
 - name: Load Linux locations
-  include_vars: linux.yml
+  ansible.builtin.include_vars: linux.yml
 
 - name: Install agent communication PKI
-  copy:
+  ansible.builtin.copy:
     src: "{{ agent_trusted_ca_file }}"
     dest: "{{ trusted_ca_file_path }}"
     # Keep this in sync with what the backend service is running as from packager
@@ -13,7 +13,7 @@
   when: agent_trusted_ca_file is defined
 
 - name: Configure sensu-agent ({{ agent_config_path }})
-  template:
+  ansible.builtin.template:
     src: agent.yml.j2
     dest: "{{ agent_config_path }}"
     owner: *sensu_user

roles/agent/tasks/main.yml

@@ -1,16 +1,16 @@
 ---
 - name: Install sensu-go-agent binary
-  include_role:
+  ansible.builtin.include_role:
     name: install
   vars:
-    components: [sensu-go-agent]
+    components: [sensu-go-agent] # noqa: var-naming[no-role-prefix]
 
 - name: Inform restart handler that we are in charge of the agent service
-  set_fact:
+  ansible.builtin.set_fact:
     manage_sensu_agent_service: true
 
 - name: Configure the agent
-  include_tasks: configure.yml
+  ansible.builtin.include_tasks: configure.yml
 
 - name: Start the agent
-  include_tasks: start.yml
+  ansible.builtin.include_tasks: start.yml

roles/agent/tasks/start.yml

@@ -1,14 +1,14 @@
 ---
 - name: Start sensu-agent (Linux)
-  service:
+  ansible.builtin.service:
     name: sensu-agent
     state: started
     enabled: true
   when: ansible_facts.os_family != "Windows"
 
 - name: Start sensu-agent (Windows)
   action:
-    module: win_service
+    module: ansible.windows.win_service
     name: SensuAgent
     path: C:\Program Files\sensu\sensu-agent\bin\sensu-agent.exe service run
     state: started

roles/agent/tasks/windows/configure.yml

@@ -1,15 +1,15 @@
 ---
 - name: Load Windows locations
-  include_vars: windows.yml
+  ansible.builtin.include_vars: windows.yml
 
 - name: Install agent communication PKI
-  win_copy:
+  ansible.windows.win_copy:
     src: "{{ agent_trusted_ca_file }}"
     dest: "{{ trusted_ca_file_path }}"
   when: agent_trusted_ca_file is defined
 
 - name: Configure sensu-agent ({{ agent_config_path }})
-  win_template:
+  ansible.windows.win_template:
     src: agent.yml.j2
     dest: "{{ agent_config_path }}"
   notify: Restart Windows agent

roles/backend/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: Restart backend
-  service:
+  ansible.builtin.service:
     name: sensu-backend
     state: restarted
   when: manage_sensu_backend_service | default(False)

roles/backend/tasks/configure.yml

@@ -1,6 +1,6 @@
 ---
 - name: Install etcd communication PKI
-  copy:
+  ansible.builtin.copy:
     src: "{{ item.source }}"
     dest: "/etc/sensu/{{ item.filename }}"
     # Keep this in sync with what the backend service is running as from packager
@@ -27,7 +27,7 @@
         etcd_peer_key_file is defined
 
 - name: Install API communication PKI
-  copy:
+  ansible.builtin.copy:
     src: "{{ item.source }}"
     dest: "/etc/sensu/{{ item.filename }}"
     owner: *sensu_user
@@ -45,7 +45,7 @@
         api_trusted_ca_file is defined
 
 - name: Install dashboard communication PKI
-  copy:
+  ansible.builtin.copy:
     src: "{{ item.source }}"
     dest: "/etc/sensu/{{ item.filename }}"
     owner: *sensu_user
@@ -61,7 +61,7 @@
   when: dashboard_cert_file is defined or dashboard_key_file is defined
 
 - name: Configure sensu-backend (/etc/sensu/backend.yml)
-  template:
+  ansible.builtin.template:
     src: backend.yml.j2
     dest: /etc/sensu/backend.yml
     owner: *sensu_user

roles/backend/tasks/main.yml

@@ -1,16 +1,16 @@
 ---
 - name: Install sensu-go-backend binary
-  include_role:
+  ansible.builtin.include_role:
     name: install
   vars:
-    components: [sensu-go-backend]
+    components: [sensu-go-backend] # noqa: var-naming[no-role-prefix]
 
 - name: Inform restart handler that we are in charge of the backend service
-  set_fact:
+  ansible.builtin.set_fact:
     manage_sensu_backend_service: true
 
 - name: Configure the backend
-  include_tasks: configure.yml
+  ansible.builtin.include_tasks: configure.yml
 
 - name: Start the backend
-  include_tasks: start.yml
+  ansible.builtin.include_tasks: start.yml