Merge ~barryprice/postgresql-charm/+git/postgresql-charm:master into postgresql-charm:master

[Barry Price]

Fix mis-named config variable, guard against empty wal-e backup thershold charm config (use the default values if we get a None)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

Yup

review: Approve

[Stuart Bishop (stub)]

I don't think it is possible to get a None value with current juju and the corrected config.yaml, because the type is int and Juju enforces this. But better safe than sorry.

diff --git a/config.yaml b/config.yaml
index 94daff9..1c5565a 100644
--- a/config.yaml
+++ b/config.yaml
@@ -170,7 +170,7 @@ options:
       You need enough space for this many backups plus one more, as
       an old backup will only be removed after a new one has been
       successfully made to replace it.
-  wal_e_backup_stale_warn_threshold:
+  wal_e_backup_stale_crit_threshold:
     type: int
     default: 300
     description: >
diff --git a/reactive/postgresql/nagios.py b/reactive/postgresql/nagios.py
index 7fe3134..415e687 100644
--- a/reactive/postgresql/nagios.py
+++ b/reactive/postgresql/nagios.py
@@ -126,13 +126,19 @@ def update_nrpe_config():
                   user='postgres', group='postgres')
 
     # retrieve the threshold values from the charm config
-    check_warn_threshold = helpers.config_yaml().get(
+    check_warn_threshold = hookenv.config().get(
         'wal_e_backup_stale_warn_threshold'
     )
-    check_crit_threshold = helpers.config_yaml().get(
+    check_crit_threshold = hookenv.config().get(
         'wal_e_backup_stale_crit_threshold'
     )
 
+    # deal with empty stale backup thresholds
+    if check_crit_threshold is None:
+        check_crit_threshold = 300
+    if check_warn_threshold is None:
+        check_warn_threshold = 600
+
     # create the cron job to run the above
     check_cron = "*/2 * * * * postgres {}".format(check_script_path)
     check_cron_path = '/etc/cron.d/postgres-stale-wal-e-check'