added image purge

Author: kosta709

cleaner/cleaner-agent.sh

@@ -17,13 +17,18 @@ FUNC_FILE=${DIR}/functions.sh
 echo "$0: Loading functions File $FUNC_FILE "
 source "${FUNC_FILE}"
 
-sigterm_trap(){
-  echo -e "\n    ## $0 - $(date) - SIGTERM received ##"
-  export EXIT=1
-  rm -vf ${LOCK_FILE}
+clean_metrics(){
   [[ -f ${CLEANER_AGENT_ACTIONS_CONTAINERS_FILE} ]] && rm -fv ${CLEANER_AGENT_ACTIONS_CONTAINERS_FILE}
   [[ -f ${CLEANER_AGENT_ACTIONS_VOLUMES_FILE} ]] && rm -fv ${CLEANER_AGENT_ACTIONS_VOLUMES_FILE}
   [[ -f ${CLEANER_AGENT_ACTIONS_IMAGES_FILE} ]] && rm -fv ${CLEANER_AGENT_ACTIONS_IMAGES_FILE}
+  [[ -f ${CLEANER_AGENT_ACTIONS_PURGES_FILE} ]] && rm -fv ${CLEANER_AGENT_ACTIONS_PURGES_FILE}
+}
+
+sigterm_trap(){
+  echo -e "\n    ## $0 - SIGTERM received - $(date) ##"
+  export EXIT=1
+  rm -vf ${LOCK_FILE}
+  clean_metrics
 }
 trap sigterm_trap SIGTERM SIGINT
 
@@ -38,13 +43,10 @@ SLEEP_INTERVAL=5
 
 echo "$0: initializing metrics"
 CLEANER_AGENT_ACTIONS_CONTAINERS=0
-rm -fv ${CLEANER_AGENT_ACTIONS_CONTAINERS_FILE}
-
 CLEANER_AGENT_ACTIONS_VOLUMES=0
-rm -fv ${CLEANER_AGENT_ACTIONS_VOLUMES_FILE}
-
 CLEANER_AGENT_ACTIONS_IMAGES=0
-rm -fv ${CLEANER_AGENT_ACTIONS_IMAGES_FILE}
+CLEANER_AGENT_ACTIONS_PURGES=0
+clean_metrics
 
 while true
 do
@@ -89,5 +91,18 @@ do
   fi
   [[ -n "${EXIT}" ]] && break
 
+  if [[ -n $(need_to_clean) ]]; then
+    echo "$0: CLEANER_AGENT: NEEED TO PURGE - purging all images created more than 3h ago"
+    display_df
+    lock_file
+    docker image prune -a --force --filter "until=3h"
+    (( CLEANER_AGENT_ACTIONS_PURGES ++ ))
+    echo "$0: CLEANER_AGENT_ACTIONS_PURGES=$CLEANER_AGENT_ACTIONS_PURGES, updating metric file ${CLEANER_AGENT_ACTIONS_PURGES_FILE}"
+    echo $CLEANER_AGENT_ACTIONS_PURGES > ${CLEANER_AGENT_ACTIONS_PURGES_FILE}
+    unlock_file
+    display_df
+  fi
+  [[ -n "${EXIT}" ]] && break
+
   sleep $SLEEP_INTERVAL
 done

cleaner/config

@@ -21,3 +21,4 @@ LAST_PRUNED_TS_FILE=${DIND_VOLUME_STAT_DIR}/last_pruned_ts
 CLEANER_AGENT_ACTIONS_CONTAINERS_FILE=${DIND_VOLUME_STAT_DIR}/cleaner_agent_actions_containers
 CLEANER_AGENT_ACTIONS_VOLUMES_FILE=${DIND_VOLUME_STAT_DIR}/cleaner_agent_actions_volumes
 CLEANER_AGENT_ACTIONS_IMAGES_FILE=${DIND_VOLUME_STAT_DIR}/cleaner_agent_actions_images
+CLEANER_AGENT_ACTIONS_PURGES_FILE=${DIND_VOLUME_STAT_DIR}/cleaner_agent_actions_purges

monitor/metrics.sh

@@ -140,6 +140,16 @@ EOF
 # HELP docker_volume_cleaner_agent_actions_images images cleans done by cleaner_agent.sh
 docker_volume_cleaner_agent_actions_images{$LABELS} ${CLEANER_AGENT_ACTIONS_IMAGES}
 
+EOF
+  fi
+
+  if [[ -f ${CLEANER_AGENT_ACTIONS_PURGES_FILE} ]]; then
+     CLEANER_AGENT_ACTIONS_PURGES=$(cat ${CLEANER_AGENT_ACTIONS_PURGES_FILE})
+     cat <<EOF >> $METRIC_FILE_TMP
+# TYPE docker_volume_cleaner_agent_actions_purges gauge
+# HELP docker_volume_cleaner_agent_actions_purges docker purges done by cleaner_agent.sh
+docker_volume_cleaner_agent_actions_purges{$LABELS} ${CLEANER_AGENT_ACTIONS_PURGES}
+
 EOF
   fi