update logwatch readme

- update to reference new log tags
- adjust count to separate tally messages
- add CF-ERR tag reports
- re-add level 5 reporting detail

README.md

@@ -1,39 +1,53 @@
 # CloudflareDDNS <!-- omit in toc -->
 
-Update your CloudFlare DNS records with your current (dynamic) IP address via
+Update your *existing* Cloudflare DNS records with your current (dynamic) IP address via systemd timers and a (POSIX) shell script.
-systemd timers and a bash script.
-
-**NOTE: You can rename *cfddns.sh* to anything you want, the script will
-auto-update itself.  However, you MUST update the systemd service file
-*(cfddns.service)* *ExecStart* line manually as explained below.**
 
 ## Contents <!-- omit in toc -->
 
-- [cfddns&#46;sh](#cfddns46sh)
+<!-- toc -->
-        - [Installation:](#installation)
+
-        - [Usage:](#usage)
+- [Prerequisites](#prerequisites)
+- [cfddns&#46;sh](#cfddns%2346sh)
+  * [Installation](#installation)
+  * [Usage](#usage)
+    + [Parameters](#parameters)
+- [Cloudflare credentials file](#cloudflare-credentials-file)
+  * [File structure](#file-structure)
+  * [Bearer token](#bearer-token)
+  * [Zone ID](#zone-id)
 - [cfddns.service](#cfddnsservice)
-        - [IP4 and/or IP6](#ip4-andor-ip6)
+  * [IP4 and/or IP6](#ip4-andor-ip6)
-                - [Examples](#examples)
+    + [Examples](#examples)
 - [cfddns.timer](#cfddnstimer)
-        - [Activation](#activation)
+  * [Activation](#activation)
-- [The log file](#the-log-file)
+- [Logging](#logging)
-        - [Using Logwatch to monitor this script](#using-logwatch-to-monitor-this-script)
+  * [Using Logwatch to monitor this script](#using-logwatch-to-monitor-this-script)
-        - [Using Logrotate to control log file size](#using-logrotate-to-control-log-file-size)
+  * [Using Logrotate to control log file size](#using-logrotate-to-control-log-file-size)
 - [Final thoughts](#final-thoughts)
 
+<!-- tocstop -->
+
+## Prerequisites
+
+This script requires that `curl` and `jq` are installed. `curl` is used to interact with the Cloudflare API and `jq` is used to efficiently and reliably construct/deconstruct the JSON strings and arrays which is how the Cloudflare API communicates. In most cases you can install these programs using your package manager running as root or via sudo. On Debian/Ubuntu, for example, you would run:
+
+```bash
+apt install -y curl jq
+```
+
+While the script does *not* require root privileges, you will need sudo/root access to install the *systemd* service and timer.
+
 ## cfddns&#46;sh
 
-### Installation:
+### Installation
 
-I recommend putting this script in your */usr/local/bin* directory or somewhere
+I recommend putting this script in your */usr/local/bin* directory or somewhere else in your path so it's easy to run.
-else in your path so it's easy to run.
 
 1. Copy the script file to your desired path and rename if you want.
 
    ```Bash
    sudo cp cfddns.sh /usr/local/bin/   # just copy it
-   sudo cp cfddns.sh /usr/local/bin/myscript.sh   # copy and rename
+   sudo cp cfddns.sh /usr/local/bin/cloudflare-update.sh   # copy and rename (choose any name)
    ```
 
 2. Make it executable:
@@ -42,112 +56,77 @@ else in your path so it's easy to run.
    sudo chmod +x /usr/local/bin/cfddns.sh
    ```
 
-### Usage:
+> Note: You can rename *cfddns.sh* to anything you want, the script will auto-update itself. However, you **must** manually update the systemd service file (*cfddns.service*) `ExecStart` line as [explained below](#cfddns.service).
 
-If you run the script with no parameters, it will display the help screen.  The
+### Usage
-script accepts several parameters with 2 being required.  The parameters are
+
-summarized here.  You can access the help screen and example usage screens by
+If you run the script with no parameters, it will display the help screen.  The script accepts several parameters with only one (1) being required.  The parameters are summarized below.  You can access the help screen and example usage screens by running:
-running:
 
 ```Bash
-cfddns.sh -h   # display help screen
+cfddns.sh --help   # display help screen
-cfddns.sh -x   # show script usage examples
+cfddns.sh --examples   # show script usage examples
 ```
 
-**-f: full path and filename containing account details (REQUIRED)**
+#### Parameters
-This is the full path to a plain-text file containing your CloudFlare account
-details.  This file must contain 3 lines in the following order:
 
-- authorized email address
+|Parameter|Description|Default|Required?|
-   This is an email address that is permitted to login to your CloudFlare account.
+|---|---|---|:---:|
-- global api-key
+|-r<br>--record<br>--records|The fully qualified hostname(s) that should be updated with new IP addresses. You can supply a comma-delimited list (no spaces) or just one. Note that the script can only update *either* A *or* AAAA records during a single run so you may need to batch your hostnames, depending on your set-up.<br>N.B. This script will only update *existing* host records, it will **not** create new ones!|none|YES|
-   You can get your Global API-key by going to your CloudFlare dashboard,
+|-c<br>--cred<br>--creds<br>--credentials<br>-f|Full path to your CloudFlare credentials file. This file contains your access token and zone id. See the [relevant section](#cloudflare-credentials-file) of this readme for more information.|scriptPath/cloudflare.credentials|NO|
-   clicking on your profile picture in the upper-right and opening your profile.
+|-i<br>--ip<br>--ip-address<br>-a<br>--address|The IP address that should be used to update Host A/AAAA records. If you omit this value, the script will attempt to auto-detect your public IP4/IP6 address and use that as appropriate. Use this option to manually force a specific IP to be used or when auto-detection fails. Note that the script does *not* check your IP addresses for correctness or proper form!|IP4 auto-detect|NO|
-   Scroll down to to the API Keys section.  Click on the 'View' button next to
+|-4<br>--ip4<br>--ipv4|Update Host A records only (IP4). The script can only update *either* A *or* AAAA records in a single run. If you specify this and also use the IP6 mode switch, the most recent one will take effect.|Enabled, update A records|NO|
-   Global API Key.
+|-6<br>--ip6<br>--ipv6|Update Host AAAA records only (IP6). The script can only update *either* A *or* AAAA records in a single run. If you specify this and also use the IP4 mode switch, the most recent one will take effect.|Disabled, update A records|NO|
-- zone identifier
+|||||
-   You should be able to find this on the Overview page of your CloudFlare dashboard.
+|-l<br>--log|Full path where the script should save its log. Recommend */var/log/scriptName.log*|scriptPath/scriptName.log|NO|
+|--nc<br>--no-color<br>--no-colour|Do not use ANSI colour-coding when writing to the log. This is useful if you review the logs using a reader that does not support ANSI colour-coding and instead displays control symbols which makes your log difficult to read.|Disabled, do colourful logs|NO|
+|--log-console|Output the log to the console instead of a log file. You may use `--nc` with this option also.|Disabled, write to log file|NO|
+|--no-log|Do not write a log file or output to the console. You will not have **any** feedback from the script if you run in this mode so you will not know if updates were successful or not. I’m not really sure why you’d want this option, but it’s available.|Disabled, write to log file|NO|
+|-h<br>--help<br>-?|Display built-in help screen explaining these same parameters.|||
+|--examples|Display some usage examples. Sometimes it's just easier to understand by seeing rather than reading.|||
 
-Your completed file should look like (these are not real credentials):
+## Cloudflare credentials file
+
+This repo includes a sample credentials file (*cloudflare.credentials* at the root of the repo) with pretty self-explanatory variable names. The script reads this file to get the credentials it needs to connect to your Cloudflare account and update DNS entries. It should be noted that the script is designed to use a *bearer token* and **not** your username/password or your Global API token! Let’s break this down in case things are a little fuzzy still...
+
+### File structure
+
+The file is a basic shell script variables file. Make sure you **do not** put spaces between the variable name, equal sign and the value. Also, **do not** add any executable code since it will be run! The file should contain values for the following two variables:
+
+| Variable | Value                                                        |
+| -------- | ------------------------------------------------------------ |
+| cfKey    | The bearer token granting access to *edit* the DNS records of the zone (domain) in question. |
+| cfZoneId | The Cloudflare Zone ID of the zone (domain) you wish to update. |
+
+You can add comments if you’d like since the script will ignore them. In the end, your file should look something like this, but obviously with your data instead of this nonsense sample information:
+
+```ini
+#
+# Cloudflare token for my.domain.tld
+#
+
+cfKey=_dLuyyRNaKN8SLG4-csmNYYfC39nnCmPVA7aYUJj
+cfZoneId=83d564234134513245311b23412331dd
 
-```
-johndoe@example.com
-e7882db52804aca6fab22780e055b97056466
-492af8aa69f8c44baf043342c74319fd
 ```
 
-Your global API-key is equivalent to your account password, so you should
+You can save the file as anything you like and anywhere you’d like as long as you inform the script of its location using the `--credentials` parameter. By default, the script will look for a file named *cloudflare.credentials* in the same path as the script.
-secure this file by changing the owner of the file to root
 
-```Bash
+### Bearer token
-chown root:root path/to/filename
-```
 
-and then restricting access to only the root user
+I chose to use an API bearer token instead of a username/password or Global API token for security reasons. Your username/password and Global API token provide unfettered access to your account so if anyone gets hold of them, they can do anything to your account. An API bearer token, by contrast, can only do what you authorize it to do and you can revoke it at any time. Therefore, I suggest making a bearer token that is based on the “Edit zone DNS” template and restricted to the specific domain/zone you wish to update. Cloudflare provides an [excellent article](https://support.cloudflare.com/hc/en-us/articles/200167836-Managing-API-Tokens-and-Keys) on how to generate this token.
 
-```Bash
+> N.B. This is a breaking change from previous versions of this script!
-chmod 600 path/to/filename
-```
 
-**-r: target DNS entry to update (REQUIRED)**
+### Zone ID
-At least one entry here is *required*.  This is the A or AAAA record you want to
-update the IP address for in your DNS zone file.  If you have multiple A or AAAA
-records you want to update, simply specifiy multiple -r parameters.
 
-*Note: You can only specify *either* A records *or* AAAA records.  You have to
+This is required by the Cloudflare API so it knows which zone you are editing and can check the permissions of the bearer token. This script only caters to one zone so likely only one domain per configuration file. If you need to update multiple zones, you can have multiple configuration files and call them as required on separate invocations of the script.
-update IP4 and IP6 records separately by running this script multiple times
-(once for A records, once for AAAA records even if the hostname is the same).*
 
-**-4 or -6: type of record to update**
+To get your Zone ID, log into your Cloudflare account and open the domain in question. On the overview page, scroll down a bit and look to the right. You will see your Zone ID listed there. Copy that string into your configuration file.
-The default option is -4 and it does not need to be specified.  This will update
-*A records* specified by the -r parameter(s).  If you specify -6, then *AAAA
-records* will updated as specified by the -r parameter(s).
 
-**-i: use the specified IP address**
-The script will auto-detect the IP address of the machine it's being run on by
-accessing an external service and asking for that service to echo the machine's
-IP address.  If running with -4, then the IP4 will be requested for echo.  If
-running with -6, then the IP6 address will be requested for echo.
-
-This parameter let's you bypass auto-detection and specify a particular address
-to be used instead.  This parameter is most useful if running the script
-manually to update a particular DNS record.  In most cases, you'd want your
-current IP address auto-detected (i.e. omit this parameter).
-
-*NOTE: The address you supply is NOT checked for correctness.  Ensure you're
-supplying a valid address of the correct type based on your choice of -4 or -6
-parameter!*
-
-**-l (lower-case L): specify where the log file should be written**
-The script will default to writing it's log file in the same directory as the
-script is located.  It will use it's own name and append a *.log* extension.
-So, the default name for the log file is *cfddns.log*.  If you rename the script
-*something&#46;sh* then the generated log file name will be *something.log*.
-
-This can be messy if you store the script in /usr/local/bin/ as recommended.
-Therefore, it's recommended you choose a different location for
-the log file (*/var/log/cfddns.log* is recommended).
-
-```Ini
-[Service]
-...
-ExecStart=/usr/local/bin/cfddns.sh -l /var/log/cfddns.log ...
-```
-
-**-h: display help**
-Displays the help screen, which is an abbreviated version of this section you
-are currently reading.
-
-**-x: display examples**
-This is the best way to learn how this script works.  Several examples are
-provided
 
 ## cfddns.service
 
-This file **must** be copied to your */etc/systemd/system* directory (or
+This file **must** be copied to your */etc/systemd/system* directory (or equivalent directory if you're not running Debian/Ubuntu). If you change the name of the cfddns&#46;sh file, you must update the filename in the `ExecStart` line as shown below:
-equivalent directory if you're not running debian/ubuntu).  If you change the
-name of the cfddns&#46;sh file, you must update the filename in the *ExecStart*
-line as shown below:
 
 ````Ini
 ...
@@ -157,66 +136,58 @@ ExecStart=/full/path/to/your/renamed.file -parameter1 -parameter2 -parameter...
 ...
 ````
 
+Don’t forget to reload systemd after copying this file so it is recognized by the system! On most systems you can do this by running the following as root or via sudo:
+
+```bash
+systemctl daemon-reload
+```
+
 ### IP4 and/or IP6
 
-The cfddns.service file includes two *ExecStart* lines, one without a specified
+The cfddns.service file includes two *ExecStart* lines, one without a specified IP-protocol parameter (default IP4) and the other with the -6 (IP6) parameter. The service will run the cfddns&#46;sh script in default (IP4) mode with specified parameters first and then will run the script again in IP6 mode with specified parameters.
-IP-protocol parameter (default IP4) and the other with the -6 (IP6) parameter.
-The service will run the cfddns&#46;sh script in default (IP4) mode with specified
-parameters first and then will run the script again in IP6 mode with specified
-parameters.
 
 *Note: The parameters *can be different* in each case.*
 
 #### Examples
 
 1. **Only update A records**
-  Update *mail<span>.example.com* A record with the current IP of this machine and log
+    Update *mail<span>.example.com* A record with the current auto-detected public IP4 address of this machine and log results to */var/log/cfddns.log*.
-  results to */var/log/cfddns.log*.
   
     ```Ini
    [Service]
    Type=oneshot
-   ExecStart=/usr/local/bin/cfddns.sh -f /root/accountDetails.cloudflare -r mail.example.com -l /var/log/cfddns.log
+   ExecStart=/usr/local/bin/cfddns.sh -c /root/cloudflare.credentials -r mail.example.com -l /var/log/cfddns.log
    ...
    ```
 
 2. **Only update AAAA records**
-  Update *git<span>.example.com* and *mail<span>.example.com* AAAA records with the current
+    Update *git<span>.example.com* and *mail<span>.example.com* AAAA records with the current auto-detected public IP6 address of this machine. Log will be stored in the same directory as the script file (/usr/local/bin).
-  IP6 address of this machine. Log will be stored in the same directory as the
-  script file (/usr/local/bin).
 
     ```Ini
     [Service]
     Type=oneshot
-   ExecStart=/usr/local/bin/cfddns.sh -6 -f /home/johndoe/account.details -r git.example.com -r mail.example.com
+    ExecStart=/usr/local/bin/cfddns.sh -6 -c /home/johndoe/cloudflare.credentials -r git.example.com,mail.example.com
     ...
     ```
 
 3. **Update A records then AAAA records**
-   Update *mail<span>.example.com* A record with current IP address of this machine and
+   Update *mail<span>.example.com* A record with auto-detected public IP4 address of this machine and write to log file stored at */var/log/DDNS_IP4.log*.  Then, update both *mail<span>.example.com* and *git<span>.example.com* AAAA records with the specified IP6 address and write to log file at */var/log/DDNS_IP6.log*.
-   write to log file stored at */var/log/DDNS_IP4.log*.  Then, update both
-   *mail<span>.example.com* and *git<span>.example.com* AAAA records with current IP address
-   of this machine and write to log file at */var/log/DDNS_IP6.log*.
    
    ```Ini
    [Service]
    Type=oneshot
-   ExecStart=/usr/local/bin/cfddns.sh -f /dir1/account.cf -r mail.example.com -l /var/log/DDNS_IP4.log
+   # update IP4 addresses
-   ExecStart=/usr/local/bin/cfddns.sh -6 -f /dir2/cloudflare.details -r mail.example.com -r git.example.com -l /var/log/DDNS_IP6.log
+   ExecStart=/usr/local/bin/cfddns.sh -c /dir1/account.cf -r mail.example.com -l /var/log/DDNS_IP4.log
+   # update IP6 addresses
+   ExecStart=/usr/local/bin/cfddns.sh -6 -c /dir2/cloudflare.details -r mail.example.com,git.example.com --ip fd3f:e6db:9817:df84::a001 -l /var/log/DDNS_IP6.log
    ...
    ```
 
 ## cfddns.timer
 
-This is the timer file that tells your system how often to call the
+This is the timer file that tells your system how often to call the *cfddns.service* file which runs the *cfddns&#46;sh* script.  By default, the timer is set for 5 minutes after the system boots up (to allow for other processes to initialize even on slower systems like a RasPi) and is then run every 15 minutes thereafter.  Remember when setting your timer that Cloudflare limits API calls to 1200 every 5 minutes.
-cfddns.service file which runs the cfddns&#46;sh script.  By default, the timer is
-set for 5 minutes after the system boots up (to allow for other processes to
-initialize even on slower systems like a RasPi) and is then run every 15
-minutes thereafter.  Remember when setting your timer that CloudFlare limits
-API calls to 1200 every 5 minutes.
 
-You can change the timer by modifying the relevant section of the cfddns.timer
+You can change the timer by modifying the relevant section of the *cfddns.timer* file:
-file:
 
 ```Ini
 [Timer]
@@ -224,22 +195,18 @@ OnBootSec=5min
 OnUnitActiveSec=15min
 ```
 
-*OnBootSec* is how long to wait after the system boots up before executing
+*OnBootSec* is how long to wait after the system boots up before executing the *cfddns.service*.  *OnUnitActiveSec* will then wait the specified time from that first (after boot) call or after the timer is explicitly started before calling *cfddns.service* again.  I recommend setting OnUnitActiveSec to a low value (like 2 minutes) for testing then setting it to a more reasonable time (like 15
-the cfddns.service.  *OnUnitActiveSec* will then wait the specified time from that
-first (after boot) call or after the timer is explicitly started before calling
-cfddns.service again.  I recommend setting OnUnitActiveSec to a low value (like
-2 minutes) for testing then setting it to a more reasonable time (like 15
 minutes) after everything is working.
 
 ### Activation
 
-You can start the timer system immediately via systemctl
+You can start the timer system immediately via *systemctl*
 
 ```Bash
 systemctl start cfddns.timer
 ```
 
-and can enable it to start automatically on system start up by typing
+and can enable it to start automatically on boot by typing
 
 ```Bash
 systemctl enable cfddns.timer
@@ -251,55 +218,45 @@ You can check the status of the timer via systemctl also
 systemctl status cfddns.timer
 ```
 
-It is NOT necessary to enable/start the *cfddns.service*, only the timer needs
+It is NOT necessary to enable/start the *cfddns.service*, only the timer needs to be active.
-to be active.
 
-## The log file
+## Logging
 
-The script logs every major action it takes and provides details on any errors
+The script logs every major action it takes and provides details on any errors it encounters in the log file (see the [parameters section](#parameters) for details about setting log location and name).  If errors are encountered, they are colour coded red and an explanation of the error code is provided.
-it encounters in the log file (see the above section for details on log file
-location and name).  If errors are encountered, they are colour coded red and
-an explanation of the error code is provided.
 
-While the log file is as terse as I felt reasonable, you may still want to
+While the log file is as terse as I felt reasonable, you may still want to configure any log-watch programs to further filter things for you so you don't have to review this log as part of your daily routine.  To make that easier, the following conventions are observed in the log file and can be used to program your log-watch system:
-configure any log-watch programs to further filter things for you so you don't
-have to review this log as part of your daily routine.  To make that easier, the
-following conventions are observed in the log file and can be used to program
-your log-watch system:
 
-- Errors always appear as **-- [ERROR] text and error code here --**
+- Specific update process errors: **[TIMESTAMP] ERR: message**
-- Errors are followed by an explanation of the specific error code on a new line
+  - These can be counted/filtered separately if you only care about update errors and not any other errors.
-- A clean exit appears as **-- [SUCCESS] some text here --**
+- Error messages: **[TIMESTAMP] ERROR: message (code: number)**
-- The script always starts a new set of log entries with **-- Start CloudFlare
+  - Only one summary error message will be displayed for any/all update errors. This message contains a tally of failed updates. If you want to count individual update errors, filter for the above process error message format.
-  DDNS script execution --**
+  - While process error messages only relate to updates, these general error messages are logged for a variety of error conditions so it’s a good idea to include them in any filters.
-- All log file entries start with a time-stamp in **[square brackets]**
+- Cloudflare API error messages:  **[TIMESTAMP] CF-ERR: message (code: cf-error-code)**
+  - These are only logged when update process errors occur so that you can see exactly what the Cloudflare API is complaining about.
+- Specific update process warnings: **[TIMESTAMP] WARN: message**
+  - These can be counted/filtered separately from general warning messages. Presently, there are *no* general warning messages.
+- Warning messages: **[TIMESTAMP] WARNING: message**
+  - Summary of each type of warning. Contains a tally of the specific warning.
+  - Currently, warnings are only issued for hostnames that are not found (i.e. update process warnings).
+- Success messages: **[TIMESTAMP] SUCCESS: message**
+  - Each successful update generates a success message. There is no process or tally message.
+- Already up-to-date: **[TIMESTAMP] IP address for {fqdn} is already up-to-date**
+  - Already up-to-date host entries generate a success message but you may still want to filter for them separately using this criteria.
+- A session log always starts with **[TIMESTAMP] -- Cloudflare DDNS update-script: starting --**
+- A successful session log always ends with **[TIMESTAMP] -- Cloudflare DDNS update-script: completed successfully --**
+- A session ending with errors always ends with **[TIMESTAMP] -- Cloudflare DDNS update-script: completed with error(s) --**
 
 ### Using Logwatch to monitor this script
 
-If you are using the Logwatch package to monitor your system, **see the README
+If you are using the Logwatch package to monitor your system, see the README in the */etc/logwatch* folder for details about the pre-configured service files already done for you :-)
-in the /etc/logwatch folder** for details about the pre-configured service files
-already done for you :-)
 
 ### Using Logrotate to control log file size
 
-Logrotate is pre-installed on standard Debian/Ubuntu distributions and is a great
+Logrotate is pre-installed on standard Debian/Ubuntu distributions and is a great way to automatically rotate your log files and control how many old logs you keep on your system so they don't accumulate and eat up your disk space. I've included a sample configuration file you can copy to your */etc/logrotate.d/* folder.  This file is set up to rotate your logs once a week, keep 3 weeks worth of history (compressed) and delete all logs older than that.  The configuration file is located in this git archive at
-way to automatically rotate your log files and control how many old logs you
+*/etc/logrotate.d/cfddns* and is fully commented to help you customize it to suit your needs.
-keep on your system so they don't accumulate and eat up your disk space.
-
-I've included a sample configuration file you can copy to your
-*/etc/logrotate.d/* folder.  This file is set up to rotate your logs once a
-week, keep 3 weeks worth of history (compressed) and delete all logs older than
-that.  The configuration file is located in this git archive at
-*/etc/logrotate.d/cfddns* and is fully commented to help you customize it to
-suit your needs.
 
 ## Final thoughts
 
-I'm by no means an expert in BASH scripting and I only program/script as a hobby
+Hopefully this helps you with an easy and reliable way to  update your Cloudflare DNS entries with a dynamic IP address. Please feel free to comment and provide feedback and suggestions to make this script better!
-when I find stuff that irritates me and no other good solutions seem easily
-available.  So, by all means, please comment, provide feedback and suggestions
-to make this script better!  Thanks, I hope this helps someone else out!
 
-Please check out my blog at
+Please check out my blog at [https://mytechiethoughts.com](https://mytechiethoughts.com) where I tackle problems like this all the time and find free/cheap solutions to tech problems.
-[https://mytechiethoughts.com](https://mytechiethoughts.com) where I tackle
-problems like this all the time and find free/cheap solutions to tech problems.

cfddns.service

@@ -4,8 +4,8 @@ After=network.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/bin/cfddns.sh -f /path/to/account.details -r server.domain.tld -l /var/log/cfddns.log
+ExecStart=/usr/local/bin/cfddns.sh -c /path/to/account.details -r server.domain.tld -l /var/log/cfddns.log
-ExecStart=/usr/local/bin/cfddns.sh -6 -f /path/to/account.details -r server.domain.tld -l /var/log/cfddns.log
+ExecStart=/usr/local/bin/cfddns.sh -6 -c /path/to/account.details -r server.domain.tld -l /var/log/cfddns.log
 
 [Install]
 WantedBy=multi-user.target

cfddns.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# update CloudFlare DNS records with current (dynamic) IP address
+# update Cloudflare DNS records with current (dynamic) IP address
 #    Script by Asif Bacchus <asif@bacchus.cloud>
 #    Last modified: May 7, 2021
 #
@@ -47,36 +47,142 @@ badParam() {
 
 exitError() {
     case "$1" in
+    3)
+        errMsg="Unable to connect to Cloudflare servers. This is probably a temporary networking issue. Please try again later."
+        ;;
     10)
         errMsg="Unable to auto-detect IP address. Try again later or supply the IP address to be used."
         ;;
     20)
-        errMsg="CloudFlare authorized email address (cfEmail) is either null or undefined. Please check your CloudFlare credentials file."
+        errMsg="Cloudflare authorized email address (cfEmail) is either null or undefined. Please check your Cloudflare credentials file."
         ;;
     21)
-        errMsg="CloudFlare authorized API key (cfKey) is either null or undefined. Please check your CloudFlare credentials file."
+        errMsg="Cloudflare authorized API key (cfKey) is either null or undefined. Please check your Cloudflare credentials file."
         ;;
     22)
-        errMsg="CloudFlare zone id (cfZoneId) is either null or undefined. Please check your CloudFlare credentials file."
+        errMsg="Cloudflare zone id (cfZoneId) is either null or undefined. Please check your Cloudflare credentials file."
         ;;
     25)
-        errMsg="Unable to query CloudFlare account. Please re-check your credentials and try again later."
+        errMsg="Cloudflare API error. Please review any 'CF-ERR:' lines in this log for details."
         ;;
-    98)
+    26)
-        errMsg="One or more domain updates failed. Please review this log file for details."
+        errMsg="${failedHostCount} host update(s) failed. Any 'CF-ERR:' lines noted in this log may help determine what went wrong."
         ;;
     *)
-        printf "%s[%s] ERROR: An unspecified error occurred. Exiting.%s\n" "$err" "$(stamp)" "$norm" >>"$logFile"
+        writeLog error "An unspecified error occurred. (code: 99)"
+        printf "%s[%s] -- Cloudflare DDNS update-script: completed with error(s) --%s\n" "$err" "$(stamp)" "$norm" >>"$logFile"
         exit 99
         ;;
     esac
-    printf "%s[%s] ERROR: %s (code: %s)%s\n" "$err" "$(stamp)" "$errMsg" "$1" "$norm" >>"$logFile"
+    writeLog error "$errMsg" "$1"
-    printf "%s[%s] -- CloudFlare DDNS update-script: execution completed with error(s) --%s\n" "$err" "$(stamp)" "$norm" >>"$logFile"
+    printf "%s[%s] -- Cloudflare DDNS update-script: completed with error(s) --%s\n" "$err" "$(stamp)" "$norm" >>"$logFile"
     exit "$1"
 }
 
 exitOK() {
-    printf "%s[%s] -- CloudFlare DDNS update-script: execution complete --%s\n" "$ok" "$(stamp)" "$norm" >>"$logFile"
+    printf "%s[%s] -- Cloudflare DDNS update-script: completed successfully --%s\n" "$ok" "$(stamp)" "$norm" >>"$logFile"
+    exit 0
+}
+
+listCFErrors() {
+    # extract error codes and messages in separate variables, replace newlines with underscores
+    codes="$(printf "%s" "$1" | jq -r '.errors | .[] | .code' | tr '\n' '_')"
+    messages="$(printf "%s" "$1" | jq -r '.errors | .[] | .message' | tr '\n' '_')"
+
+    # iterate codes and messages and assemble into coherent messages in log
+    while [ -n "$codes" ] && [ -n "$messages" ]; do
+        # get first code and message in respective sets
+        code="${codes%%_*}"
+        message="${messages%%_*}"
+
+        # update codes and messages sets by removing first item in each set
+        codes="${codes#*_}"
+        messages="${messages#*_}"
+
+        # output to log
+        writeLog cf "$message" "$code"
+    done
+}
+
+scriptExamples() {
+    newline
+    printf "Update Cloudflare DNS host A/AAAA records with current IP address.\n"
+    printf "%sUsage: %s --records host.domain.tld[,host2.domain.tld,...] [parameters]%s\n\n" "$bold" "$scriptName" "$norm"
+    textBlock "${magenta}--- usage examples ---${norm}"
+    newline
+    textBlockSwitches "${scriptName} -r myserver.mydomain.net"
+    textBlock "Update Cloudflare DNS records for myserver.mydomain.net with the auto-detected public IP4 address. Credentials will be expected in the default location and the log will be written in the default location also."
+    newline
+    textBlockSwitches "${scriptName} -r myserver.mydomain.net -6"
+    textBlock "Same as above, but update AAAA host records with the auto-detected public IP6 address."
+    newline
+    textBlockSwitches "${scriptName} -r myserver.mydomain.net,myserver2.mydomain.net -l /var/log/cfddns.log --nc"
+    textBlock "Update DNS entries for both listed hosts using auto-detected IP4 address. Write a non-coloured log to '/var/log/cfddns.log'."
+    newline
+    textBlockSwitches "${scriptName} -r myserver.mydomain.net,myserver2.mydomain.net -l /var/log/cfddns.log --ip6 --ip fd21:7a62:2737:9c3a::a151"
+    textBlock "Update DNS AAAA entries for listed hosts using the *specified* IP address. Write a colourful log to the location specified."
+    newline
+    textBlockSwitches "${scriptName} -r myserver.mydomain.net -c /root/cloudflare.creds -l /var/log/cfddns.log --ip 1.2.3.4"
+    textBlock "Update DNS A entry for listed hostname with the provided IP address. Read cloudflare credentials file from specified location, save log in specified location."
+    newline
+    textBlockSwitches "${scriptName} -r myserver.mydomain.net -c /root/cloudflare.creds -l /var/log/cfddns.log -6 -i fd21:7a62:2737:9c3a::a151"
+    textBlock "Exact same as above, but change the AAAA record. This is how you run the script once for IP4 and again for IP6."
+    exit 0
+}
+
+scriptHelp() {
+    newline
+    printf "Update Cloudflare DNS host A/AAAA records with current IP address.\n"
+    printf "%sUsage: %s --records host.domain.tld[,host2.domain.tld,...] [parameters]%s\n\n" "$bold" "$scriptName" "$norm"
+    textBlock "The only required parameter is '--records' which is a comma-delimited list of hostnames to update. However, there are several other options which may be useful to implement."
+    textBlock "Parameters are listed below and followed by a description of their effect. If a default value exists, it will be listed on the following line in (parentheses)."
+    newline
+    textBlock "${magenta}--- script related parameters ---${norm}"
+    newline
+    textBlockSwitches "-c | --cred | --creds | --credentials | -f (deprecated, backward-compatibility)"
+    textBlock "Path to file containing your Cloudflare *token* credentials. Please refer to the repo README for more information on format, etc."
+    textBlockDefaults "(${accountFile})"
+    newline
+    textBlockSwitches "-l | --log"
+    textBlock "Path where the log file should be written."
+    textBlockDefaults "(${logFile})"
+    newline
+    textBlockSwitches "--nc | --no-color | --no-colour"
+    textBlock "Switch value. Disables ANSI colours in the log. Useful if you review the logs using a reader that does not parse ANSI colour codes."
+    textBlockDefaults "(disabled: print logs in colour)"
+    newline
+    textBlockSwitches "--log-console"
+    textBlock "Switch value. Output log to console (stdout) instead of a log file. Can be combined with --nc if desired."
+    textBlockDefaults "(disabled: output to log file)"
+    newline
+    textBlockSwitches "--no-log"
+    textBlock "Switch value. Do not create a log (i.e. no console, no file). You will not have *any* output from the script if you choose this option, so you will not know if updates succeeded or failed."
+    textBlockDefaults "(disabled: output to log file)"
+    newline
+    textBlockSwitches "-h | --help | -?"
+    textBlock "Display this help screen."
+    newline
+    textBlockSwitches "--examples"
+    textBlock "Show some usage examples."
+    newline
+    textBlock "${magenta}--- DNS related parameters ---${norm}"
+    newline
+    textBlockSwitches "-r | --record | --records"
+    textBlock "Comma-delimited list of hostnames for which IP addresses should be updated in Cloudflare DNS. This parameter is REQUIRED. Note that this script will only *update* records, it will not create new ones. If you supply hostnames that are not already defined in DNS, the script will log a warning and will skip those hostnames."
+    newline
+    textBlockSwitches "-i | --ip | --ip-address | -a | --address"
+    textBlock "New IP address for DNS host records. If you omit this, the script will attempt to auto-detect your public IP address and use that."
+    newline
+    textBlockSwitches "-4 | --ip4 | --ipv4"
+    textBlock "Switch value. Update Host 'A' records (IP4) only. Note that this script can only update either A *or* AAAA records. If you need to update both, you'll have to run the script once in IP4 mode and again in IP6 mode. If you specify both this switch and the IP6 switch, the last one specified will take effect."
+    textBlockDefaults "(enabled: update A records)"
+    newline
+    textBlockSwitches "-6 | --ip6 | --ipv6"
+    textBlock "Switch value. Update Host 'AAAA' records (IP6) only. Note that this script can only update either A *or* AAAA records. If you need to update both, you'll have to run the script once in IP4 mode and again in IP6 mode. If you specify both this switch and the IP4 switch, the last one specified will take effect."
+    textBlockDefaults "(disabled: update A records)"
+    newline
+    textBlock "Please refer to the repo README for more detailed information regarding this script and how to automate and monitor it."
+    newline
     exit 0
 }
 
@@ -84,102 +190,61 @@ stamp() {
     (date +%F" "%T)
 }
 
-scriptHelp() {
+newline() {
-    newline
+    printf "\n"
-    printf "Update CloudFlare DNS host A/AAAA records with current IP address.\n"
-    printf "%sUsage: %s --records host.domain.tld[,host2.domain.tld,...] [parameters]%s\n\n" "$bold" "$scriptName" "$norm"
-    textblock "The only required parameter is '--records' which is a comma-delimited list of hostnames to update. However, there are several other options which may be useful to implement."
-    textblock "Paramters are listed below and followed by a description of their effect. If a default value exists, it will be listed on the following line in (parentheses)."
-    newline
-    textblock "${magenta}--- script related parameters ---${norm}"
-    newline
-    textblockSwitches "-c | --cred | --creds | --credentials | -f (deprecated, backward-compatability)"
-    textblock "Path to file containing your CloudFlare *token* credentials. Please refer to the repo README for more information on format, etc."
-    textblockDefaults "(${accountFile})"
-    newline
-    textblockSwitches "-l | --log"
-    textblock "Path where the log file should be written."
-    textblockDefaults "(${logFile})"
-    newline
-    textblockSwitches "--nc | --no-color | --no-colour"
-    textblock "Switch value. Disables ANSI colours in the log. Useful if you review the logs using a reader that does not parse ANSI colour codes."
-    textblockDefaults "(disabled: print logs in colour)"
-    newline
-    textblockSwitches "--log-console"
-    textblock "Switch value. Output log to console (stdout) instead of a log file. Can be combined with --nc if desired."
-    textblockDefaults "(disabled: output to log file)"
-    newline
-    textblockSwitches "--no-log"
-    textblock "Switch value. Do not create a log (i.e. no console, no file). You will not have *any* output from the script if you choose this option, so you will not know if updates succeeded or failed."
-    textblockDefaults "(disabled: output to log file)"
-    newline
-    textblockSwitches "-h | --help | -?"
-    textblock "Display this help screen."
-    newline
-    textblockSwitches "--examples"
-    textblock "Show some usage examples."
-    newline
-    textblock "${magenta}--- DNS related parameters ---${norm}"
-    newline
-    textblockSwitches "-r | --record | --records"
-    textblock "Comma-delimited list of hostnames for which IP addresses should be updated in CloudFlare DNS. This parameter is REQUIRED. Note that this script will only *update* records, it will not create new ones. If you supply hostnames that are not already defined in DNS, the script will log a warning and will skip those hostnames."
-    newline
-    textblockSwitches "-i | --ip | --ip-address | -a | --address"
-    textblock "New IP address for DNS host records. If you omit this, the script will attempt to auto-detect your public IP address and use that."
-    newline
-    textblockSwitches "-4 | --ip4 | --ipv4"
-    textblock "Switch value. Update Host 'A' records (IP4) only. Note that this script can only update either A *or* AAAA records. If you need to update both, you'll have to run the script once in IP4 mode and again in IP6 mode. If you specify both this switch and the IP6 switch, the last one specified will take effect."
-    textblockDefaults "(enabled: update A records)"
-    newline
-    textblockSwitches "-6 | --ip6 | --ipv6"
-    textblock "Switch value. Update Host 'AAAA' records (IP6) only. Note that this script can only update either A *or* AAAA records. If you need to update both, you'll have to run the script once in IP4 mode and again in IP6 mode. If you specify both this switch and the IP4 switch, the last one specified will take effect."
-    textblockDefaults "(disabled: update A records)"
-    newline
-    textblock "Please refer to the repo README for more detailed information regarding this script and how to automate and monitor it."
-    newline
-    exit 0
 }
 
-scriptExamples() {
+textBlock() {
-    newline
-    printf "Update CloudFlare DNS host A/AAAA records with current IP address.\n"
-    printf "%sUsage: %s --records host.domain.tld[,host2.domain.tld,...] [parameters]%s\n\n" "$bold" "$scriptName" "$norm"
-    textblock "${magenta}--- usage examples ---${norm}"
-    newline
-    textblockSwitches "${scriptName} -r myserver.mydomain.net"
-    textblock "Update CloudFlare DNS records for myserver.mydomain.net with the auto-detected public IP4 address. Credentials will be expected in the default location and the log will be written in the default location also."
-    newline
-    textblockSwitches "${scriptName} -r myserver.mydomain.net -6"
-    textblock "Same as above, but update AAAA host records with the auto-detected public IP6 address."
-    newline
-    textblockSwitches "${scriptName} -r myserver.mydomain.net,otherserver.mydomain.net -l /var/log/cfddns.log --nc"
-    textblock "Update DNS entries for both listed hosts using auto-detected IP4 address. Write a non-coloured log to '/var/log/cfddns.log'."
-    newline
-    textblockSwitches "${scriptName} -r myserver.mydomain.net,otherserver.mydomain.net -l /var/log/cfddns.log --ip6 --ip fd21:7a62:2737:9c3a::a151"
-    textblock "Update DNS AAAA entries for listed hosts using the *specified* IP address. Write a colourful log to the location specified."
-    newline
-    textblockSwitches "${scriptName} -r myserver.mydomain.net -c /root/cloudflare.creds -l /var/log/cfddns.log --ip 1.2.3.4"
-    textblock "Update DNS A entry for listed hostname with the provided IP address. Read cloudflare credentials file from specified location, save log in specified location."
-    newline
-    textblockSwitches "${scriptName} -r myserver.mydomain.net -c /root/cloudflare.creds -l /var/log/cfddns.log -6 -i fd21:7a62:2737:9c3a::a151"
-    textblock "Exact same as above, but change the AAAA record. This is how you run the script once for IP4 and again for IP6."
-    exit 0
-}
-
-textblock() {
     printf "%s\n" "$1" | fold -w "$width" -s
 }
 
-textblockDefaults() {
+textBlockDefaults() {
     printf "%s%s%s\n" "$yellow" "$1" "$norm"
 }
 
-textblockSwitches() {
+textBlockSwitches() {
     printf "%s%s%s\n" "$cyan" "$1" "$norm"
 }
 
-newline() {
+writeLog() {
-    printf "\n"
+    case "$1" in
+    cf)
+        printf "[%s] CF-ERR: %s (code: %s)\n" "$(stamp)" "$2" "$3" >>"$logFile"
+        ;;
+    err)
+        printf "%s[%s] ERR: %s%s\n" "$err" "$(stamp)" "$2" "$norm" >>"$logFile"
+        ;;
+    error)
+        printf "%s[%s] ERROR: %s (code: %s)%s\n" "$err" "$(stamp)" "$2" "$3" "$norm" >>"$logFile"
+        ;;
+    process)
+        printf "%s[%s] %s... %s" "$cyan" "$(stamp)" "$2" "$norm" >>"$logFile"
+        ;;
+    process-done)
+        printf "%s%s%s\n" "$cyan" "$2" "$norm" >>"$logFile"
+        ;;
+    process-error)
+        printf "%sERROR%s\n" "$err" "$norm" >>"$logFile"
+        ;;
+    process-warning)
+        printf "%s%s%s\n" "$warn" "$2" "$norm" >>"$logFile"
+        ;;
+    stamped)
+        printf "[%s] %s\n" "$(stamp)" "$2" >>"$logFile"
+        ;;
+    success)
+        printf "%s[%s] SUCCESS: %s%s\n" "$ok" "$(stamp)" "$2" "$norm" >>"$logFile"
+        ;;
+    warn)
+        printf "%s[%s] WARN: %s%s\n" "$warn" "$(stamp)" "$2" "$norm" >>"$logFile"
+        ;;
+    warning)
+        printf "%s[%s] WARNING: %s%s\n" "$warn" "$(stamp)" "$2" "$norm" >>"$logFile"
+        ;;
+    *)
+        printf "%s\n" "$2" >>"$logFile"
+        ;;
+    esac
 }
 
 ### default variable values
@@ -196,7 +261,7 @@ ip6=0
 ip4DetectionSvc="http://ipv4.icanhazip.com"
 ip6DetectionSvc="http://ipv6.icanhazip.com"
 invalidDomainCount=0
-failedDomainCount=0
+failedHostCount=0
 
 ### process startup parameters
 if [ -z "$1" ]; then
@@ -234,7 +299,7 @@ while [ $# -gt 0 ]; do
         colourizeLogFile=0
         ;;
     -c | --cred* | -f)
-        # path to CloudFlare credentials file
+        # path to Cloudflare credentials file
         if [ -n "$2" ]; then
             if [ -f "$2" ] && [ -s "$2" ]; then
                 accountFile="${2%/}"
@@ -295,7 +360,7 @@ fi
 [ -z "$dnsRecords" ] && badParam errMsg "You must specify at least one DNS record to update. Exiting."
 # verify credentials file exists and is not empty (default check)
 if [ ! -f "$accountFile" ] || [ ! -s "$accountFile" ]; then
-    badParam errMsg "Cannot find CloudFlare credentials file (${accountFile}). Exiting."
+    badParam errMsg "Cannot find Cloudflare credentials file (${accountFile}). Exiting."
 fi
 # turn off log file colourization if parameter is set
 if [ "$colourizeLogFile" -eq 0 ]; then
@@ -311,50 +376,52 @@ fi
 
 ### initial log entries
 {
-    printf "%s[%s] -- CloudFlare DDNS update-script: execution starting --%s\n" "$ok" "$(stamp)" "$norm"
+    printf "%s[%s] -- Cloudflare DDNS update-script: starting --%s\n" "$ok" "$(stamp)" "$norm"
-    printf "%sParameters:\n" "$magenta"
+    printf "Parameters:\n"
     printf "script path: %s\n" "$scriptPath/$scriptName"
     printf "credentials file: %s\n" "$accountFile"
-} >>"$logFile"
 
-if [ "$ip4" -eq 1 ]; then
+    if [ "$ip4" -eq 1 ]; then
-    printf "mode: IP4\n" >>"$logFile"
+        printf "mode: IP4\n"
-elif [ "$ip6" -eq 1 ]; then
+    elif [ "$ip6" -eq 1 ]; then
-    printf "mode: IP6\n" >>"$logFile"
+        printf "mode: IP6\n"
-fi
+    fi
 
-# detect and report IP address
+    # detect and report IP address
-if [ -z "$ipAddress" ]; then
+    if [ -z "$ipAddress" ]; then
         # detect public ip address
         if [ "$ip4" -eq 1 ]; then
             if ! ipAddress="$(curl -s $ip4DetectionSvc)"; then
-            printf "ddns ip address: %serror%s\n" "$err" "$norm" >>"$logFile"
+                printf "ddns ip address:%s ERROR%s\n" "$err" "$norm"
                 exitError 10
             fi
         fi
         if [ "$ip6" -eq 1 ]; then
             if ! ipAddress="$(curl -s $ip6DetectionSvc)"; then
-            printf "ddns ip address: %serror%s\n" "$err" "$norm" >>"$logFile"
+                printf "ddns ip address:%s ERROR%s\n" "$err" "$norm"
                 exitError 10
             fi
         fi
-    printf "ddns ip address (detected): %s\n" "$ipAddress" >>"$logFile"
+        printf "ddns ip address (detected): %s\n" "$ipAddress"
-else
+    else
-    printf "ddns ip address (supplied): %s\n" "$ipAddress" >>"$logFile"
+        printf "ddns ip address (supplied): %s\n" "$ipAddress"
-fi
+    fi
 
-# iterate DNS records to update
+    # iterate DNS records to update
-dnsRecordsToUpdate="$dnsRecords$dnsSeparator"
+    dnsRecordsToUpdate="$(printf '%s' "${dnsRecords}" | sed "s/${dnsSeparator}*$//")$dnsSeparator"
-while [ "$dnsRecordsToUpdate" != "${dnsRecordsToUpdate#*${dnsSeparator}}" ] && { [ -n "${dnsRecordsToUpdate%%${dnsSeparator}*}" ] || [ -n "${dnsRecordsToUpdate#*${dnsSeparator}}" ]; }; do
+    while [ -n "$dnsRecordsToUpdate" ] && [ "$dnsRecordsToUpdate" != "$dnsSeparator" ]; do
         record="${dnsRecordsToUpdate%%${dnsSeparator}*}"
         dnsRecordsToUpdate="${dnsRecordsToUpdate#*${dnsSeparator}}"
-    printf "updating record: %s\n" "$record" >>"$logFile"
-done
 
-printf "(end of parameter list)%s\n" "$norm" >>"$logFile"
+        if [ -z "$record" ]; then continue; fi
+        printf "updating record: %s\n" "$record"
+    done
 
-### read CloudFlare credentials
+    printf "(end of parameter list)\n"
-printf "[%s] Reading CloudFlare credentials... " "$(stamp)" >>"$logFile"
+} >>"$logFile"
+
+### read Cloudflare credentials
+writeLog process "Reading Cloudflare credentials"
 case "$accountFile" in
 /*)
     # absolute path, use as-is
@@ -367,78 +434,105 @@ case "$accountFile" in
     . "./$accountFile"
     ;;
 esac
-if [ -z "$cfEmail" ]; then
+if [ -z "$cfKey" ]; then
-    printf "%sERROR%s\n" "$err" "$norm" >>"$logFile"
+    writeLog process-error
-    exitError 20
-elif [ -z "$cfKey" ]; then
-    printf "%sERROR%s\n" "$err" "$norm" >>"$logFile"
     exitError 21
-elif [ -z "$cfZoneId" ]; then
+fi
-    printf "%sERROR%s\n" "$err" "$norm" >>"$logFile"
+if [ -z "$cfZoneId" ]; then
+    writeLog process-error
     exitError 22
 fi
-printf "DONE%s\n" "$norm" >>"$logFile"
+writeLog process-done "DONE"
 
-### check if records to be updated exist and if they need updating, update as required
+### connect to Cloudflare and do what needs to be done!
 dnsRecordsToUpdate="$dnsRecords$dnsSeparator"
 if [ "$ip4" -eq 1 ]; then
     recordType="A"
 elif [ "$ip6" -eq 1 ]; then
     recordType="AAAA"
 fi
-while [ "$dnsRecordsToUpdate" != "${dnsRecordsToUpdate#*${dnsSeparator}}" ] && { [ -n "${dnsRecordsToUpdate%%${dnsSeparator}*}" ] || [ -n "${dnsRecordsToUpdate#*${dnsSeparator}}" ]; }; do
+
+# iterate hosts to update
+while [ -n "$dnsRecordsToUpdate" ] && [ "$dnsRecordsToUpdate" != "$dnsSeparator" ]; do
     record="${dnsRecordsToUpdate%%${dnsSeparator}*}"
     dnsRecordsToUpdate="${dnsRecordsToUpdate#*${dnsSeparator}}"
-    printf "[%s] Processing %s... " "$(stamp)" "$record" >>"$logFile"
+
-    # check for existing record, else exit with error (this script does NOT create new records, only updates them!)
+    if [ -z "$record" ]; then continue; fi
-    if ! cfResult="$(curl -s -X GET "https://api.cloudflare.com/client/v4/zones/${cfZoneId}/dns_records?name=${record}&type=${recordType}" \
+    writeLog process "Processing ${record}"
+
+    # exit if curl/network error
+    if ! cfLookup="$(curl -s -X GET "https://api.cloudflare.com/client/v4/zones/${cfZoneId}/dns_records?name=${record}&type=${recordType}" \
         -H "Authorization: Bearer ${cfKey}" \
         -H "Content-Type: application/json")"; then
-        printf "%sERROR%s\n" "$err" "$norm" >>"$logFile"
+        writeLog process-error
+        exitError 3
+    fi
+
+    # exit if API error
+    # exit here since API errors on GET request probably indicates authentication error which would affect all remaining operations
+    # no reason to continue processing other hosts and pile-up errors which might look like a DoS attempt
+    cfSuccess="$(printf "%s" "$cfLookup" | jq -r '.success')"
+    if [ "$cfSuccess" = "false" ]; then
+        writeLog process-error
+        listCFErrors "$cfLookup"
         exitError 25
     fi
-    resultCount="$(printf "%s" "$cfResult" | jq '.result_info.count')"
+
+    resultCount="$(printf "%s" "$cfLookup" | jq '.result_info.count')"
+
+    # skip to next host if cannot find existing host record (this script *updates* only, does not create!)
     if [ "$resultCount" = "0" ]; then
-        printf "%sNOT FOUND%s\n" "$warn" "$norm" >>"$logFile"
+        # warn if record of host not found
-        printf "%s[%s] WARNING: Cannot find existing record to update for DNS entry: %s%s\n" "$warn" "$(stamp)" "$record" "$norm" >>"$logFile"
+        writeLog process-warning "NOT FOUND"
+        writeLog warn "Cannot find existing record to update for DNS entry: ${record}"
         invalidDomainCount=$((invalidDomainCount + 1))
-    else
+        continue
-        objectId=$(printf "%s" "$cfResult" | jq -r '.result | .[] | .id')
+    fi
-        currentIpAddr=$(printf "%s" "$cfResult" | jq -r '.result | .[] | .content')
+
-        printf "FOUND: IP = %s\n" "$currentIpAddr" >>"$logFile"
+    objectId=$(printf "%s" "$cfLookup" | jq -r '.result | .[] | .id')
-        # check if record needs updating
+    currentIpAddr=$(printf "%s" "$cfLookup" | jq -r '.result | .[] | .content')
+    writeLog process-done "FOUND: IP = ${currentIpAddr}"
+
+    # skip to next hostname if record already up-to-date
     if [ "$currentIpAddr" = "$ipAddress" ]; then
-            printf "%s[%s] IP address for %s is already up-to-date%s\n" "$ok" "$(stamp)" "$record" "$norm" >>"$logFile"
+        writeLog stamped "IP address for ${record} is already up-to-date"
-        else
+        continue
+    fi
+
     # update record
-            printf "%s[%s] Updating IP address for %s... " "$cyan" "$(stamp)" "$record" >>"$logFile"
+    writeLog process "Updating IP address for ${record}"
     updateJSON="$(jq -n --arg key0 content --arg value0 "${ipAddress}" '{($key0):$value0}')"
+
+    # exit if curl/network error
     if ! cfResult="$(curl -s -X PATCH "https://api.cloudflare.com/client/v4/zones/${cfZoneId}/dns_records/${objectId}" \
         -H "Authorization: Bearer ${cfKey}" \
         -H "Content-Type: application/json" \
         --data "${updateJSON}")"; then
-                printf "%sERROR%s\n" "$err" "$norm" >>"$logFile"
+        writeLog process-error
-                exitError 25
+        exitError 3
     fi
-            updateSuccess="$(printf "%s" "$cfResult" | jq '.success')"
+
-            if [ "$updateSuccess" = "true" ]; then
+    # note update success or failure
-                printf "DONE%s\n" "$norm" >>"$logFile"
+    cfSuccess="$(printf "%s" "$cfResult" | jq '.success')"
-                printf "%s[%s] SUCCESS: IP address for %s updated%s\n" "$ok" "$(stamp)" "$record" "$norm" >>"$logFile"
+    if [ "$cfSuccess" = "true" ]; then
+        writeLog process-done "DONE"
+        writeLog success "IP address for ${record} updated."
     else
-                printf "%sFAILED%s\n" "$err" "$norm" >>"$logFile"
+        writeLog process-error
-                printf "%s[%s] ERROR: Unable to update IP address for %s%s\n" "$err" "$(stamp)" "$record" "$norm" >>"$logFile"
+        listCFErrors "$cfResult"
-                failedDomainCount=$((failedDomainCount + 1))
+        writeLog err "Unable to update IP address for ${record}"
-            fi
+        # do not exit with error, API error here is probably an update issue specific to this host
-        fi
+        # increment counter and note it after all processing finished
+        failedHostCount=$((failedHostCount + 1))
     fi
 done
 
 # exit
 if [ "$invalidDomainCount" -ne 0 ]; then
-    printf "%s[%s] -- WARNING: %s invalid domain(s) were supplied for updating --%s\n" "$warn" "$(stamp)" "$invalidDomainCount" "$norm" >>"$logFile"
+    writeLog warning "${invalidDomainCount} invalid host(s) supplied for updating."
 fi
-if [ "$failedDomainCount" -ne 0 ]; then
+if [ "$failedHostCount" -ne 0 ]; then
-    exitError 98
+    exitError 26
 else
     exitOK
 fi
@@ -447,11 +541,10 @@ fi
 # 0:    normal exit, no errors
 # 1:    invalid or unknown parameter
 # 2:    cannot find or access required external program(s)
+# 3:    curl error (probably connection)
 # 10:   cannot auto-detect IP address
-# 20:   accountFile has a null or missing cfEmail variable
 # 21:   accountFile has a null or missing cfKey variable
 # 22:   accountFile has a null or missing cfZoneId variable
-# 25:   unable to query CloudFlare account
+# 25:   Cloudflare API error
-# 97:   script completed with warnings
+# 26:   one or more updates failed
-# 98:   one or more updates failed
 # 99:   unspecified error occurred

cloudflare.credentials

@@ -2,6 +2,5 @@
 # CloudFlare token for my.domain.tld
 #
 
-cfEmail=email@server.tld
 cfKey=_dLuyyRNaKN8SLG4-csmNYYfC39nnCmPVA7aYUJj
 cfZoneId=83d564234134513245311b23412331dd

etc/logwatch/README.md

@@ -1,45 +1,50 @@
 # Using Logwatch to monitor Cloudflare DDNS updater script <!-- omit in toc -->
 
-The Cloudflare DDNS update script's log file has been set up so that utilities
+The Cloudflare DDNS update script's log file has been set up so that utilities like Logwatch can easily parse it.  In order to make that happen, a LogFile Group file, Service and Script have to be created for Logwatch to generate reports.  The correct (general) directory structure has been created in this git archive already.  Below are the details of each file.
-like Logwatch can easily parse it.  In order to make that happen, a LogFile
+
-Group file, Service and Script have to be created for Logwatch to generate
+You can implement this setup easily by copying it into your */etc/logwatch* directory and then modifying the files as necessary:
-reports.  The correct (general) directory structure has been created in this git
+
-archive already.  Below are the details of each file.
+```bash
+cd /etc/logwatch
+cp -R /path/to/CloudflareDDNS_repo/etc/logwatch/* ./
+```
+
+If you need help getting logwatch installed and set-up, please [check out my blog post](#https://mytechiethoughts.com/linux/easily-monitor-your-logs-using-logwatch/).
 
 ## Contents <!-- omit in toc -->
 
+<!-- toc -->
+
 - [LogFile Group file (/etc/logwatch/conf/logfiles/cfddns.conf)](#logfile-group-file-etclogwatchconflogfilescfddnsconf)
-    - [Log file location](#log-file-location)
+  * [Log file location](#log-file-location)
-    - [Archive location and name format](#archive-location-and-name-format)
+  * [Archive location and name format](#archive-location-and-name-format)
-    - [External script for timestamp processing](#external-script-for-timestamp-processing)
+  * [External script for timestamp processing](#external-script-for-timestamp-processing)
 - [Service definition file (/etc/logwatch/conf/services/cfddns.conf)](#service-definition-file-etclogwatchconfservicescfddnsconf)
-    - [LogFile Group file definition](#logfile-group-file-definition)
+  * [LogFile Group file definition](#logfile-group-file-definition)
-    - [Report title](#report-title)
+  * [Report title](#report-title)
-    - [Detail level](#detail-level)
+  * [Detail level](#detail-level)
 - [Service script (/etc/logwatch/scripts/services/cfddns)](#service-script-etclogwatchscriptsservicescfddns)
-    - [Detail levels](#detail-levels)
+  * [Detail levels](#detail-levels)
 - [Timestamp processing script (/etc/logwatch/scripts/shared/sqfullstampanywhere)](#timestamp-processing-script-etclogwatchscriptssharedsqfullstampanywhere)
-    - [The time format specification](#the-time-format-specification)
+  * [The time format specification](#the-time-format-specification)
-    - [The search REGEX](#the-search-regex)
+  * [The search REGEX](#the-search-regex)
 - [Testing](#testing)
 - [Final thoughts](#final-thoughts)
 
+<!-- tocstop -->
+
 ## LogFile Group file (/etc/logwatch/conf/logfiles/cfddns.conf)
 
 ### Log file location
 
-Update this as needed to point to the location and name of the log file
+Update this as needed to point to the location and name of the log file generated by the updater script.  Remember, by default, the log file is created in the same directory as the script itself.
-generated by the updater script.  Remember, by default, the log file is created
-in the same directory as the script itself.
 
 ```Ini
 LogFile = /path/to/your/cfddns.log
 ...
 ```
 
-Best practices suggest you use the *-l*
+Best practices suggest you use the `--log` flag to change this location to something like */var/log/cfddns.log*, for example.  In that case, the entry would look like:
-flag to change this location to something like */var/log/cfddns.log*, for
-example.  In that case, the entry would look like:
 
 ```Ini
 LogFile = /var/log/cfddns.log
@@ -48,12 +53,7 @@ LogFile = /var/log/cfddns.log
 
 ### Archive location and name format
 
-If you want Logwatch to process old (archived) log files generated by something
+If you want Logwatch to process old (archived) log files generated by something like *Logrotate*, then you have to specify the location and file name format of those files.  I've included the generalized compressed format of such rotated files as the default in the script.  Suppose you store your log files in the recommended location (*/var/log/*) and are using *Logrotate* with compression enabled, the archive line would look like:
-like *Logrotate*, then you have to specify the location and file name format of
-those files.  I've included the generalized compressed format of such rotated
-files as the default in the script.  Suppose you store your log files in the
-recommended location (*/var/log/*) and are using *Logrotate* with compression
-enabled, the archive line would look like:
 
 ```Ini
 ...
@@ -61,21 +61,15 @@ Archive = /var/log/cfddns.log.?.gz
 ...
 ```
 
-This would tell Logwatch, when the archive option is set to true, that your
+This would tell Logwatch, when the archive option is set to true, that your *cfddns.log* files are archived as: *cfddns.log.1.gz*, *cfddns.log.2.gz*, etc. and are all located in */var/log/*.
-*cfddns.log* files are archived as: *cfddns.log.1.gz*, *cfddns.log.2.gz*, etc.
-and are all located in */var/log/*.
 
-**Note: This line is totally optional and only used if you set the archive
+> Note: This line is totally optional and only used if you set the archive option in Logwatch to true.  You can comment/delete this line if you wish.
-option in Logwatch to true.  You can comment/delete this line if you wish.**
 
 ### External script for timestamp processing
 
-Since the log file uses a non-standard (according to Logwatch) method of
+Since the log file uses a non-standard (according to Logwatch) method of date-stamping, a custom filter had to be created.  See the [relevant](#timestamp-processing-script-etclogwatchscriptssharedsqfullstampanywhere) section of this document for more information.
-datestamping, a custom filter had to be created.  See the
-[relevant](#timestamp-processing-script-etclogwatchscriptssharedsqfullstampanywhere)
-section of this document for more information.
 
-The script file is called with an *\** before the filename.
+The script file is called with an asterisk (*\**) before the filename.
 
 ```Ini
 ...
@@ -83,31 +77,24 @@ The script file is called with an *\** before the filename.
 ...
 ```
 
-If you change the name of this file, you will have to change this line.
+If you change the name of this file, you will have to change this line. Remember that whatever you type here as a name is converted to all-lowercase so your filename should be all lowercase also.
-Remember that whatever you type here as a name is converted to all-lowercase
-so your filename should be all lowercase also.
 
 ## Service definition file (/etc/logwatch/conf/services/cfddns.conf)
 
 ### LogFile Group file definition
 
-The service file needs to know what group of log files it is responsible for
+The service file needs to know what group of log files it is responsible for processing.  This MUST match the name of your *LogFile Group file*:
-processing.  This MUST match the name of your *LogFile Group file*:
 
 ```Ini
 LogFile = cfddns
 ...
 ```
 
-If you change your LogFile Group filename, then update it here too without the
+If you change your LogFile Group filename, then update it here also without the *.conf* extension.
-*.conf* extension.
 
 ### Report title
 
-The Logwatch output file (html or text) is divided into sections.  You can
+The Logwatch output file (html or text) is divided into sections.  You can define the title to be anything that has meaning for you.  I have arbitrarily chosen *"CloudFlare DDNS update"* but you can change it to anything you want by modifying the line:
-define the title to be anything that has meaning for you.  I have arbitrarily
-chosen *"CloudFlare DDNS update"* but you can change it to anything you want by
-modifying the line:
 
 ```Ini
 ...
@@ -115,10 +102,7 @@ Title = "CloudFlare DDNS update"
 ```
 ### Detail level
 
-If you want to set the *detail* level of this service differently from your
+If you want to set the *detail* level of this service differently from your other services (which will use the *--detail* switch value or the value in your *logwatch.conf*), then you can define that level here.  By default, it appears like this in the service configuration file:
-other services (which will use the *--detail* switch value or the value in your
-*logwatch.conf*), then you can define that level here.  By default, it appears
-like this in the service configuration file:
 
 ```Ini
 ...
@@ -127,8 +111,7 @@ like this in the service configuration file:
 # Detail = 0
 ```
 
-Simply change it to the value you want enforced.  For example, here I'm setting
+Simply change it to the value you want enforced.  For example, here I'm setting it to output level 5 regardless of whatever settings everything else is using.
-it to output level 5 regardless of whatever settings everything else is using.
 
 ```Ini
 # Override the detail level for this service
@@ -138,74 +121,54 @@ Detail = 5
 
 ## Service script (/etc/logwatch/scripts/services/cfddns)
 
-Logwatch calls any script with a name that **matches the service name**.  You'll
+Logwatch calls any script with a name that **matches the service name**.  You'll notice that I just named everything *cfddns* to keep things simple.  You can change this to whatever you want.  If you changed the service name to *"cloudflare*.conf", for example, you would have to rename this script file to "*cloudflare*" with no extension.  Note: The script is a PERL file (note the
-notice that I just named everything *cfddns* to keep things simple.  You can
-change this to whatever you want, however.  If you changed the service name to
-*"cloudflare*.conf", for example, you would have to rename this script file to
-"*cloudflare*" with no extension.  Note: The script is a PERL file (note the
 shebang) but it can be written in any language.
 
-In essence, Logwatch just spits out the log file(s) defined in the LogFile Group
+In essence, Logwatch just spits out the log file(s) defined in the LogFile Group file as standard input (STDIN) for the script and then takes whatever is output (STDOUT) from the script to assemble into its report.
-file as standard input (STDIN) for the script and then takes whatever is output
-(STDOUT) from the script to assemble into it's report.
 
 ### Detail levels
 
 The script supports four (4) detail levels as follows:
 
 - **Level 0: Summary output only**
-  - This will display an aggregate total of certain logged elements.  It will
+  - This will display a simple aggregate of status message categories over the reporting period:
-    display the total number of hostnames (A and AAAA) that are already
+    - Entries successfully updated
-    up-to-date, those that needed updating, those successfully updated and the
+    - Entries already up-to-date
-    total number of errors (of any type) encountered by the script.  All totals
+    - Hosts failed to update
-    are relative to the reporting period Logwatch is using (--range parameter).
+    - Undefined hosts (i.e. requested to update but record doesn’t exist)
+    - Total warning messages
+    - Total errors
     
-    **This is the recommended reporting level.**  It does not take up much space
+  - **This is the recommended reporting level.**  It does not take up much space and is quick to read.  If you see successful updates and/or up-to-date numbers match what you expect and no errors logged, then you can assume things are working properly. If the numbers aren’t right or you see errors/warnings, then you can investigate the situation by consulting the actual logs or increasing the detail level in logwatch.
-    and is quick to read.  If you see successful updates match the number of
+  
-    needed updates and no errors logged, then things are working properly.  If
+  - For example: Let’s suppose you are running an update every 15 minutes. Doing the math...
-    you notice errors, you should consult the full logs.
+    $$
+    (update_{success}) + (update_{up-to-date}) = (24h \times 60min)/15min = 96
+    $$
+    Therefore, you expect to see ‘Entries successfully updated’ and ‘Entries already up-to-date’ total *96*. If that’s the case and no errors or warnings are logged, things are ok. Pretty easy, right? That’s why this is the recommended filter setting.
 - **Levels 1-4: Critical messages**
-  - This uses the data which is summarized by Level 0 but outputs the actual
-    messages in the log file.  For example, you will see the actual text of the
-    errors logged instead of just a total number of errors.  This level of
-    reporting is useful when *initially* monitoring the script's operation since
-    you can see the actual text of any generated errors.
-- **Level 5: Verbose (debugging) output**
-  - Like the previous level, this outputs the actual messages found in the log
-    file.  However, it also includes *[INFO] tags* which contain logged messages
-    such as the detected IP address and the specific names of any hostnames not
-    found in your Cloudflare account, etc.  This level of reporting is useful in
-    diagnosing why errors are occurring or if you just want more insight into
-    how the script works.
   
-    **This level of output will make your Logwatch reports longer and consume
+  - This uses the data which is summarized by Level 0 but outputs the *actual messages* in the log file.  For example, you will see the actual text of the errors logged instead of just a total number of errors.  This level of reporting is useful when *initially* monitoring the script's operation since you can see the text of any generated errors.
-    more of your time to review. You should not use this level day-to-day.**
+  - Levels 1, 2, 3 & 4 are identical so pick your favourite number.
+- **Level 5: Verbose output**
+  - Like the previous level, this outputs the actual messages found in the log file.  However, it also includes *CF-ERR* tags and tally count messages. This can help you pinpoint why the Cloudflare API is rejecting your requests by letting you see things like authentication errors or malformed addresses, etc.
+  - Honestly, this is not much more information than L1-L4 and is often a better choice while debugging any issues since you get the Cloudflare API messages.
+  - This level of output is much more verbose than the summary report. It also takes *much* more time and patience to review so it is only recommended when you’re dealing with issues.
+  - This is *not* recommended for day-to-day or routine reports.
 - **Levels 6+: Complete log file dump**
-  - Any number greater than 5 passed as a detail level will trigger the script
+  - Any number greater than 5 passed as a detail level will trigger the script to dump the entire log file out to Logwatch line-by-line.  This is really only useful during debugging or dealing with serious issues where you do not have access to the actual log file. While this is an exact ‘echo’ of the log file, it likely will not be colour-coded which makes it harder to review.
-    to dump the entire log file out to Logwatch line-by-line.  This is useful
+  - **Use this detail level only when you need to see the entire log file and cannot otherwise access the log file.**
-    only if you are debugging an issue and cannot get access to the actual raw
+  - Depending on how your logwatch treats this log dump, you may see gibberish control codes like *\e[0m;]*. If this is the case, run the script with the `--no-colour` or `--nc` option to remove ANSI colour formatting.
-    log file itself.  The actual log file is colour-coded which makes it much
-    easier to read for debugging purposes.
-
-    **Use this detail level only when you need to see the entire log file and
-    cannot otherwise access the log file.**
 
 ## Timestamp processing script (/etc/logwatch/scripts/shared/sqfullstampanywhere)
 
-This is basically a modified version of the '*applyeurodate*' script that comes
+This is basically a modified version of the '*applyeurodate*' script that comes with Logwatch.  It had to be modified to search within [square brackets] and to accept characters coming before the stamp (i.e. ANSI colour codes).  If you change the '**stamp**' variable in the updater script to update the timestamp to your liking (which to totally fine!) then you'll probably have to update this file.  There are two lines you need to modify to suit your new '**stamp**' variable.
-with Logwatch.  It had to be modified to search within [square brackets] and to
+
-accept characters coming before the stamp (i.e. ANSI colour codes).  If you
+> This entire section is only applicable if you are a very curious person or if you change the hard-coded ‘stamp’ function in the script. If you did not make any changes and you like a little mystery in your life, you can safely skip this entire section.
-change the '**stamp**' variable in the updater script to update the timestamp to
-your liking (which to totally fine!) then you'll probably have to update this
-file.  There are two lines you need to modify to suit your new '**stamp**'
-variable.
 
 ### The time format specification
 
-'*$SearchDate*' is the variable used in the PERL script to do exactly what it
+'*$SearchDate*' is the variable used in the PERL script to do exactly what it says, search for the date stamp.  I have it set up to look for the format '*year-month-date hour:minute:second*'.  Note, we don't care about brackets or anything here, we're just defining the format of the date/time stamp.
-says, search for the date stamp.  I have it set up to look for the format
-'*year-month-date hour:minute:second*'.  Note, we don't care about brackets or
-anything here, we're just defining the format of the date/time stamp.
 
 ```Perl
 ...
@@ -213,9 +176,7 @@ $SearchDate = TimeFilter('%Y-%m-%d %H:%M:%S');
 ...
 ```
 
-If you changed the '**stamp**' variable so it was formatted as '*month/day/year
+If you changed the '**stamp**' variable so it was formatted as '*month/day/year hour:minute*' (ex: '*[09/27/2018 18:38]*') then you'd update the **$SearchDate** variable as follows (note: no mention of the square brackets!):
-hour:minute*' (ex: '*[09/27/2018 18:38]*') then you'd update the **$SearchDate**
-variable as follows (note: no mention of the square brackets!):
 
 ```Perl
 ...
@@ -225,8 +186,7 @@ $SearchDate = TimeFilter('%m/%d/%Y %H:%M');
 
 ### The search REGEX
 
-The PERL script uses a '*regular expression*' (REGEX) to search within the log file for
+The PERL script uses a '*regular expression*' (REGEX) to search within the log file for '*$SearchDate*'.  For the default date stamp, this specification looks like:
-'*$SearchDate*'.  For the default datestamp, this specification looks like:
 
 ```Perl
 ...
@@ -234,12 +194,7 @@ if ($ThisLine =~ m/\[$SearchDate\] /o) {
 ...
 ```
 
-The REGEX appears between '*m/*' and '*/o*'.  In this case, it searches for
+The REGEX appears between '*m/*' and '*/o*'.  In this case, it searches for '*$SearchDate*' inside [square brackets] appearing anywhere on the line.  This is because ANSI colour-codes often appear before the date stamp in the default log file.  If you have modified this so that your date stamp appears at the beginning of the line and in the example format in the section above (using slashes instead of dashes) then you'd rewrite this REGEX as follows:
-'*$SearchDate*' inside [square brackets] appearing anywhere on the line.  This
-is because ANSI colour-codes often appear before the datestamp in the default
-log file.  If you have modified this so that your datestamp appears at the
-beginning of the line and in the example format in the section above (using
-slashes instead of dashes) then you'd rewrite this REGEX as follows:
 
 ```Perl
 ...
@@ -265,16 +220,14 @@ if ($ThisLine =~ m/^$SearchDate /o) {
 
 ## Testing
 
-Run *logwatch --help* and note the options.  You can test just this service
+Run *logwatch --help* and note the options.  You can test just this service locally on your screen with the following command (assuming you kept default names for everything):
-locally on your screen with the following command (assuming you kept default
-names for everything):
 
 ```Bash
 # Summary output, entire duration of log file
 logwatch --service cfddns --output stdout --format text --range all --detail 0
 
 # Minimal detail, yesterday only
-logwatch --service cfddns --output stdout --format text --range yesterday --detail 3
+logwatch --service cfddns --output stdout --format text --range yesterday --detail 1
 
 # Verbose output, today only
 logwatch --service cfddns --output stdout --format text --range today --detail 5
@@ -282,7 +235,4 @@ logwatch --service cfddns --output stdout --format text --range today --detail 5
 
 ## Final thoughts
 
-That's it!  I'm a horrible PERL programmer so if anyone can optimize/improve the
+That's it!  I'm a horrible PERL programmer so if anyone can optimize/improve the script file used for Logwatch then please do it!  Otherwise, I hope this made sense and helped you integrate the updater script with Logwatch for easy monitoring :-)
-script file used for Logwatch then please do it!  Otherwise, I hope this made
-sense and helped you integrate the updater script with Logwatch for easy
-monitoring :-)

etc/logwatch/scripts/services/cfddns

@@ -4,7 +4,7 @@
 # $Id$
 #############################################################################
 # Log: CloudFlare updater script (cfddns)
-# Revision 1.0  2018/09/26
+# Revision 2.1  2021/05/08
 # Written by Asif Bacchus
 #############################################################################
 
@@ -17,9 +17,11 @@ my $detailLevel = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0;
 
 ### Declare variables
 my $summaryErr;
-my $summaryStatusUpToDate;
+my $summaryFailedUpdate;
-my $summaryStatusNeedsUpdating;
+my $summaryInvalidHost;
-my $summarySuccess;
+my $summaryUpdated;
+my $summaryUpToDate;
+my $summaryWarning;
 
 my %reportHash = ();
 my $key;
@@ -29,32 +31,44 @@ my $key;
 if ($detailLevel == 0) {
     ### process logfile and summarize message types
     while (defined(my $ThisLine = <STDIN>)) {
-        if ($ThisLine =~ /\-- \[ERROR\] /) {
+        if ($ThisLine =~ /ERR: Unable to update IP address/) {
+            $summaryFailedUpdate++;
+        }
+        elsif ($ThisLine =~ /ERROR: /) {
             $summaryErr++;
         }
-        elsif ($ThisLine =~ /up-to-date./) {
+        elsif ($ThisLine =~ /WARN: Cannot find existing record/) {
-            $summaryStatusUpToDate++;
+            $summaryInvalidHost++;
         }
-        elsif ($ThisLine =~ /needs updating.../) {
+        elsif ($ThisLine =~ /WARNING: /){
-            $summaryStatusNeedsUpdating++;
+            $summaryWarning++;
         }
-        elsif ($ThisLine =~ /\-- \[SUCCESS\] /) {
+        elsif ($ThisLine =~ /SUCCESS: /) {
-            $summarySuccess++;
+            $summaryUpdated++;
+        }
+        elsif ($ThisLine =~ /already up-to-date/) {
+            $summaryUpToDate++;
         }
     }
 
     ### fill hash table with headings and summary counts
-    if ($summaryStatusNeedsUpdating > 0) {
+    if ($summaryUpdated > 0) {
-        $reportHash{"Entries needing updates"} = $summaryStatusNeedsUpdating;
+        $reportHash{"Entries successfully updated"} = $summaryUpdated;
     }
-    if ($summarySuccess > 0) {
+    if ($summaryUpToDate > 0) {
-        $reportHash{"Entries successfully updated"} = $summarySuccess;
+        $reportHash{"Entries already up-to-date"} = $summaryUpToDate;
     }
-    if ($summaryStatusUpToDate > 0) {
+    if ($summaryFailedUpdate > 0) {
-        $reportHash{"Entries already up-to-date"} = $summaryStatusUpToDate;
+        $reportHash{"Hosts failed to update"} = $summaryFailedUpdate;
+    }
+    if ($summaryInvalidHost > 0) {
+        $reportHash{"Undefined hosts"} = $summaryInvalidHost;
+    }
+    if ($summaryWarning > 0) {
+        $reportHash{"Total warnings"} = $summaryWarning;
     }
     if ($summaryErr > 0) {
-        $reportHash{"Errors encountered"} = $summaryErr;
+        $reportHash{"Total errors"} = $summaryErr;
     }
 
     ### print hash table
@@ -66,48 +80,59 @@ if ($detailLevel == 0) {
 ### a summary count
 elsif ($detailLevel >= 1 && $detailLevel <= 4) {
     while (defined(my $ThisLine = <STDIN>)) {
-        if ($ThisLine =~ /\-- \[ERROR\] /) {
+        if ($ThisLine =~ /ERR: /) {
             print $ThisLine;
         }
-        elsif ($ThisLine =~ /\-- \[STATUS\] /) {
+        elsif ($ThisLine =~ /WARN: /) {
             print $ThisLine;
         }
-        elsif ($ThisLine =~ /\-- \[SUCCESS\] /) {
+        elsif ($ThisLine =~ /SUCCESS: /) {
+            print $ThisLine;
+        }
+        elsif ($ThisLine =~ /already up-to-date/) {
             print $ThisLine;
         }
     }
 }
-### Level 5 is similiar to levels 1-4 except it also reports informational
+### Level 5 includes warning and error tally count messages and Cloudflare
-### messages such as the current working IP address and hostnames being
+### debugging messages
-### checked.  This is useful when verifying the cfddns.sh script's operation.
 elsif ($detailLevel == 5) {
     while (defined(my $ThisLine = <STDIN>)) {
-        if ($ThisLine =~ /\-- \[ERROR\] /) {
+        if ($ThisLine =~ /ERR: /) {
             print $ThisLine;
         }
-        elsif ($ThisLine =~ /\-- \[STATUS\] /) {
+        elsif ($ThisLine =~ /ERROR: /) {
             print $ThisLine;
         }
-        elsif ($ThisLine =~ /\-- \[SUCCESS\] /) {
+        elsif ($ThisLine =~ /CF-ERR: /) {
             print $ThisLine;
         }
-        elsif ($ThisLine =~ /\-- \[INFO\] /) {
+        elsif ($ThisLine =~ /WARN: /) {
+            print $ThisLine;
+        }
+        elsif ($ThisLine =~ /WARNING: /) {
+            print $ThisLine;
+        }
+        elsif ($ThisLine =~ /SUCCESS: /) {
+            print $ThisLine;
+        }
+        elsif ($ThisLine =~ /already up-to-date/) {
             print $ThisLine;
         }
     }
 }
-### Any level above 5 will echo the entire log including the debugging notes
+### Any level 6 or above will echo the entire log. The log itself is purposefully terse
-### within the script meant for troubleshooting.  Using this level of detail
+### so while this level of detail is likely rarely needed, it is still not an overwhelming
-### should only be done if you cannot view the actual log file directly for
+### level of detail.
-### whatever reason.  The actual log file is colour-coded for easier debugging.
+### Generally, however, using this level of detail should only be done if you cannot view
+### the actual log file directly for whatever reason. The actual log file is colour-coded
+### for easier debugging.
 elsif ($detailLevel > 5) {
     while (defined(my $ThisLine = <STDIN>)) {
         print $ThisLine;
     }
 }
 
-
-
 ### Exit gracefully
 exit (0);