diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 205fc34..8759c99 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,8 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.155.1/containers/ubuntu/.devcontainer/base.Dockerfile -# [Choice] CheckMK version: 2.3.0-latest -ARG VARIANT="2.3.0-latest" -FROM checkmk/check-mk-raw:${VARIANT} +# [Choice] CheckMK version: 2.5.0-latest +ARG VARIANT="2.5.0-latest" +FROM checkmk/check-mk-community:${VARIANT} RUN /docker-entrypoint.sh /bin/true diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ec92da1..3a03e0c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "build": { "dockerfile": "Dockerfile", // Update 'VARIANT' to pick an Ubuntu version: focal, bionic - "args": { "VARIANT": "2.3.0-latest" } + "args": { "VARIANT": "2.5.0-latest" } }, "customizations": { diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 94499de..bcb2278 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -11,7 +11,7 @@ jobs: name: Build Release Package runs-on: ubuntu-latest container: - image: checkmk/check-mk-raw:2.3.0-latest + image: checkmk/check-mk-community:2.5.0-latest permissions: contents: write diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0026e0..0cdb2c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: name: Build Checkmk package runs-on: ubuntu-latest container: - image: checkmk/check-mk-raw:2.3.0-latest + image: checkmk/check-mk-community:2.5.0-latest env: OMD_ROOT: /omd/sites/cmk diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 8dcd03f..6214ee9 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest container: - image: checkmk/check-mk-raw:2.3.0-latest + image: checkmk/check-mk-community:2.5.0-latest env: OMD_ROOT: /omd/sites/cmk diff --git a/package b/package index f4e9c47..9c91c4c 100644 --- a/package +++ b/package @@ -18,8 +18,8 @@ }, 'name': 'fsecure_status', 'title': u'F-Secure Status Check', - 'version': '2.3.0', + 'version': '2.3.1', 'version.min_required': '2.3.0', - 'version.packaged': '2.3.0', - 'version.usable_until': '2.4.0', + 'version.packaged': '2.5.0', + 'version.usable_until': '2.6.0', } \ No newline at end of file diff --git a/tests/unit/agent_based/test_fsecure_status.py b/tests/unit/agent_based/test_fsecure_status.py index fd30287..60bb860 100644 --- a/tests/unit/agent_based/test_fsecure_status.py +++ b/tests/unit/agent_based/test_fsecure_status.py @@ -27,7 +27,7 @@ Service, State, ) -from cmk.base.plugins.agent_based import fsecure_status +from cmk_addons.plugins.fsecure_status.agent_based import fsecure_status EXAMPLE_STRING_TABLE = [ ['RealTimeScanningEnabled', 'False'],