stabilize

Author: HenriWahl

.github/workflows/build-release-latest.yml

@@ -26,49 +26,15 @@ jobs:
       - run: docker pull ${{ steps.get_image.outputs.IMAGE }} || docker build -t ${{ steps.get_image.outputs.IMAGE }} -f dockerfiles/checkmk/Dockerfile .
       - run: docker push ${{ steps.get_image.outputs.IMAGE }}
 
-  build-package-ci:
-    runs-on: ubuntu-latest
-    needs: build-image
-    container:
-      image: ${{ needs.build-image.outputs.image }}
-      env:
-        CMK: /omd/sites/cmk
-        SU: su - cmk -c
-    steps:
-      - uses: actions/checkout@v4
-      - run: build-mkp.sh
-      # upload results
-      - uses: actions/upload-artifact@v4
-        with:
-          path: ./mkp/*.mkp
-          retention-days: 1
-
   build-package:
     runs-on: ubuntu-latest
     needs: build-image
     container:
       image: ${{ needs.build-image.outputs.image }}
-      env:
-        CMK: /omd/sites/cmk
-        SU: su - cmk -c
     steps:
       - uses: actions/checkout@v4
-      - run: cp -r mkp/local/* ${CMK}/local
-      - run: ${SU} "mkdir ${CMK}/tmp/check_mk"
-      - run: ${SU} "mkp template yum"
-      - run: git config --global --add safe.directory ${PWD}
-      - run: modify-extension.py ${PWD} ${CMK}/tmp/check_mk/yum.manifest.temp
-      # avoid error:
-      # Error removing file /omd/sites/cmk/local/lib/python3/cmk/base/cee/plugins/bakery/yum.py: [Errno 13] Permission denied: '/omd/sites/cmk/local/lib/python3/cmk/base/cee/plugins/bakery/yum.py'
-      # and likewise the `mkp package` fails due to already existing files
-      - run: chmod go+rw ${CMK}/local/lib/python3/cmk/base/cee/plugins/bakery
-      - run: chmod go+rw ${CMK}/local/lib/python3/cmk_addons/plugins/yum/agent_based
-      - run: chmod go+rw ${CMK}/local/lib/python3/cmk_addons/plugins/yum/checkman
-      - run: chmod go+rw ${CMK}/local/lib/python3/cmk_addons/plugins/yum/rulesets
-      - run: cat ${CMK}/tmp/check_mk/yum.manifest.temp
-      - run: ${SU} "mkp package ${CMK}/tmp/check_mk/yum.manifest.temp"
-      # copy created extension package back to workspace
-      - run: cp ${CMK}/var/check_mk/packages_local/*.mkp ${PWD}/mkp/
+      # use script
+      - run: build-mkp.sh
       # upload results
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/build-release-stable.yml

@@ -30,27 +30,10 @@ jobs:
     needs: build-image
     container:
       image: ${{ needs.build-image.outputs.image }}
-      env:
-        CMK: /omd/sites/cmk
-        SU: su - cmk -c
     steps:
       - uses: actions/checkout@v4
-      - run: cp -r mkp/local/* ${CMK}/local
-      - run: ${SU} "mkdir ${CMK}/tmp/check_mk"
-      - run: ${SU} "mkp template yum"
-      - run: git config --global --add safe.directory ${PWD}
-      - run: modify-extension.py ${PWD} ${CMK}/tmp/check_mk/yum.manifest.temp
-      # avoid error:
-      # Error removing file /omd/sites/cmk/local/lib/python3/cmk/base/cee/plugins/bakery/yum.py: [Errno 13] Permission denied: '/omd/sites/cmk/local/lib/python3/cmk/base/cee/plugins/bakery/yum.py'
-      # and likewise the `mkp package` fails due to already existing files
-      - run: chmod go+rw ${CMK}/local/lib/python3/cmk/base/cee/plugins/bakery
-      - run: chmod go+rw ${CMK}/local/lib/python3/cmk_addons/plugins/yum/agent_based
-      - run: chmod go+rw ${CMK}/local/lib/python3/cmk_addons/plugins/yum/checkman
-      - run: chmod go+rw ${CMK}/local/lib/python3/cmk_addons/plugins/yum/rulesets
-      - run: cat ${CMK}/tmp/check_mk/yum.manifest.temp
-      - run: ${SU} "mkp package ${CMK}/tmp/check_mk/yum.manifest.temp"
-      # copy created extension package back to workspace
-      - run: cp ${CMK}/var/check_mk/packages_local/*.mkp ${PWD}/mkp/
+      # use script
+      - run: build-mkp.sh
       # upload results
       - uses: actions/upload-artifact@v4
         with:

mkp/local/lib/python3/cmk/base/cee/plugins/bakery/yum.py

@@ -15,25 +15,26 @@ def get_yum_files(conf: Any) -> FileGenerator:
 
     """
 
-    # debugging
-    with open('/tmp/debug-get_yum_files.txt', 'a') as debug_file:
-        debug_file.write(f'config: {conf}\n')
+    # debugging - might become an option later
+    #with open('/tmp/debug-get_yum_files.txt', 'a') as debug_file:
+    #    debug_file.write(f'config: {conf}\n')
 
     # default to no interval - will be filled if set in config
     interval = None
+    # flag to decide if plugin should be deployed
     deploy_plugin = False
 
     if isinstance(conf, dict):
         deploy = conf.get('deploy')
-        # backward compatible
+        # backward compatible - first check if 'interval' is still used
         if deploy is None:
             if isinstance(conf.get('interval'), dict):
                 try:
                     interval = int(conf.get('interval'))
                 except (TypeError, ValueError):
                     interval = None
                 deploy_plugin = True
-
+        # existence of 'deploy' dict
         elif isinstance(deploy, dict):
             interval = deploy.get('interval')
             if interval is not None:

mkp/local/lib/python3/cmk_addons/plugins/yum/rulesets/yum_cee.py

@@ -35,12 +35,11 @@ def _migrate_int_to_float(value: object) -> Mapping[str, object]:
     migrate from integer interval to float interval
     """
 
-    # debugging
-    with open('/tmp/debug-migrate_int_to_float.txt', 'a') as debug_file:
-        debug_file.write(f'value: {value}\n')
+    # debugging - might become an option later
+    #with open('/tmp/debug-migrate_int_to_float.txt', 'a') as debug_file:
+    #    debug_file.write(f'value: {value}\n')
 
     if value is not None:
-        # backward compatibility - migrate from deploy to deployment
         if value.get('deploy'):
             if value['deploy'].get('interval'):
                 return {
@@ -54,7 +53,7 @@ def _migrate_int_to_float(value: object) -> Mapping[str, object]:
                         'interval': dict()
                     }
                 }
-        # fix a short time used interval instead of deploy
+        # backward compatibility - migrate from interval to deploy
         elif value.get('interval'):
             return {
                 'deploy': {
@@ -71,9 +70,7 @@ def _migrate_int_to_float(value: object) -> Mapping[str, object]:
         else:
             return value
     else:
-        # return {
-        #         'deploy': dict()
-        # }
+        # empty dictionary means no deployment
         return dict()