Update from template for Checkmk 23

jiuka · Jun 5, 2024 · 5683e6a · 5683e6a
1 parent 7df931e
commit 5683e6a
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 48 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,7 +1,7 @@
 # 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.2.0-latest
-ARG VARIANT="2.2.0-latest"
+# [Choice] CheckMK version: 2.3.0-latest
+ARG VARIANT="2.3.0-latest"
 FROM checkmk/check-mk-raw:${VARIANT}
 
 RUN /docker-entrypoint.sh /bin/true

diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh
@@ -2,19 +2,11 @@
 
 NAME=$(python3 -c 'print(eval(open("package").read())["name"])')
 VERSION=$(python3 -c 'print(eval(open("package").read())["version"])')
-rm -f $NAME-$VERSION.mkp \
-   /omd/sites/cmk/var/cat  check_mk/packages/${NAME}-*.mkp \
+rm /omd/sites/cmk/var/check_mk/packages/${NAME} \
    /omd/sites/cmk/var/check_mk/packages_local/${NAME}-*.mkp ||:
 
 mkp -v package package 2>&1 | sed '/Installing$/Q' ||:
 
 cp /omd/sites/cmk/var/check_mk/packages_local/$NAME-$VERSION.mkp .
 
 mkp inspect $NAME-$VERSION.mkp
-
-# Set Outputs for GitHub Workflow steps
-if [ -n "$GITHUB_WORKSPACE" ]; then
-    echo "pkgfile=${NAME}-${VERSION}.mkp" >> $GITHUB_OUTPUT
-    echo "pkgname=${NAME}" >> $GITHUB_OUTPUT
-    echo "pkgversion=$VERSION" >> $GITHUB_OUTPUT
-fi
diff --git 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.2.0-latest" }
+		"args": { "VARIANT": "2.3.0-latest" }
 	},
 
 	"customizations": {

diff --git a/.devcontainer/symlink.sh b/.devcontainer/symlink.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+PKGNAME=$(python3 -c 'print(eval(open("package").read())["name"])')
+ln -sv $WORKSPACE $OMD_ROOT/local/lib/python3/cmk_addons/plugins/$PKGNAME
 
 for DIR in 'agents' 'checkman' 'checks' 'doc' 'inventory' 'notifications' 'pnp-templates' 'web'; do
     rm -rfv $OMD_ROOT/local/share/check_mk/$DIR

diff --git 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.2.0-latest
+      image: checkmk/check-mk-raw:2.3.0-latest
     permissions:
       contents: write
 
@@ -24,17 +24,24 @@ jobs:
     steps:
       - name: Initialize Checkmk Site
         run: /docker-entrypoint.sh /bin/true
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Parse Package File
+        run: |
+          NAME=$(python3 -c 'print(eval(open("package").read())["name"])')
+          VERSION=$(python3 -c 'print(eval(open("package").read())["version"])')
+          echo "CMKPKG_NAME=$NAME" >> "$GITHUB_ENV"
+          echo "CMKPKG_VERSION=$VERSION" >> "$GITHUB_ENV"
       - name: Setup links
         run: .devcontainer/symlink.sh
-      - name: Update GITHUB_PATH
-        run: echo "/omd/sites/cmk/bin" >> $GITHUB_PATH
       - name: Build Extension
-        run: .devcontainer/build.sh
+        run: |
+          chown -R cmk:cmk $GITHUB_WORKSPACE
+          su -l -c "mkp -v package $GITHUB_WORKSPACE/package" cmk
+          cp /omd/sites/cmk/var/check_mk/packages_local/${CMKPKG_NAME}-${CMKPKG_VERSION}.mkp .
+          echo "pkgfile=${CMKPKG_NAME}-${CMKPKG_VERSION}.mkp" >> $GITHUB_OUTPUT
         id: cmkpkg
-
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           release_name: Release ${{ github.ref }}
           draft: false

diff --git 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.2.0-latest
+      image: checkmk/check-mk-raw:2.3.0-latest
 
     env:
       OMD_ROOT: /omd/sites/cmk
@@ -24,16 +24,24 @@ jobs:
     steps:
       - name: Initialize Checkmk Site
         run: /docker-entrypoint.sh /bin/true
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Parse Package File
+        run: |
+          NAME=$(python3 -c 'print(eval(open("package").read())["name"])')
+          VERSION=$(python3 -c 'print(eval(open("package").read())["version"])')
+          echo "CMKPKG_NAME=$NAME" >> "$GITHUB_ENV"
+          echo "CMKPKG_VERSION=$VERSION" >> "$GITHUB_ENV"
       - name: Setup links
         run: .devcontainer/symlink.sh
-      - name: Update GITHUB_PATH
-        run: echo "/omd/sites/cmk/bin" >> $GITHUB_PATH
       - name: Build Extension
-        run: .devcontainer/build.sh
+        run: |
+          chown -R cmk:cmk $GITHUB_WORKSPACE
+          su -l -c "mkp -v package $GITHUB_WORKSPACE/package" cmk
+          cp /omd/sites/cmk/var/check_mk/packages_local/${CMKPKG_NAME}-${CMKPKG_VERSION}.mkp .
+          echo "pkgfile=${CMKPKG_NAME}-${CMKPKG_VERSION}.mkp" >> $GITHUB_OUTPUT
         id: cmkpkg
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.cmkpkg.outputs.pkgfile }}
           path: ${{ steps.cmkpkg.outputs.pkgfile }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,18 +4,19 @@ on:
   push:
     paths:
       - '**.py'
+      - .github/workflows/lint.yml
 
 jobs:
   flake8_py3:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: '3.12'
     - name: Install flake8
       run: pip install flake8
     - name: Run flake8

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -1,30 +1,25 @@
 name: pytest
 
 on:
-  push: []
+  push:
+    paths:
+      - '**.py'
+      - .github/workflows/pytest.yml
 
 jobs:
   pytest:
 
     runs-on: ubuntu-latest
     container:
-      image: checkmk/check-mk-raw:2.2.0-latest
-
-    env:
-      OMD_ROOT: /omd/sites/cmk
-      OMD_SITE: cmk
-      CMK_SITE_ID: cmk
-      WORKSPACE: ${{ github.workspace }}
+      image: checkmk/check-mk-raw:2.3.0-latest
 
     steps:
-    - name: Initialize Checkmk Site
-      run: /docker-entrypoint.sh /bin/true
-    - uses: actions/checkout@v3
-    - name: Setup links
-      run: ./.devcontainer/symlink.sh
-    - name: Install pytest
-      run: su -l -c "REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt pip3 install -r $GITHUB_WORKSPACE/.devcontainer/requirements.txt" cmk
-    - name: Update GITHUB_PATH
-      run: echo "/omd/sites/cmk/bin" >> $GITHUB_PATH
-    - name: Run pytest
-      run: python3 -m pytest
+      - name: Initialize Checkmk Site
+        run: /docker-entrypoint.sh /bin/true
+      - uses: actions/checkout@v4
+      - name: Setup links
+        run: .devcontainer/symlink.sh
+      - name: Install pytest
+        run: su -l -c "REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt pip3 install -r $GITHUB_WORKSPACE/.devcontainer/requirements.txt" cmk
+      - name: Run pytest
+        run: su -l -c "python3 -m pytest" cmk