Fix up health checks to work after data was migrated out of hive schema

haproxy.yaml

@@ -17,7 +17,7 @@ services:
     healthcheck:
       test: wget -q --spider 127.0.0.1:8001 
   haproxy-healthchecks:
-    image: ${HAPROXY_HEALTHCHECKS_REGISTRY:-${HIVE_API_NODE_REGISTRY:-registry.hive.blog}/haf_api_node/haproxy-healthchecks}:${HAPROXY_HEALTHCHECKS_VERSION:-latest}
+    image: ${HAPROXY_HEALTHCHECKS_REGISTRY:-${HIVE_API_NODE_REGISTRY:-registry.hive.blog}/haf_api_node/haproxy-healthchecks}:${HAPROXY_HEALTHCHECKS_VERSION:-${HIVE_API_NODE_VERSION}}
     environment:
       POSTGRES_URL: postgresql://haf_admin@haf/haf_block_log
       POSTGRES_URL_HAFBE: postgresql://hafbe_user@haf/haf_block_log

healthchecks/Dockerfile

@@ -3,8 +3,8 @@ FROM alpine:3.18.3
 RUN apk --no-cache add postgresql14-client
 
 COPY checks/hived.sh /checks/hived.sh
-COPY checks/hafbe_bal.sh /checks/hafbe_bal.sh
-COPY checks/hafbe_rep.sh /checks/hafbe_rep.sh
+COPY checks/hafbe_btracker.sh /checks/hafbe_btracker.sh
+COPY checks/hafbe_reptracker.sh /checks/hafbe_reptracker.sh
 COPY checks/hivemind.sh /checks/hivemind.sh
 COPY checks/hafah.sh /checks/hafah.sh
 COPY checks/hafbe.sh /checks/hafbe.sh

healthchecks/checks/hafbe.sh

@@ -8,21 +8,14 @@ trap "trap - 2 15 && kill -- -\$\$" 2 15
 
 check_haf_lib
 
-REPTRACKER_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_REPTRACKER" --quiet --no-align --tuples-only --command="select extract('epoch' from now() - created_at)::integer from hive.blocks where num = (select hive.app_get_current_block_num('reptracker_app'))")
+REPTRACKER_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_REPTRACKER" --quiet --no-align --tuples-only --command="select extract('epoch' from hive.get_app_current_block_age('reptracker_app'))::integer")
 if [ "$REPTRACKER_LAST_PROCESSED_BLOCK_AGE" -gt 60 ]; then
   age_string=$(format_seconds "$REPTRACKER_LAST_PROCESSED_BLOCK_AGE")
   echo "down #reptracker_app block over a minute old ($age_string)"
   exit 3
 fi
 
-BTRACKER_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_BTRACKER" --quiet --no-align --tuples-only --command="select extract('epoch' from now() - created_at)::integer from hive.blocks where num = (select hive.app_get_current_block_num('hafbe_bal'))")
-if [ "$BTRACKER_LAST_PROCESSED_BLOCK_AGE" -gt 60 ]; then
-  age_string=$(format_seconds "$BTRACKER_LAST_PROCESSED_BLOCK_AGE")
-  echo "down #hafbe_bal block over a minute old ($age_string)"
-  exit 3
-fi
-
-HAFBE_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_HAFBE" --quiet --no-align --tuples-only --command="select extract('epoch' from now() - created_at)::integer from hive.blocks where num = (select hive.app_get_current_block_num('hafbe_app'))")
+HAFBE_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_HAFBE" --quiet --no-align --tuples-only --command="select extract('epoch' from hive.get_app_current_block_age(ARRAY['hafbe_app', 'hafbe_bal']))::integer")
 if [ "$HAFBE_LAST_PROCESSED_BLOCK_AGE" -gt 60 ]; then
   age_string=$(format_seconds "$HAFBE_LAST_PROCESSED_BLOCK_AGE")
   echo "down #hafbe block over a minute old ($age_string)"

healthchecks/checks/hafbe_btracker.sh

@@ -8,7 +8,7 @@ trap "trap - 2 15 && kill -- -\$\$" 2 15
 
 check_haf_lib
 
-BTRACKER_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_BTRACKER" --quiet --no-align --tuples-only --command="select extract('epoch' from now() - created_at)::integer from hive.blocks where num = (select hive.app_get_current_block_num('btracker_app'))")
+BTRACKER_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_BTRACKER" --quiet --no-align --tuples-only --command="select extract('epoch' from hive.get_app_current_block_age('hafbe_bal'))::integer")
 if [ "$BTRACKER_LAST_PROCESSED_BLOCK_AGE" -gt 60 ]; then
   age_string=$(format_seconds "$BTRACKER_LAST_PROCESSED_BLOCK_AGE")
   echo "down #hafbe_bal block over a minute old ($age_string)"

healthchecks/checks/hafbe_reptracker.sh

@@ -8,7 +8,7 @@ trap "trap - 2 15 && kill -- -\$\$" 2 15
 
 check_haf_lib
 
-REPTRACKER_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_REPTRACKER" --quiet --no-align --tuples-only --command="select extract('epoch' from now() - created_at)::integer from hive.blocks where num = (select hive.app_get_current_block_num('reptracker_app'))")
+REPTRACKER_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_REPTRACKER" --quiet --no-align --tuples-only --command="select extract('epoch' from hive.get_app_current_block_age('reptracker_app'))::integer")
 if [ "$REPTRACKER_LAST_PROCESSED_BLOCK_AGE" -gt 60 ]; then
   age_string=$(format_seconds "$REPTRACKER_LAST_PROCESSED_BLOCK_AGE")
   echo "down #hafbe_rep block over a minute old ($age_string)"

healthchecks/checks/hivemind.sh

@@ -8,7 +8,7 @@ trap "trap - 2 15 && kill -- -\$\$" 2 15
 
 check_haf_lib
 
-HIVEMIND_LAST_IMPORTED_BLOCK_AGE=$(psql "$POSTGRES_URL" --quiet --no-align --tuples-only --command="select extract('epoch' from now() - (select last_imported_block_date from hivemind_app.hive_state limit 1))::integer")
+HIVEMIND_LAST_IMPORTED_BLOCK_AGE=$(psql "$POSTGRES_URL" --quiet --no-align --tuples-only --command="select extract('epoch' from hive.get_app_current_block_age('hivemind_app'))::integer")
 if [ "$HIVEMIND_LAST_IMPORTED_BLOCK_AGE" -gt 60 ]; then
   age_string=$(format_seconds "$HIVEMIND_LAST_IMPORTED_BLOCK_AGE")
   echo "down #hivemind block over a minute old ($age_string)"

healthchecks/checks/hivemind_rtracker.sh

@@ -8,7 +8,7 @@ trap "trap - 2 15 && kill -- -\$\$" 2 15
 
 check_haf_lib
 
-REPTRACKER_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_REPTRACKER" --quiet --no-align --tuples-only --command="select extract('epoch' from now() - created_at)::integer from hive.blocks where num = (select hive.app_get_current_block_num('reptracker_app'))")
+REPTRACKER_LAST_PROCESSED_BLOCK_AGE=$(psql "$POSTGRES_URL_REPTRACKER" --quiet --no-align --tuples-only --command="select extract('epoch' from hive.get_app_current_block_age('reptracker_app'))::integer")
 if [ "$REPTRACKER_LAST_PROCESSED_BLOCK_AGE" -gt 60 ]; then
   age_string=$(format_seconds "$REPTRACKER_LAST_PROCESSED_BLOCK_AGE")
   echo "down #reptracker_app block over a minute old ($age_string)"