minor changes

Author: nedjitef

agent_based/proxmox_bs.py

@@ -95,6 +95,7 @@ def proxmox_bs_discovery(section):
                     )
             return
 
+
 def proxmox_bs_checks(item, params, section):
     req_ok = True
     expected = []
@@ -170,7 +171,7 @@ def proxmox_bs_checks(item, params, section):
                 stat = e["verification"]["state"]
                 upid = e["verification"]["upid"]
                 yield Result(state=State.UNKN, summary=(
-                    '%s (%s) unkown state %s' % (group, upid, stat)
+                    '%s (%s) unknown state %s' % (group, upid, stat)
                     ))
             for e in nok:
                 group = '%s/%s' % (e["backup-type"], e["backup-id"])
@@ -180,7 +181,6 @@ def proxmox_bs_checks(item, params, section):
                     'Verification of %s (%s) %s' % (group, upid, stat)
                     ))
 
-
         if (n == "proxmox-backup-client status") and (k == item):
             try:
                 ds_status = json.loads(c)
@@ -213,7 +213,6 @@ def proxmox_bs_checks(item, params, section):
 
 register.agent_section(
     name="proxmox_bs",
-    #host_label_function = proxmox_bs_hostlabels,
 )
 
 register.check_plugin(

agents/plugins/proxmox_bs

@@ -13,8 +13,8 @@ printf "<<<proxmox_bs>>>\n"
 
 printf "===requirements===\n"
 requirement() {
-  inpath $1; RC=$?
-  printf "$RC $1\n"
+  inpath "$1"; RC=$?
+  printf '%s %s\n' "$RC" "$1"
 }
 requirements() {
   RC=0
@@ -51,33 +51,35 @@ command_section() {
   done
   cmd=$1
   shift
-  printf "===$cmd===$SECTION_POSTFIX\n"
-  echo sh -c "$cmd $* $PIPE" >&2
-  sh -c "$cmd $* $PIPE"
+  printf '===%s===%s\n' "$cmd" "$SECTION_POSTFIX"
+  # shellcheck disable=SC2086
+  echo /bin/env $cmd $* $PIPE >&2
+  # shellcheck disable=SC2086
+  eval /bin/env $cmd $* $PIPE
 }
 
-$(< /etc/check_mk/proxmox_bs.env)
+source /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
 TMP_DATASTORES=$( mktemp -p /tmp/ )
-command_section -t $TMP_DATASTORES \
+command_section -t "$TMP_DATASTORES" \
   "proxmox-backup-manager datastore list" $OUTPUT_FORMAT
 
 command_section "proxmox-backup-manager task list" $OUTPUT_FORMAT
 
 TMP_UPIDS=$( mktemp -p /tmp/ )
 
 TMP_GC_FILES=$( mktemp -p /tmp/ )
-jq -r '.[].name' $TMP_DATASTORES | while read -r name; do
+jq -r '.[].name' "$TMP_DATASTORES" | while read -r name; do
   TMP_GC=$( mktemp -p /tmp/ )
-  printf "$TMP_GC" >> "$TMP_GC_FILES"
+  printf '%s' "$TMP_GC" >> "$TMP_GC_FILES"
   command_section -t "$TMP_GC" -p "$name" \
-    "proxmox-backup-manager garbage-collection status" $name $OUTPUT_FORMAT
-  jq -r '.upid' "$TMP_GC" >> $TMP_UPIDS
+    "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 "$PBS_REPO:$name" $OUTPUT_FORMAT
   command_section -p "$name" \
@@ -89,15 +91,17 @@ jq -r '.[].name' $TMP_DATASTORES | while read -r name; do
   proxmox-backup-client logout --repository "$PBS_REPO:$name" > /dev/null 2>&1
 done
 
+# shellcheck disable=SC2086 disable=SC2002
 cat $TMP_UPIDS | while read -r upid; do
-  command_section -P "sed -n '/^Removed garbage: /,\$p'" -p "$upid" \
+  command_section -P "sed '/^Removed /,\$!d'" -p "$upid" \
     "proxmox-backup-manager task log" "$upid"
 done
 
 export PBS_PASSWORD=
 
-printf "$TMP_GC_FILES" >> $TMP_GC_FILES
+echo "$TMP_GC_FILES" >> "$TMP_GC_FILES"
 
+# shellcheck disable=SC2086 disable=SC2046 disable=SC2002 disable=SC2153
 rm -vf $TMP_DATASTORE $TMP_UPIDS $(cat $TMP_GC_FILES | xargs) >&2
 
 echo "===EOD==="

web/plugins/metrics/proxmox_bs.py

@@ -60,5 +60,6 @@
         'verify_unknown',
         'verify_none',
     ],
+    'range': ('verify_ok:min', 'total_bakups:max'),
 }