agent configuration

Author: nedjitef

agent_based/proxmox_bs.py

@@ -129,27 +129,33 @@ def proxmox_bs_checks(item, params, section):
             yield Metric('total_backups', n)
         if (n == "proxmox-backup-client snapshot list") and (k == item):
             nr, np, ok, nok = 0, [], 0, []
-            for e in json.loads(c):
-                if "verification" in e:
-                    verify_state = e.get("verification", {}).get("state", "na")
-                    if verify_state == "ok":
-                        ok = ok+1
-                    elif verify_state == "failed":
-                        nok.append(e)
+            try:
+                for e in json.loads(c):
+                    if "verification" in e:
+                        verify_state = e.get("verification", {}).get("state", "na")
+                        if verify_state == "ok":
+                            ok = ok+1
+                        elif verify_state == "failed":
+                            nok.append(e)
+                        else:
+                            np.append(e)
                     else:
-                        np.append(e)
-                else:
-                    nr = nr+1
-            yield Metric('verify_ok', ok)
-            yield Metric('verify_failed', len(nok))
-            yield Metric('verify_unknown', len(np))
-            yield Metric('not_verified_yet', nr)
-            yield Result(state=State.OK, summary=(
-                'Snapshots Verified: %d' % ok
-                ))
-            yield Result(state=State.OK, summary=(
-                'Snapshots not verified yet: %d' % nr
-                ))
+                        nr = nr+1
+                yield Metric('verify_ok', ok)
+                yield Metric('verify_failed', len(nok))
+                yield Metric('verify_unknown', len(np))
+                yield Metric('not_verified_yet', nr)
+                yield Result(state=State.OK, summary=(
+                    'Snapshots Verified: %d' % ok
+                    ))
+                yield Result(state=State.OK, summary=(
+                    'Snapshots not verified yet: %d' % nr
+                    ))
+            except:
+                yield Result(
+                    state=State.WARN,
+                    summary='snapshot parsing error',
+                )
             for e in np:
                 group = '%s/%s' % (e["backup-type"], e["backup-id"])
                 stat = e["verification"]["state"]

agents/plugins/proxmox_bs

@@ -27,8 +27,6 @@ proxmox-backup-client
 jq
 .
 
-$(< /etc/check_mk/proxmox_bs.env)
-
 command_section() {
   PIPE=
   SECTION_POSTFIX=
@@ -53,6 +51,10 @@ command_section() {
   sh -c "$cmd $* $PIPE"
 }
 
+$(< /etc/check_mk/proxmox_bs.env)
+PBS_REPO="${PBS_USERNAME}@localhost"
+proxmox-backup-client login
+
 OUTPUT_FORMAT="--output-format json-pretty"
 
 command_section "proxmox-backup-manager versions" $OUTPUT_FORMAT
@@ -72,12 +74,12 @@ jq -r '.[].name' $TMP_DATASTORES | while read -r name; do
     "proxmox-backup-manager garbage-collection status" $name $OUTPUT_FORMAT
   jq -r '.upid' "$TMP_GC" >> $TMP_UPIDS
   command_section -p "$name" \
-    "proxmox-backup-client list" --repository "localhost:$name" $OUTPUT_FORMAT
+    "proxmox-backup-client list" --repository "$PBS_REPO:$name" $OUTPUT_FORMAT
   command_section -p "$name" \
-    "proxmox-backup-client snapshot list" --repository "localhost:$name" \
+    "proxmox-backup-client snapshot list" --repository "$PBS_REPO:$name" \
     $OUTPUT_FORMAT
   command_section -p "$name" \
-    "proxmox-backup-client status" --repository "localhost:$name" \
+    "proxmox-backup-client status" --repository "$PBS_REPO:$name" \
     $OUTPUT_FORMAT
 done
 
@@ -86,7 +88,7 @@ cat $TMP_UPIDS | while read -r upid; do
     "proxmox-backup-manager task log" "$upid"
 done
 
-proxmox-backup-client logout --repository "localhost"
+proxmox-backup-client logout --repository "$PBS_REPO"
 export PBS_PASSWORD=
 
 printf "$TMP_GC_FILES" >> $TMP_GC_FILES

info

@@ -3,13 +3,12 @@
  'download_url': '',
  'files': {'agent_based': ['proxmox_bs.py'],
            'agents': ['plugins/proxmox_bs'],
-           'lib': ['check_mk/base/cee/plugins/bakery/proxmox_bs.py',
-                   'python3/cmk/base/cee/plugins/bakery/proxmox_bs.py'],
+           'lib': ['check_mk/base/cee/plugins/bakery/proxmox_bs.py'],
            'web': ['plugins/wato/proxmox_bs.py']},
  'name': 'proxmox_bs',
- 'num_files': 5,
+ 'num_files': 4,
  'title': 'Proxmox Backup Server',
- 'version': '0.1.19',
+ 'version': '0.3.0',
  'version.min_required': '2.0.0',
  'version.packaged': '2.0.0p3',
  'version.usable_until': None}

lib/check_mk/base/cee/plugins/bakery/proxmox_bs.py

@@ -4,14 +4,26 @@
 from pathlib import Path
 from typing import Any, Dict
 
-from .bakery_api.v1 import FileGenerator, OS, Plugin, register
+from .bakery_api.v1 import (
+        FileGenerator,
+        OS,
+        Plugin,
+        PluginConfig,
+        register,
+)
 
 
 def get_proxmox_bs_files(conf: Dict[str, Any]) -> FileGenerator:
-    if conf == 'server':
+    if conf != None:
         yield Plugin(base_os=OS.LINUX, source=Path("proxmox_bs"))
-    elif conf == 'client':
-        yield Plugin(base_os=OS.LINUX, source=Path("proxmox_bs_client"))
+        yield PluginConfig(
+            base_os=OS.LINUX,
+            lines=[
+                "export PBS_USERNAME=%s" % conf.get('auth_user'),
+                "export PBS_PASSWORD=%s" % conf.get('auth_pass'),
+            ],
+            target=Path("proxmox_bs.env"),
+        )
 
 
 register.bakery_plugin(

lib/python3/cmk/base/cee/plugins/bakery/proxmox_bs.py

@@ -16,19 +16,34 @@
     RulespecGroupMonitoringAgentsAgentPlugins
 )
 from cmk.gui.valuespec import (
-    DropdownChoice,
+    Alternative,
+    Dictionary,
+    FixedValue,
+    Password,
+    TextInput,
 )
 
 
 def _valuespec_agent_config_proxmox_bs():
-    return DropdownChoice(
+    return Alternative(
         title = _("Proxmox Backup Server (Linux)"),
-        help = _("This will deploy the agent plugin <tt>proxmox_bs</tt>"),
-        choices = [
-            ( 'server', _("Deploy plugin for Proxmox Backup Server") ),
-            ( 'client', _("Deploy plugin for Proxmox Backup Client only")),
-            ( None, _("Do not deploy plugin for Proxmox Backup") ),
-        ]
+        help = _("Proxmox Backup Server Monitoring (<tt>proxmox_bs</tt>)"),
+        style = 'dropdown',
+        elements = [
+            Dictionary(
+                title = _("Deploy Proxmox Backup Server plugin"),
+                elements = [
+                    ( 'auth_user', TextInput(title=_("Username")) ),
+                    ( 'auth_pass', Password(title=_("Password")) ),
+                ],
+                optional_keys = [],
+            ),
+            FixedValue(
+                None,
+                title = _("Do not deploy plugin for Proxmox Backup server"),
+                totext = _("(disabled)"),
+            )
+        ],
     )