scylla 2022 upgrade, monitoring 4.0, manager 3.0

.github/workflows/ansible-scylla-node.yml

@@ -26,6 +26,7 @@ jobs:
           #- ubuntu1804
           - ubuntu2004
           - ubuntu2004-enterprise
+          - ubuntu2004-enterprise-2022
     defaults:
       run:
         working-directory: ansible-scylla-node

ansible-scylla-manager/defaults/main.yml

@@ -3,9 +3,9 @@
 
 # Repo URL for the Manager
 # deprecated in favour of below, it will be dropped soon, below should be used
-scylla_manager_repo_url: "http://downloads.scylladb.com/rpm/centos/scylladb-manager-2.6.repo"
+scylla_manager_repo_url: "http://downloads.scylladb.com/rpm/centos/scylladb-manager-3.0.repo"
 
-scylla_manager_deb_repo_url: "http://downloads.scylladb.com/deb/ubuntu/scylladb-manager-2.6.list"
+scylla_manager_deb_repo_url: "http://downloads.scylladb.com/deb/ubuntu/scylladb-manager-3.0.list"
 scylla_manager_rpm_repo_url: "{{ scylla_manager_repo_url }}"
 
 scylla_db_vars:

ansible-scylla-monitoring/defaults/main.yml

@@ -17,7 +17,7 @@ scylla_servers_yml_path: scylla_servers.yml
 scylla_manager_ip: '127.0.0.1'
 
 # Download the scylla-monitoring from here
-scylla_monitoring_archive_url: 'https://github.com/scylladb/scylla-monitoring/archive/scylla-monitoring-3.10.1.tar.gz'
+scylla_monitoring_archive_url: 'https://github.com/scylladb/scylla-monitoring/archive/scylla-monitoring-4.0.0.tar.gz'
 
 scylla_monitoring_deploy_path: /opt/scylla-monitoring
 scylla_monitoring_data_path: "{{ scylla_monitoring_deploy_path }}/data"
@@ -51,10 +51,10 @@ scylla_monitoring_retention: "14d"
 ### The following settings are only relevant for non-dockerized setup
 
 # Check https://prometheus.io/download/ for newer versions or stick to the default below
-alert_manager_url: 'https://github.com/prometheus/alertmanager/releases/download/v0.23.0/alertmanager-0.23.0.linux-amd64.tar.gz'
+alert_manager_url: 'https://github.com/prometheus/alertmanager/releases/download/v0.23.0/alertmanager-0.24.0.linux-amd64.tar.gz'
 
 # Check https://prometheus.io/download/ for newer versions or stick to the default below
-prometheus_url: 'https://github.com/prometheus/prometheus/releases/download/v2.32.0/prometheus-2.32.0.linux-amd64.tar.gz'
+prometheus_url: 'https://github.com/prometheus/prometheus/releases/download/v2.32.0/prometheus-2.34.0.linux-amd64.tar.gz'
 
 # Additional arguments to pass to the prometheus binary
 #prometheus_args: "--web.enable-admin-api --storage.tsdb.retention.size=50G"

ansible-scylla-node/defaults/main.yml

@@ -96,10 +96,10 @@ firewall_enabled: false
 # URL of an RPM .repo file or a DEB .list file
 # deprecated in favour of below, it will be dropped soon, below should be used
 scylla_repos:
-  - http://downloads.scylladb.com/rpm/centos/scylla-2021.1.repo
+  - http://downloads.scylladb.com/rpm/centos/scylla-2022.1.repo
 
 scylla_deb_repos:
-  - http://downloads.scylladb.com/deb/ubuntu/scylla-2021.1.list
+  - http://downloads.scylladb.com/deb/ubuntu/scylla-2022.1.list
 
 scylla_rpm_repos: "{{ scylla_repos }}"
 
@@ -128,13 +128,12 @@ start_scylla_service: true
 # Only relevant for Debian/Ubuntu
 scylla_repo_keyserver: 'hkp://keyserver.ubuntu.com:80'
 scylla_repo_keys:
+  - d0a112e067426ab2
   - 5e08fbd8b5d6ec9c
 
 scylla_manager_repo_keys:
+  - d0a112e067426ab2
   - 5e08fbd8b5d6ec9c
-  - 6B2BFD3660EF3F5B
-  - 17723034C56D4B19
-
 
 # Set when relevant (Debian for example)
 #scylla_repo_keyfile_urls:
@@ -224,9 +223,9 @@ generate_monitoring_config: True
 # If Scylla Manager will be used, set the following variables
 scylla_manager_enabled: true
 # deprecated in favour of below, it will be dropped soon, below should be used
-scylla_manager_repo_url: "http://downloads.scylladb.com/rpm/centos/scylladb-manager-2.6.repo"
+scylla_manager_repo_url: "http://downloads.scylladb.com/rpm/centos/scylladb-manager-3.0.repo"
 
-scylla_manager_deb_repo_url: "http://downloads.scylladb.com/deb/ubuntu/scylladb-manager-2.6.list"
+scylla_manager_deb_repo_url: "http://downloads.scylladb.com/deb/ubuntu/scylladb-manager-3.0.list"
 scylla_manager_rpm_repo_url: "{{ scylla_manager_repo_url }}"
 
 scylla_manager_agent_upgrade: true

ansible-scylla-node/molecule/ubuntu2004-enterprise-2022/INSTALL.rst

@@ -0,0 +1,28 @@
+*******
+Docker driver installation guide
+*******
+
+Requirements
+============
+
+* Docker Engine
+
+Install
+=======
+
+Please refer to the `Virtual environment`_ documentation for installation best
+practices. If not using a virtual environment, please consider passing the
+widely recommended `'--user' flag`_ when invoking ``pip``.
+
+.. _Virtual environment: https://virtualenv.pypa.io/en/latest/
+.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site
+
+.. code-block:: bash
+
+    $ pip install 'molecule[docker]'
+
+requirements can be regenerated using:
+
+pip-compile --output-file=requirements-dev.txt requirements-dev.in
+
+pip-compile --output-file=requirements.txt requirements.in

ansible-scylla-node/molecule/ubuntu2004-enterprise-2022/molecule.yml

@@ -0,0 +1,76 @@
+---
+dependency:
+  name: galaxy
+  enabled: false
+  options:
+    role-file: requirements.yml
+driver:
+  name: docker
+platforms:
+  - name: node1
+    image: jrei/systemd-ubuntu:20.04
+    privileged: true
+    command: /lib/systemd/systemd
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    groups:
+      - scylla
+  - name: node2
+    image: jrei/systemd-ubuntu:20.04
+    privileged: true
+    command: /lib/systemd/systemd
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    groups:
+      - scylla
+  - name: node3
+    image: jrei/systemd-ubuntu:20.04
+    privileged: true
+    command: /lib/systemd/systemd
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    groups:
+      - scylla
+provisioner:
+  name: ansible
+  log: True
+  options:
+    vvv: True
+  inventory:
+    group_vars:
+      scylla:
+        scylla_deb_repos:
+          - "http://downloads.scylladb.com/deb/ubuntu/scylla-2022.1.list"
+        scylla_edition: "enterprise"
+        scylla_version: "latest"
+        scylla_io_probe: false
+        io_properties:
+          disks:
+            - mountpoint: "/var/lib/scylla/data"
+              read_iops: 100
+              read_bandwidth: 1000
+              write_iops: 100
+              write_bandwidth: 1000
+        scylla_seeds:
+          - "172.17.0.2"
+        dc: "test_dc"
+        rack: "test_rack"
+        skip_coredump: True
+        skip_sysconfig: True
+        skip_cpuset: True
+#        skip_ntp: True
+        scylla_manager_deb_repo_url: "http://downloads.scylladb.com/deb/ubuntu/scylladb-manager-3.0-focal.list"
+  playbooks:
+    converge: ../shared/converge.yml
+    prepare: ../shared/prepare.yml
+scenario:
+  test_sequence:
+    - dependency
+    - lint
+    - syntax
+    - create
+    - prepare
+    - converge
+    - verify
+verifier:
+  name: ansible

ansible-scylla-node/molecule/ubuntu2004-enterprise-2022/verify.yml

@@ -0,0 +1,9 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  tasks:
+  - name: Example assertion
+    assert:
+      that: true