Fix send record check bug

This change fixes a bug where the telem-record-gen probe returns 1
though the execution of the probe was successful.

Signed-off-by: Alex Jaramillo <alex.v.jaramillo@intel.com>

.gitignore

@@ -33,11 +33,13 @@ build-aux/m4/ltversion.m4
 *.trs
 /cscope.*
 /tags
-telemd
+telemprobd
+telempostd
 autoscan.log
 configure.scan
 tprobe
 hprobe
+bertprobe
 crashprobe
 journalprobe
 telem-record-gen
@@ -45,6 +47,7 @@ klogscanner
 oopsprobe
 pstoreclean
 pstoreprobe
+telem_journal
 make.out
 types_c.taghl
 src/recomp.sh

README.md

@@ -6,12 +6,15 @@ solution for Linux-based operating systems. Specifically, the front end
 component includes:
 
 - telemetrics probes that collect specific types of data from the operating
-  system.
+  system. For more info on probes go [here](./src/probes).
 
 - a library, libtelemetry, that telemetrics probes use to create telemetrics
   records and send them to the daemon for further processing.
 
-- a daemon, telemd, that prepares the records to send to a telemetrics server
+- telemprobd, a daemon that handles communication with probes and forwards records
+  to a second daemon.
+
+- telempostd, this daemon sends telemetry records to a telemetrics server
   (not included in this source tree), or spools the records on disk in case
   it's unable to successfully deliver them.
 
@@ -30,7 +33,7 @@ Build dependencies
 - elfutils, which provides libelf and libdwfl libraries..
 
 - (optional) libsystemd, for syslog-style logging to the systemd journal, and
-  socket/path activation of telemd by systemd.
+  socket/path activation of telemprobd and telempostd by systemd.
 
 
 Build and installation
@@ -60,31 +63,38 @@ and modify the /etc version.
 
 Descriptions of config options are listed below in the Usage section.
 
-Starting the daemon
+Starting the client
 ---------------------
 
+If the client was compiled with systemd support the respective activation units
+should be already in place (after a ```make install``` invocation). In this case
+the client wil start automatically when data is made available to it. i.e. when
+executing an ```/usr/bin/hprobe``` command.
+
 Method 1 (recommended):
 
 ```{r, engine='bash', count_lines}
- systemctl start telemd.socket telemd.path
+ telemctl start
 ```
 
 Note: the above invocation technically readies the service for both socket and
-path activation, so you may not see the daemon start right away.
+path activation, so you may not see an "active" status.
 
 Method 2:
 
 ```{r, engine='bash', count_lines}
-systemctl start telemd.service
+systemctl start telemprobd.service
+systemctl start telempostd.service
 ```
 
 Method 3:
 
 ```{r, engine='bash', count_lines}
-telemd &
+telemprobd &
+telempostd &
 ```
 
-Configure the daemon to autostart at boot
+Configure the client to autostart at boot
 ---------------------
 
 Method 1 (recommended):
@@ -92,22 +102,23 @@ Method 1 (recommended):
 Enable the socket-activated service and path unit:
 
 ```{r, engine='bash', count_lines}
-systemctl enable telemd.socket telemd.path
+systemctl enable telemprobd.socket telempostd.path
 ```
 
 Method 2:
 
-Enable the service itself, which automatically enables the socket and path
+Enable services, which automatically enables the socket and path
 units as well:
 
 ```{r, engine='bash', count_lines}
-systemctl enable telemd.service
+systemctl enable telemprobd.service
+systemctl enable telempostd.service
 ```
 
 Usage
 ---------------------
 
-Once the daemon is running, the telemetrics probes will be ready to use.
+Once the client is running, the telemetrics probes will be ready to use.
 
 Available probes:
 
@@ -117,11 +128,11 @@ that telemetrics-client works. It sends a "hello world" record to the server.
 * crash probe: A handler for core files that sends the corresponding backtraces
 to the server.
 
-The daemon uses the following configuration options from the configuration file:
+The client uses the following configuration options from the configuration file:
 
-* server: This specifies the web server that the daemon sends the telemetry records to
+* server: This specifies the web server that the telempostd sends the telemetry records to
 * socket_path: This specifies the path of the unix domain socket that the
-  daemon listens on for connections from the probes
+  telemprobd listens on for connections from the probes
 * spool_dir: This config option is related to spooling. If the daemon is not
   able to send the telemetry records to the backend server due to reasons such
   as the network availability, then it stores the records in a spool directory.
@@ -131,7 +142,7 @@ The daemon uses the following configuration options from the configuration file:
 ```{r, engine='bash', count_lines}
     mkdir -p /var/spool/telemetry
     chown -R telemetry:telemetry /var/spool/telemetry
-    systemctl restart telemd.service
+    systemctl restart telemprobd.service
 ```
 
 * record_expiry: This is the time in minutes after which the records in the
@@ -166,6 +177,56 @@ The daemon uses the following configuration options from the configuration file:
   threshold has been reached. Currently the options are 'drop' or 'spool', with
   spool being the default. If spool is chosen, records will be spooled and sent
   at a later time.
+* record_retention_enabled: When this key is enabled (true) the daemon saves a
+  copy of the payload on disk from all valid records. To avoid the excessive use
+  of disk space only the latest 100 records are kept. The default value for this
+  configuration key is false.
+* record_server_delivery_enabled: This key controls the delivery of records to
+  ```server```, when enabled (default value) the record will be posted to the
+  address in the configuration file. If this configuration key is disabled (false)
+  records will not be spooled or posted to backend. This configuration key can
+  be used in combination with ```record_retention_enabled``` to keep copies of
+  telemetry records locally only.
+
+
+Data reported
+---------------------
+
+The data reported by the telemetry client could be understood as two main sets:
+metadata and a payload.
+
+The metadata is used to report details of a machine's architecture. The
+following are the metadata values currently collected (Record Format Version 4):
+
+* record_format_version: version of the record, currently is 'Version 4'. This
+  value changes when new metadata is added.
+* classification: this field is used to identify the type of record sent by a
+  specific client probe; classifications use the format DOMAIN/PROBE/REST, where
+  DOMAIN is the vendor of the probe, PROBE is the probe name, and REST is a
+  probe-defined field to classify what is contained in the payload.
+* severity: this is an integer value between 1 and 4 where 1 is "low" and 4 is
+  "critical"
+* machine_id: a machine identifier that is rotate every 3 days for privacy reasons.
+* creation_timestamp: timestamp when the record was collected.
+* arch: a string describing machine architecture i.e. 'x86_64'.
+* host_type: a string with the combination of 'System Vendor', 'Product Name', and
+  'Product Version' read from dmi file system.
+* build: OS build number.
+* kernel_version: Kernel version.
+* payload_format_version: version of the payload, currently is 'Version 1'.
+* system_name: the value after 'ID=' from '/etc/os-release' (or distribution
+  provided folder)
+* board_name: a string read from dmi file system that combines 'Board Name' and
+  'Board Vendor'.
+* cpu_model: cpu model name extracted from '/proc/cpuinfo'.
+* bios_version: BIOS version.
+* event_id: an id to group multiple records if these were generated by a single
+  event occurrence.
+
+The payload as mentioned above is reported by probes. The telemetry library adds
+the metadata to the payload (done programatically when using library API) for
+more information about probes go [here](./src/probes).
+
 
 Machine id
 ---------------------
@@ -181,16 +242,82 @@ you can opt in by creating a static machine id file named
 # echo "unique machine ID" > /etc/telemetrics/opt-in-static-machine-id
 ```
 
-The telemetry daemon reads, at most, the first 32 characters from this file
+The telemetry client reads, at most, the first 32 characters from this file
 uses it for the machine id. You can put a string like 'my-machine-name' in this
-file to easily identify your machine.  Restart telemd for the machine id
+file to easily identify your machine.  Restart telemprobd for the machine id
 changes to take effect by running:
 
 ```{r, engine='bash', count_lines}
-# systemctl restart telemd.service
+# systemctl restart telemprobd.service
 ```
 
 You can switch back to the rotating machine id by deleting the override file
-and restarting the daemon.  You can do a quick test to check that your
+and restarting the client.  You can do a quick test to check that your
 machine-id has changed by running "hprobe" and verifying that a record has
 landed on your backend telemetrics server, with the specified machine id.
+
+Event Id
+----------------------
+
+This is a 32 character lowercase hexadecimal string i.e. '5de9de8d5f3c6a7d445d75ba01cc3322'.
+This header is used to group multiple records by an event id. Before this header
+every single record could have been thought of an event, however this is not always
+the case. There are "events" that trigger the creation of multiple records (i.e.
+updates). The ```event_id``` header was added for probes with the capability to
+detect events and group records based on such events. This header was added to
+```telem-record-gen``` and can be specified using the ```-e``` (```--event-id```
+long form) switch.
+
+```{r, engine=bash, count_lines}
+  -e, --event-id        Event id to use in the record
+```
+
+Debugging locally with telemetrics-client
+-----------------------------------------------
+
+The function of the telemetrics-client is to handle the transport of information
+reported by a probe to a backend (see ```server``` key in configuration). This
+information is helpful for developers to debug and fix reported crashes, however
+developers not always have access to the backend in these case users can leverage
+features added for local debugging. The following is a list of steps to enable
+local debug:
+
+* *Enabling record retention*: this step configures telempostd to keep
+copies of telemetry records locally. To enable record retention set the value of
+```record_retention_enabled``` from ```false``` to ```true```. Optionally set
+```record_server_delivery_enabled`` to ```false``` to keep records local only.
+Remember to restart the client after configuration values are updated
+(```telemctl restart```).
+
+* *Creating a record*: run ```hprobe``` command to create a record for the purposes
+of this step by step guide. Once we have the record or records that you need to
+capture locally you can display the data.
+
+* *Displaying record metadata*: telempostd keeps metadata of any valid record,
+to display this data a new option to telemctl was added ```telemctl journal```.
+Assuming that the last record created was the record from previous step `hprobe` we
+can use `tail -n 1` to print the last created record only, i.e.
+
+```
+$ sudo telemctl journal | tail -n 1
+$ org.clearlinux/hello/world     Mon 2018-04-02 17:48:01 UTC a19a0d41ba16788881e274b19b8a1be4 5de9de8d5f3c6a7d445d75ba01cc3322 60c014cd-4693-40f1-b334-548cd932949b
+```
+
+The headers for the metadata (along with other information) can be printed using the
+```-V``` switch with ```telemctl journal``` command, i.e.
+
+```
+$ sudo telemctl journal -V | head -n 1
+$ Classification             Time stamp              Record ID                    Event ID                     Boot ID
+```
+
+* *Displaying record payload*: to print the content of a record payload you can use
+the ```-i``` (```--include_record``` long format) option to ```telemctl journal```
+command. To print the specific record you created you can use the option ```-r```
+(```--record_id``` long format) with the Record Id of the generated record, i.e.
+
+```
+$ sudo telemctl journal --record_id a19a0d41ba16788881e274b19b8a1be4 --include_record
+$ org.clearlinux/hello/world     Mon 2018-04-02 17:48:01 UTC a19a0d41ba16788881e274b19b8a1be4 5de9de8d5f3c6a7d445d75ba01cc3322 60c014cd-4693-40f1-b334-548cd932949b
+$ hello
+```

configure.ac

@@ -2,13 +2,13 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([telemetrics-client], [1.15.0], [https://clearlinux.org/])
+AC_INIT([telemetrics-client], [2.0.0], [https://clearlinux.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.14 -Wall -Werror -Wno-extra-portability foreign subdir-objects])
 AM_SILENT_RULES([yes])
 LT_INIT([disable-static])
 AC_CONFIG_MACRO_DIRS([build-aux/m4])
-AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_SRCDIR([src/probe.c])
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
@@ -23,7 +23,7 @@ AC_PROG_MAKE_SET
 # Checks for libraries.
 
 # check >= 0.9.12 is required for TAP output
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.12])
+PKG_CHECK_MODULES([CHECK], [check >= 0.12])
 PKG_CHECK_MODULES([CURL], [libcurl])
 AC_CHECK_LIB([elf], [elf_begin], [have_elflib=yes], [AC_MSG_ERROR([Unable to find libelf from elfutils])])
 AC_CHECK_LIB([dw], [dwfl_begin], [have_dwlib=yes], [AC_MSG_ERROR([Unable to find libdw from elfutils])])

docs/local.mk

@@ -1,6 +1,7 @@
 MANPAGES = \
 	docs/man/telemctl.1 \
-	docs/man/telemd.1 \
+	docs/man/telemprobd.1 \
+	docs/man/telempostd.1 \
 	docs/man/telem-record-gen.1 \
 	docs/man/telemetry.3 \
 	docs/man/telemetrics.conf.5

docs/man/telem-record-gen.1

@@ -77,6 +77,9 @@ File to read payload from.
 .IP \(bu 2
 \fB\-R\fP, \fB\-\-record\-version\fP <version>:
 Version number for format of payload (default 1).
+.IP \(bu 2
+\fB\-e\fP, \fB\-\-event\-id\fP <version>:
+Event id to use in the record. If not provided a ramdonly generated id will be assigned to record.
 .UNINDENT
 .UNINDENT
 .UNINDENT

docs/man/telem-record-gen.1.rst

@@ -62,6 +62,10 @@ OPTIONS
  * ``-R``, ``--record-version`` <version>:
    Version number for format of payload (default 1).
 
+ * ``-e``, ``--event-id`` <version>:
+   Event id to use in the record. If not provided a randomly generated id will be assigned to record.
+
+
 
 RETURN VALUES
 =============

docs/man/telemctl.1

@@ -55,6 +55,9 @@ Opts in to telemetry, and starts telemetry services. The opt\-out file
 \fBopt\-out\fP:
 Opts out of telemetry, and stops telemetry services. The opt\-out file
 \fB/etc/telemetrics/opt\-out\fP is created.
+.IP \(bu 2
+\fBis\-active\fP:
+Checks if telemetry client daemons are active (telemprobd and telempostd).
 .UNINDENT
 .UNINDENT
 .UNINDENT

docs/man/telemctl.1.rst

@@ -40,6 +40,9 @@ OPTIONS
    Opts out of telemetry, and stops telemetry services. The opt-out file
    ``/etc/telemetrics/opt-out`` is created.
 
+ * ``is-active``:
+   Checks if telemetry client daemons are active (telemprobd and telempostd).
+
 
 RETURN VALUES
 =============

docs/man/telempostd.1

@@ -0,0 +1,97 @@
+.\" Man page generated from reStructuredText.
+.
+.TH TELEMPOSTD 1 "" "" ""
+.SH NAME
+telempostd \- Telemetry client service
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBtelempostd\fP <flags>
+.sp
+\fB/etc/telemetrics/telemetrics.conf\fP
+.sp
+\fB/usr/share/defaults/telemetrics/telemetrics.conf\fP
+.sp
+\fB/etc/telemetrics/opt\-in\-static\-machine\-id\fP
+.SH DESCRIPTION
+.sp
+The \fBtelempostd\fP program delivers locally generated telemetry records to a remote
+telemetry service. Telemetry data can be in any format, and is relayed as\-is.
+.SH OPTIONS
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP \(bu 2
+\fB\-f\fP, \fB\-\-config_file\fP [<file>]:
+Configuration file. This overides the other parameters.
+.IP \(bu 2
+\fB\-h\fP, \fB\-\-help\fP:
+Display this help message.
+.IP \(bu 2
+\fB\-V\fP, \fB\-\-version\fP:
+Print the program version.
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.SH FILES
+.INDENT 0.0
+.IP \(bu 2
+\fB/usr/share/defaults/telemetrics/telemetrics.conf\fP
+.INDENT 2.0
+.INDENT 3.5
+If no custom configuration file is found, \fBtelempostd\fP uses the
+settings in this file.
+.UNINDENT
+.UNINDENT
+.IP \(bu 2
+\fB/etc/telemetrics/telemetrics.conf\fP
+.INDENT 2.0
+.INDENT 3.5
+Custom configuration file that \fBtelempostd\fP reads. See \fBtelemetrics.conf\fP(5).
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.SH EXIT STATUS
+.sp
+0 when no errors occurred. A non\-zero exit status indicates a failure occurred.
+.SH SEE ALSO
+.INDENT 0.0
+.IP \(bu 2
+\fBtelemetry\fP(3)
+.IP \(bu 2
+\fBtelemetrics.conf\fP(5)
+.IP \(bu 2
+\fI\%https://github.com/clearlinux/telemetrics\-client\fP
+.IP \(bu 2
+\fI\%https://clearlinux.org/documentation/\fP
+.UNINDENT
+.SH COPYRIGHT
+(C) 2018 Intel Corporation, CC-BY-SA-3.0
+.\" Generated by docutils manpage writer.
+.

docs/man/telempostd.1.rst

@@ -0,0 +1,71 @@
+==========
+telempostd
+==========
+
+------------------------
+Telemetry client service
+------------------------
+
+:Copyright: \(C) 2018 Intel Corporation, CC-BY-SA-3.0
+:Manual section: 1
+
+
+SYNOPSIS
+========
+
+``telempostd`` \<flags\>
+
+``/etc/telemetrics/telemetrics.conf``
+
+``/usr/share/defaults/telemetrics/telemetrics.conf``
+
+``/etc/telemetrics/opt-in-static-machine-id``
+
+
+DESCRIPTION
+===========
+
+The ``telempostd`` program delivers locally generated telemetry records to a remote
+telemetry service. Telemetry data can be in any format, and is relayed as-is.
+
+
+OPTIONS
+=======
+
+  * ``-f``, ``--config_file`` \[\<file\>\]:
+    Configuration file. This overrides the other parameters.
+
+  * ``-h``, ``--help``:
+    Display this help message.
+
+  * ``-V``, ``--version``:
+    Print the program version.
+
+
+FILES
+=====
+
+* ``/usr/share/defaults/telemetrics/telemetrics.conf``
+
+    If no custom configuration file is found, ``telempostd`` uses the
+    settings in this file.
+
+* ``/etc/telemetrics/telemetrics.conf``
+
+    Custom configuration file that ``telempostd`` reads. See ``telemetrics.conf``\(5).
+
+
+EXIT STATUS
+===========
+
+0 when no errors occurred. A non-zero exit status indicates a failure occurred.
+
+
+SEE ALSO
+========
+
+* ``telemetry``\(3)
+* ``telemetrics.conf``\(5)
+* https://github.com/clearlinux/telemetrics-client
+* https://clearlinux.org/documentation/
+

docs/man/telemprobd.1

@@ -41,8 +41,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fB/etc/telemetrics/opt\-in\-static\-machine\-id\fP
 .SH DESCRIPTION
 .sp
-The \fBtelemd\fP program delivers locally generated telemetry records to a remote
-telemetry service. Telemetry data can be in any format, and is relayed as\-is.
+The \fBtelemd\fP program handles communication between telemetry client and telemetry
+probes.
 .SH OPTIONS
 .INDENT 0.0
 .INDENT 3.5

docs/man/telemprobd.1.rst

@@ -1,9 +1,9 @@
-======
-telemd
-======
+==========
+telemprobd
+==========
 
 ------------------------
-Telemetry client service
+Telemetry probes service
 ------------------------
 
 :Copyright: \(C) 2017 Intel Corporation, CC-BY-SA-3.0
@@ -13,7 +13,7 @@ Telemetry client service
 SYNOPSIS
 ========
 
-``telemd`` \<flags\>
+``telemprobd`` \<flags\>
 
 ``/etc/telemetrics/telemetrics.conf``
 
@@ -25,8 +25,8 @@ SYNOPSIS
 DESCRIPTION
 ===========
 
-The ``telemd`` program delivers locally generated telemetry records to a remote
-telemetry service. Telemetry data can be in any format, and is relayed as-is.
+The ``telemprobd`` program handles communication between telemetry client and telemetry
+probes.
 
 
 OPTIONS
@@ -47,12 +47,12 @@ FILES
 
 * ``/usr/share/defaults/telemetrics/telemetrics.conf``
 
-    If no custom configuration file is found, ``telemd`` uses the
+    If no custom configuration file is found, ``telemprobd`` uses the
     settings in this file.
 
 * ``/etc/telemetrics/telemetrics.conf``
 
-    Custom configuration file that ``telemd`` reads. See ``telemetrics.conf``\(5).
+    Custom configuration file that ``telemprobd`` reads. See ``telemetrics.conf``\(5).
 
 
 * ``/etc/telemetrics/opt-in-static-machine-id``

scripts/telemctl

@@ -2,8 +2,8 @@
 
 declare -a SPECIAL_UNITS=(
   hprobe.timer
-  telemd.socket
-  telemd.path
+  telemprobd.socket
+  telempostd.path
 )
 
 declare -a SERVICES=(
@@ -12,7 +12,8 @@ declare -a SERVICES=(
   oops-probe.service
   pstore-probe.service
   klogscanner.service
-  telemd.service
+  telemprobd.service
+  telempostd.service
 )
 
 SCRIPT="$0"
@@ -69,7 +70,8 @@ telem_start() {
 
 telem_is_active() {
   # check only activation units
-  systemctl is-active telemd.socket
+  echo "telemprobd :" $(systemctl is-active telemprobd.socket)
+  echo "telempostd :"  $(systemctl is-active telempostd.path)
 }
 
 telem_opt_out() {
@@ -103,10 +105,10 @@ usage() {
   printf "$format" "stop" "Stops all running telemetry services"
   printf "$format" "start" "Starts all telemetry services"
   printf "$format" "restart" "Restarts all telemetry services"
-  printf "$format" "is-active" "Checks if telemd is active"
+  printf "$format" "is-active" "Checks if telemprobd and telempostd are active"
   printf "$format" "opt-in" "Opts in to telemetry, and starts telemetry services"
   printf "$format" "opt-out" "Opts out of telemetry, and stops telemetry services"
-  printf "$format" "journal" "Prints telemd journal contents. Use -h argument with"
+  printf "$format" "journal" "Prints telemtry journal contents. Use -h argument with"
   printf "$format" ""        "command for more options"
   printf "\n"
   exit 2

src/common.h

@@ -64,6 +64,7 @@
 /* Journal */
 #define JOURNAL_PATH "/var/log/telemetry/journal"
 #define JOURNAL_TMPDIR  "/var/log/telemetry/"
+#define RECORD_RETENTION_DIR "/var/log/telemetry/records"
 
 /* For internal library usage. Bump the version whenever we change the record
  * structure (e.g. adding or removing a header field). Note that the value

src/configuration.c

@@ -47,8 +47,8 @@ const char *config_key_int[] = { NULL, "record_expiry", "spool_max_size",
                                  "byte_window_length", "record_burst_limit",
                                  "byte_burst_limit", NULL };
 
-const char *config_key_bool[] = { NULL, "rate_limit_enabled",
-                                  "daemon_recycling_enabled", NULL };
+const char *config_key_bool[] = { NULL, "rate_limit_enabled", "daemon_recycling_enabled",
+                                  "record_retention_enabled", "record_server_delivery_enabled", NULL };
 
 static struct configuration config = { { 0 }, { 0 }, { 0 }, false, NULL };
 
@@ -132,8 +132,22 @@ bool read_config_from_file(char *config_file, struct configuration *config)
                                         config->boolValues[i] = true;
                                 }
                         } else {
-                                fprintf(stderr, "ERR: missing key with boolean value: %s\n", config_key_bool[i]);
-                                return false;
+                                /* New configuration keys, CONF_RECORD_RETENTION_ENABLED and CONF_RECORD_SERVER_DELIVERY_ENABLED
+                                 * default values, otherwise update will require changes in custom configurations */
+                                if (i == CONF_RECORD_RETENTION_ENABLED) {
+#ifdef DEBUG
+                                        fprintf(stderr, "WARN: missing boolean optional key: %s\n", config_key_bool[i]);
+#endif
+                                        config->boolValues[i] = RECORD_RETENTION_ENABLED_DEFAULT;
+                                } else if (i == CONF_RECORD_SERVER_DELIVERY_ENABLED) {
+#ifdef DEBUG
+                                        fprintf(stderr, "WARN: missing boolean optional key: %s\n", config_key_bool[i]);
+#endif
+                                        config->boolValues[i] = RECORD_SERVER_DELIVERY_ENABLED_DEFAULT;
+                                } else {
+                                        fprintf(stderr, "ERR: missing key with boolean value: %s\n", config_key_bool[i]);
+                                        return false;
+                                }
                         }
                 }
         }
@@ -356,4 +370,16 @@ bool daemon_recycling_enabled_config(void)
         initialize_config();
         return config.boolValues[CONF_DAEMON_RECYCLING_ENABLED];
 }
+
+bool record_retention_enabled_config(void)
+{
+        initialize_config();
+        return config.boolValues[CONF_RECORD_RETENTION_ENABLED];
+}
+
+bool record_server_delivery_enabled_config(void)
+{
+        initialize_config();
+        return config.boolValues[CONF_RECORD_SERVER_DELIVERY_ENABLED];
+}
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

src/configuration.h

@@ -19,6 +19,8 @@
 #include <stdint.h>
 
 #define TM_MAX_WINDOW_LENGTH (1 /*h*/ * 60 /*m*/)
+#define RECORD_RETENTION_ENABLED_DEFAULT false
+#define RECORD_SERVER_DELIVERY_ENABLED_DEFAULT true
 
 enum config_str_keys {
         CONF_STR_MIN = 0,
@@ -47,6 +49,8 @@ enum config_bool_keys {
         CONF_BOOL_MIN = 0,
         CONF_RATE_LIMIT_ENABLED,
         CONF_DAEMON_RECYCLING_ENABLED,
+        CONF_RECORD_RETENTION_ENABLED,
+        CONF_RECORD_SERVER_DELIVERY_ENABLED,
         CONF_BOOL_MAX
 };
 
@@ -117,4 +121,10 @@ const char *get_tidheader_config(void);
 /* Gets whether recycling is enabled */
 bool daemon_recycling_enabled_config(void);
 
+/* Gets whether local retention of records is enabled */
+bool record_retention_enabled_config(void);
+
+/* Gets whether records should be sent to server_addr */
+bool record_server_delivery_enabled_config(void);
+
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

src/data/bert-probe.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=Telemetrics BERT Probe
-Requires=telemd.socket
-After=telemd.socket
+Requires=telemprobd.socket
+After=telemprobd.socket
 ConditionPathExists=!/etc/telemetrics/opt-out
 ConditionPathExists=/sys/firmware/acpi/tables/data/BERT
 

src/data/example.1.conf

@@ -0,0 +1,46 @@
+[settings]
+server=http://127.0.0.1
+
+cainfo=/tmp/cacert.crt
+
+tidheader=X-Telemetry-TID:\s6907c830-eed9-4ce9-81ae-76daf8d88f0f
+
+socket_path=/tmp/test_telem_socket
+
+#record expiry time in minutes
+record_expiry=1200
+
+spool_dir=/tmp/spool
+
+#maximum size of the spool directory in KB
+spool_max_size=1024
+
+#time in seconds for processing spool
+spool_process_time=900
+
+#rate limiting record burst limit
+record_burst_limit=100
+
+#rate limiting record window length
+record_window_length = 15
+
+#rate limiting byte burst limit
+byte_burst_limit = 1000
+
+#rate limiting byte window length
+byte_window_length=20
+
+#rate limit enabled
+rate_limit_enabled=true
+
+#rate limit strategy if record not send
+rate_limit_strategy=spool
+
+#daemon recycling enabled
+daemon_recycling_enabled=true
+
+#server delivery disable
+record_server_delivery_enabled=false
+
+#local copy enabled
+record_retention_enabled=true

src/data/hprobe.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=Telemetrics Heartbeat Probe
-Requires=telemd.socket
-After=telemd.socket
+Requires=telemprobd.socket
+After=telemprobd.socket
 ConditionPathExists=!/etc/telemetrics/opt-out
 
 [Service]

src/data/journal-probe.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=Telemetrics Systemd Journal Probe
-Requires=telemd.socket
-After=telemd.socket
+Requires=telemprobd.socket
+After=telemprobd.socket
 ConditionPathExists=!/etc/telemetrics/opt-out
 
 [Service]

src/data/klogscanner.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=Telemetrics Kernel Log Scanner
-Requires=telemd.socket
-After=telemd.socket oops-probe.service
+Requires=telemprobd.socket
+After=telemprobd.socket oops-probe.service
 
 [Service]
 ExecStart=@bindir@/klogscanner

src/data/local.mk

@@ -11,6 +11,7 @@ EXTRA_DIST += \
 	%D%/40-core-ulimit.conf \
 	%D%/40-crash-probe.conf.in \
 	%D%/example.conf \
+	%D%/example.1.conf \
 	%D%/hprobe.service.in \
 	%D%/hprobe.timer \
 	%D%/bert-probe.service.in \
@@ -20,10 +21,11 @@ EXTRA_DIST += \
 	%D%/klogscanner.service.in \
 	%D%/pstore-clean.service.in \
 	%D%/libtelemetry.pc.in \
-	%D%/telemd.path.in \
-	%D%/telemd.service.in \
-	%D%/telemd.socket.in \
-	%D%/telemd-update-trigger.service.in \
+	%D%/telempostd.service.in \
+	%D%/telempostd.path.in \
+	%D%/telemprobd.service.in \
+	%D%/telemprobd.socket.in \
+	%D%/telemprobd-update-trigger.service.in \
 	%D%/telemetrics-dirs.conf.in \
 	%D%/telemetrics.conf.in
 
@@ -55,10 +57,11 @@ systemdunit_DATA = \
 	%D%/pstore-probe.service \
 	%D%/klogscanner.service \
 	%D%/pstore-clean.service \
-	%D%/telemd.service \
-	%D%/telemd.socket \
-	%D%/telemd-update-trigger.service \
-	%D%/telemd.path
+	%D%/telemprobd.service \
+	%D%/telemprobd.socket \
+	%D%/telemprobd-update-trigger.service \
+	%D%/telempostd.service \
+	%D%/telempostd.path
 
 %D%/hprobe.service: %D%/hprobe.service.in
 	$(pathfix) < $< > $@
@@ -81,16 +84,19 @@ systemdunit_DATA = \
 %D%/pstore-clean.service: %D%/pstore-clean.service.in
 	$(pathfix) < $< > $@
 
-%D%/telemd.service: %D%/telemd.service.in
+%D%/telempostd.path: %D%/telempostd.path.in
 	$(pathfix) < $< > $@
 
-%D%/telemd.socket: %D%/telemd.socket.in
+%D%/telempostd.service: %D%/telempostd.service.in
 	$(pathfix) < $< > $@
 
-%D%/telemd.path: %D%/telemd.path.in
+%D%/telemprobd.service: %D%/telemprobd.service.in
 	$(pathfix) < $< > $@
 
-%D%/telemd-update-trigger.service: %D%/telemd-update-trigger.service.in
+%D%/telemprobd.socket: %D%/telemprobd.socket.in
+	$(pathfix) < $< > $@
+
+%D%/telemprobd-update-trigger.service: %D%/telemprobd-update-trigger.service.in
 	$(pathfix) < $< > $@
 
 sysctldir = @SYSTEMD_SYSCTLDIR@
@@ -103,10 +109,11 @@ systemconfdir = @SYSTEMD_SYSTEMCONFDIR@
 systemconf_DATA = %D%/40-core-ulimit.conf
 
 clean-local:
-	-rm -f  %D%/telemd.service \
-		%D%/telemd.socket \
-		%D%/telemd.path \
-		%D%/telemd-update-trigger.service \
+	-rm -f  %D%/telemprobd.service \
+		%D%/telemprobd.socket \
+		%D%/telempostd.service \
+		%D%/telempostd.path \
+		%D%/telemprobd-update-trigger.service \
 		%D%/telemetrics.conf \
 		%D%/telemetrics-dirs.conf \
 		%D%/libtelemetry.pc \

src/data/oops-probe.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=Telemetrics Kernel Oops Probe
-Requires=telemd.socket
-After=telemd.socket
+Requires=telemprobd.socket
+After=telemprobd.socket
 
 [Service]
 ExecStart=@bindir@/oopsprobe

src/data/pstore-probe.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=Telemetrics Pstore Probe
-Requires=telemd.socket
-After=telemd.socket
+Requires=telemprobd.socket
+After=telemprobd.socket
 
 [Service]
 ExecStart=@bindir@/pstoreprobe

src/data/telemetrics-dirs.conf.in

@@ -1,6 +1,7 @@
 d @localstatedir@/lib/telemetry 0755 telemetry telemetry -
 d @localstatedir@/spool/telemetry 0750 telemetry telemetry -
 d @localstatedir@/log/telemetry 0750 telemetry telemetry -
+d @localstatedir@/log/telemetry/records 0750 telemetry telemetry -
 d @localstatedir@/cache/telemetry 0750 telemetry telemetry -
 d @localstatedir@/cache/telemetry/oops 0750 telemetry telemetry -
 d @localstatedir@/cache/telemetry/pstore 0750 telemetry telemetry -

src/data/telemetrics.conf.in

@@ -55,3 +55,13 @@ rate_limit_strategy=spool
 # has not any client nor spool data, then it exits.
 # this is to ensure that latest code runs.
 daemon_recycling_enabled=true
+
+# record server delivery enabled - when enabled records will be delivered
+# to server otherwise records will be ignored. This configuration can be used
+# with 'record_retention_enable' configuration value to keep records local only.
+record_server_delivery_enabled=true
+
+# record retention enabled - when enabled a copy of reported telemetry records
+# will be kept locally. This configuration combined with 'record_server_delivery_enabled'
+# value can be used to keep records local only.
+record_retention_enabled=false

src/data/telempostd.path.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Telemetry Daemon Spool
+Description=Telemetry Post Daemon staging
 ConditionPathExists=!/etc/telemetrics/opt-out
 
 [Path]

src/data/telempostd.service.in

@@ -0,0 +1,12 @@
+[Unit]
+Description=Telemetrics Post Daemon
+ConditionPathExists=!/etc/telemetrics/opt-out
+
+[Service]
+ExecStart=@bindir@/telempostd
+WorkingDirectory=@localstatedir@/spool/telemetry
+User=telemetry
+
+[Install]
+Also=telempostd.path
+WantedBy=multi-user.target

src/data/telemprobd-update-trigger.service.in

@@ -4,4 +4,4 @@ BindsTo=update-triggers.target
 
 [Service]
 Type=oneshot
-ExecStart=@systemctldir@/systemctl try-restart telemd.service
+ExecStart=@systemctldir@/systemctl try-restart telemprobd.service

src/data/telemprobd.service.in

@@ -3,10 +3,10 @@ Description=Telemetrics Daemon
 ConditionPathExists=!/etc/telemetrics/opt-out
 
 [Service]
-ExecStart=@bindir@/telemd
+ExecStart=@bindir@/telemprobd
 WorkingDirectory=@localstatedir@/spool/telemetry
 User=telemetry
 
 [Install]
-Also=telemd.socket telemd.path
+Also=telemprobd.socket
 WantedBy=multi-user.target

src/iorecord.c

@@ -0,0 +1,162 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <sys/stat.h>
+
+#include "log.h"
+#include "util.h"
+#include "common.h"
+#include "iorecord.h"
+
+bool _fgets(char *s, int n, FILE *stream)
+{
+        char *i;
+
+        if (!fgets(s, n, stream)) {
+                return false;
+        }
+        if ((i = strchr(s, '\n')) != NULL) {
+                *i = '\0';
+        }
+
+        return true;
+}
+
+void stage_record(char *filepath, char *headers[], char *body)
+{
+        int tmpfd;
+        FILE *tmpfile = NULL;
+
+        // Use default path if not provided
+        if (filepath == NULL) {
+                telem_log(LOG_ERR, "filepath value must be provided, aborting\n");
+                exit(EXIT_FAILURE);
+        }
+
+        tmpfd = mkstemp(filepath);
+        if (!tmpfd) {
+                telem_perror("Error opening staging file");
+                close(tmpfd);
+                if (unlink(filepath)) {
+                        telem_perror("Error deleting staging file");
+                }
+                goto clean_exit;
+        }
+
+        // open file
+        tmpfile = fdopen(tmpfd, "a");
+        if (!tmpfile) {
+                telem_perror("Error opening temp stage file");
+                close(tmpfd);
+                if (unlink(filepath)) {
+                        telem_perror("Error deleting temp stage file");
+                }
+                goto clean_exit;
+        }
+
+        // write headers
+        for (int i = 0; i < NUM_HEADERS; i++) {
+                fprintf(tmpfile, "%s\n", headers[i]);
+        }
+
+        //write body
+        fprintf(tmpfile, "%s\n", body);
+        fflush(tmpfile);
+        fclose(tmpfile);
+
+clean_exit:
+
+        return;
+}
+
+bool read_record(char *fullpath, char *headers[], char **body)
+{
+        int i, ret = 0;
+        bool result = false;
+        FILE *fp = NULL;
+        long offset;
+        char line[LINE_MAX] = { 0 };
+        struct stat buf;
+        long size;
+
+        ret = stat(fullpath, &buf);
+        if (ret == -1) {
+                telem_log(LOG_ERR, "Unable to stat record %s in staging\n", fullpath);
+                return false;
+        }
+        size = buf.st_size;
+
+        fp = fopen(fullpath, "r");
+        if (fp == NULL) {
+                telem_log(LOG_ERR, "Unable to open file %s in staging\n", fullpath);
+                return false;
+        }
+
+        for (i = 0; i < NUM_HEADERS; i++) {
+                const char *header_name = get_header_name(i);
+                if (!_fgets(line, LINE_MAX, fp)) {
+                        telem_log(LOG_ERR, "Error while parsing staged record\n");
+                        fclose(fp);
+                        return false;
+                }
+                //Get rid of trailing newline
+                result = get_header(line, header_name, &headers[i]);
+                if (!result) {
+                        telem_log(LOG_ERR, "read_record: Incorrect"
+                                  " headers in record\n");
+                        goto read_error;
+                }
+        }
+
+        offset = ftell(fp);
+        if (offset == -1) {
+                telem_perror("Failed to get staged file offset of record payload");
+                result = false;
+                goto read_error;
+        }
+
+        size = size - offset + 1;
+        *body = malloc((size_t)size);
+        if (*body == NULL) {
+                telem_log(LOG_ERR, "Could not allocate memory for payload from staged file\n");
+                result = false;
+                goto read_error;
+        }
+        memset(*body, 0, (size_t)size);
+
+        //read rest of file
+        size_t newlen = fread(*body, sizeof(char), (size_t)size, fp);
+        if (newlen == 0) {
+                telem_perror("Error reading staged file");
+                result = false;
+                goto read_error;
+        } else {
+                result = true;
+        }
+
+read_error:
+        if (fp) {
+                fclose(fp);
+        }
+
+        return result;
+}

src/iorecord.h

@@ -0,0 +1,38 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#include <stdbool.h>
+
+/**
+ * Save a telemetry record to disk
+ *
+ * @param path pointer to a directory to save record
+ * @param headers pointer to array of headers and values
+ * @param body record message content
+ *
+ */
+void stage_record(char *path, char *headers[], char *body);
+
+/**
+ * Reads a telemetry record
+ *
+ * @param fullpath pointer to full path file name
+ * @param headers pointer to array of headers and values
+ * @param body record message content
+ *
+ * @return true if successful otherwise false
+ */
+bool read_record(char *fullpath, char *headers[], char **body);

src/journal/cli.c

@@ -27,12 +27,13 @@
 void print_usage(void)
 {
         printf(" Usage\n");
-        printf("  -r,  --record_id       Print record to stdout\n");
-        printf("  -e,  --event_id        List records with specific event_id\n");
-        printf("  -c,  --classification  List records with specific classification\n");
-        printf("  -b,  --boot_id         List records with specific boot_id\n");
-        printf("  -V,  --verbose         Verbose output\n");
-        printf("  -h,  --help            Display this help message\n");
+        printf("  -r,  --record_id        Print record with specific record_id\n");
+        printf("  -e,  --event_id         Print records with specific event_id\n");
+        printf("  -c,  --classification   Print records with specific classification\n");
+        printf("  -b,  --boot_id          Print records with specific boot_id\n");
+        printf("  -i,  --include_record   Include record content\n");
+        printf("  -V,  --verbose          Verbose output\n");
+        printf("  -h,  --help             Display this help message\n");
 }
 
 int main(int argc, char **argv)
@@ -41,6 +42,7 @@ int main(int argc, char **argv)
         int rc = EXIT_SUCCESS;
         int count = 0;
         int verbose_output = 0;
+        int record = 0;
         char *boot_id = NULL;
         char *record_id = NULL;
         char *event_id = NULL;
@@ -56,11 +58,12 @@ int main(int argc, char **argv)
                 { "classification", 1, NULL, 'c' },
                 { "boot_id", 1, NULL, 'b' },
                 { "verbose", 0, NULL, 'V' },
+                { "include_record", 0, NULL, 'i' },
                 { "help", 0, NULL, 'h' },
                 { NULL, 0, NULL, 0 }
         };
 
-        while ((c = getopt_long(argc, argv, "r:e:c:b:Vh", opts, &opt_index)) != -1) {
+        while ((c = getopt_long(argc, argv, "r:e:c:b:Vih", opts, &opt_index)) != -1) {
                 switch (c) {
                         case 'r':
                                 record_id = optarg;
@@ -77,6 +80,9 @@ int main(int argc, char **argv)
                         case 'V':
                                 verbose_output = 1;
                                 break;
+                        case 'i':
+                                record = 1;
+                                break;
                         case 'h':
                                 print_usage();
                                 exit(EXIT_SUCCESS);
@@ -92,7 +98,7 @@ int main(int argc, char **argv)
                         fprintf(stdout, "%-30s %-27s %-32s %-32s %-36s\n", "Classification", "Time stamp",
                                 "Record ID", "Event ID", "Boot ID");
                 }
-                count = print_journal(telem_journal, classification, record_id, event_id, boot_id);
+                count = print_journal(telem_journal, classification, record_id, event_id, boot_id, record);
                 if (verbose_output) {
                         fprintf(stdout, "Total records: %d\n", count);
                 }
@@ -102,10 +108,5 @@ int main(int argc, char **argv)
                 rc = EXIT_FAILURE;
         }
 
-        free(classification);
-        free(record_id);
-        free(event_id);
-        free(boot_id);
-
         return rc;
 }

src/journal/journal.c

@@ -19,6 +19,7 @@
 #define ID_LEN 32
 #define BOOTID_LEN 37 // Includes the \n character at the end
 #define BOOTID_FILE "/proc/sys/kernel/random/boot_id"
+#define MID_BUFF 1024
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,6 +32,7 @@
 #include <unistd.h>
 #include <assert.h>
 
+#include "log.h"
 #include "util.h"
 #include "common.h"
 #include "journal.h"
@@ -246,17 +248,20 @@ static int read_boot_id(char buff[])
  *
  * @param n Number of lines to skip.
  * @param fptr A file pointer.
+ * @param found_record A pointer to a function to be called
+ *                     every time a valid record is found, if
+ *                     pointer is not set to null.
  *
  * @returns 0 on success, on failure -1 if n > existing
  *            lines in file or errno if failure happens
  *            during file operation.
- *
  */
-static int skip_n_lines(int n, FILE *fptr)
+static int skip_n_lines(int n, FILE *fptr, int (*found_record)(char *))
 {
         int rc = 0;
         size_t len = 0;
         char *line = NULL;
+        struct JournalEntry *entry = NULL;
 
         if (fptr == NULL) {
 #ifdef DEBUG
@@ -275,6 +280,14 @@ static int skip_n_lines(int n, FILE *fptr)
                         rc = -1;
                         break;
                 }
+                if (found_record != NULL) {
+                        deserialize_journal_entry(line, &entry);
+                        if (entry) {
+                                found_record(entry->record_id);
+                                free_journal_entry(entry);
+                                entry = NULL;
+                        }
+                }
         }
         free(line);
 
@@ -331,9 +344,11 @@ TelemJournal *open_journal(const char *journal_file)
         struct TelemJournal *telem_journal;
 
         // Use default location if journal_file parameter is NULL
-        fptr = (journal_file == NULL) ? fopen(JOURNAL_PATH, "a+") :
-               fopen(journal_file, "a+");
-
+        if (journal_file == NULL) {
+                fptr = fopen(JOURNAL_PATH, "a+");
+        } else {
+                fptr = fopen(journal_file, "a+");
+        }
         if (fptr == NULL) {
 #ifdef DEBUG
                 perror("Error while opening journal file: ");
@@ -361,6 +376,8 @@ TelemJournal *open_journal(const char *journal_file)
         telem_journal->boot_id = strndup(boot_id, BOOTID_LEN - 1);
         telem_journal->record_count = get_record_count(telem_journal);
         telem_journal->record_count_limit = RECORD_LIMIT;
+        telem_journal->latest_record_id = NULL;
+        telem_journal->prune_entry_callback = NULL;
 
 #ifdef DEBUG
         printf("Records in db: %d\n", telem_journal->record_count);
@@ -375,6 +392,7 @@ void close_journal(TelemJournal *telem_journal)
         if (telem_journal) {
                 free(telem_journal->boot_id);
                 free(telem_journal->journal_file);
+                free(telem_journal->latest_record_id);
                 fclose(telem_journal->fptr);
                 free(telem_journal);
         }
@@ -393,9 +411,44 @@ static int is_class_prefix(char *class)
         return (strcmp((char *)(class + class_len - 2), "/*") == 0) ? 1 : 0;
 }
 
+/**
+ * Print records content
+ *
+ * @param record_id Unique record identifier
+ *
+ */
+static void print_record(char *record_id)
+{
+        int rc = 0;
+        size_t read = 0;
+        char buff[MID_BUFF] = { '\0' };
+        char *filepath = NULL;
+        FILE *recordfp = NULL;
+
+        rc = asprintf(&filepath, "%s/%s", RECORD_RETENTION_DIR, record_id);
+        if (rc == -1) {
+                // just bail out, there are worse problems
+                return;
+        }
+
+        recordfp = fopen(filepath, "r");
+        if (!recordfp) {
+                telem_perror("Error when opening a record to print");
+                return;
+        }
+
+        while ((read = fread(buff, 1, sizeof(buff), recordfp)) > 0) {
+                fwrite(buff, 1, read, stdout);
+        }
+
+        free(filepath);
+        fclose(recordfp);
+}
+
 /* Exported function */
 int print_journal(TelemJournal *telem_journal, char *classification,
-                  char *record_id, char *event_id, char *boot_id)
+                  char *record_id, char *event_id, char *boot_id,
+                  bool include_record)
 {
         int n = 0;
         int rc = 0;
@@ -419,7 +472,7 @@ int print_journal(TelemJournal *telem_journal, char *classification,
         // Advance file pointer to line n
         n = telem_journal->record_count - telem_journal->record_count_limit;
         if (n > 0) {
-                rc = skip_n_lines(n, journal_fileptr);
+                rc = skip_n_lines(n, journal_fileptr, NULL);
                 if (rc == -1) {
                         return rc;
                 } else if (rc != 0) {
@@ -432,13 +485,13 @@ int print_journal(TelemJournal *telem_journal, char *classification,
                 if (entry) {
                         /* filter entry out if one is provided */
                         if (record_id != NULL && strcmp(entry->record_id, record_id) != 0) {
-                                continue;
+                                goto skip_print;
                         }
                         if (boot_id != NULL && strcmp(entry->boot_id, boot_id) != 0) {
-                                continue;
+                                goto skip_print;
                         }
                         if (event_id != NULL && strcmp(entry->event_id, event_id) != 0) {
-                                continue;
+                                goto skip_print;
                         }
                         // In the case of class checking prefixes is an option
                         if (classification != NULL) {
@@ -456,10 +509,15 @@ int print_journal(TelemJournal *telem_journal, char *classification,
                         if (strftime(str_time, sizeof(str_time), "%a %Y-%m-%d %H:%M:%S %Z", &ts) == 0) {
                                 continue;
                         }
-
+                        /* print record metadata */
                         fprintf(stdout, "%-30s %s %s %s %s\n", entry->classification, str_time, entry->record_id, entry->event_id, entry->boot_id);
+                        /* print record content */
+                        if (include_record) {
+                                print_record(entry->record_id);
+                        }
                         count++;
                 }
+skip_print:
                 free_journal_entry(entry);
         }
         free(line);
@@ -562,6 +620,9 @@ int new_journal_entry(TelemJournal *telem_journal, char *classification,
 #endif
         }
 
+        free(telem_journal->latest_record_id);
+        telem_journal->latest_record_id = strdup(entry->record_id);
+
 quit:
         free_journal_entry(entry);
 
@@ -585,7 +646,7 @@ int prune_journal(struct TelemJournal *telem_journal, char *tmp_dir)
                 count = telem_journal->record_count - telem_journal->record_count_limit;
 
                 // jump to line# count
-                if ((rc = skip_n_lines(count, telem_journal->fptr)) != 0) {
+                if ((rc = skip_n_lines(count, telem_journal->fptr, telem_journal->prune_entry_callback)) != 0) {
 #ifdef DEBUG
                         fprintf(stderr, "Error: skipping %d journal lines\n", count);
 #endif

src/journal/journal.h

@@ -22,6 +22,7 @@
 
 #include <time.h>
 #include <stdio.h>
+#include <stdbool.h>
 
 /* Journal entry type */
 typedef struct JournalEntry {
@@ -37,8 +38,10 @@ typedef struct TelemJournal {
         FILE *fptr;
         char *journal_file;
         char *boot_id;
+        char *latest_record_id;
         int record_count;
         int record_count_limit;
+        int (*prune_entry_callback)(char *);
 } TelemJournal;
 
 /**
@@ -75,12 +78,14 @@ void close_journal(TelemJournal *telem_journal);
  * @param record_id A pointer to string used as record_id filter.
  * @param event_id A pointer to string used as event_id filter.
  * @param boot_id A pointer to string used as boor_id filter.
+ * @param include_record A flag to control record content print.
  *
  * @return the number of lines printed to stdout on success, -1
  *         on failure.
  */
 int print_journal(TelemJournal *telem_journal, char *classification,
-                  char *record_id, char *event_id, char *boot_id);
+                  char *record_id, char *event_id, char *boot_id,
+                  bool include_record);
 
 /**
  * Creates a new entry in journal.

src/local.mk

@@ -1,37 +1,78 @@
-bin_PROGRAMS = %D%/telemd
+bin_PROGRAMS = \
+	%D%/telemprobd \
+	%D%/telempostd
 
-%C%_telemd_SOURCES = \
-	%D%/main.c \
+%C%_telemprobd_SOURCES = \
+	%D%/probe.c \
 	%D%/telemdaemon.c \
 	%D%/telemdaemon.h \
-	%D%/spool.c \
-	%D%/spool.h \
+	%D%/iorecord.c \
 	%D%/journal/journal.c \
 	%D%/journal/journal.h
 
-%C%_telemd_LDADD = $(CURL_LIBS) \
+%C%_telemprobd_LDADD = $(CURL_LIBS) \
 	%D%/libtelem-shared.la
 
-%C%_telemd_CFLAGS = \
+%C%_telemprobd_CFLAGS = \
 	$(AM_CFLAGS)
 
-%C%_telemd_LDFLAGS = \
+%C%_telemprobd_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-pie
 
 if HAVE_SYSTEMD_DAEMON
-%C%_telemd_CFLAGS += \
-        $(SYSTEMD_DAEMON_CFLAGS)
-%C%_telemd_LDADD += \
-        $(SYSTEMD_DAEMON_LIBS)
+%C%_telemprobd_CFLAGS += \
+	$(SYSTEMD_DAEMON_CFLAGS)
+%C%_telemprobd_LDADD += \
+	$(SYSTEMD_DAEMON_LIBS)
 endif
 
 if LOG_SYSTEMD
 if HAVE_SYSTEMD_JOURNAL
-%C%_telemd_CFLAGS += \
-        $(SYSTEMD_JOURNAL_CFLAGS)
-%C%_telemd_LDADD += \
-        $(SYSTEMD_JOURNAL_LIBS)
+%C%_telemprobd_CFLAGS += \
+	$(SYSTEMD_JOURNAL_CFLAGS)
+%C%_telemprobd_LDADD += \
+	$(SYSTEMD_JOURNAL_LIBS)
+endif
+endif
+
+# Telemetry post daemon
+%C%_telempostd_SOURCES = \
+	%D%/post.c \
+	%D%/telempostdaemon.c \
+	%D%/telempostdaemon.h \
+	%D%/journal/journal.c \
+	%D%/journal/journal.h \
+	%D%/spool.h \
+	%D%/spool.c \
+	%D%/retention.h \
+	%D%/retention.c \
+	%D%/iorecord.c \
+	%D%/iorecord.h
+
+%C%_telempostd_LDADD = $(CURL_LIBS) \
+	%D%/libtelem-shared.la
+
+%C%_telempostd_CFLAGS = \
+	$(AM_CFLAGS)
+
+%C%_telempostd_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-pie
+
+if HAVE_SYSTEMD_DAEMON
+%C%_telempostd_CFLAGS += \
+	$(SYSTEMD_DAEMON_CFLAGS)
+%C%_telempostd_LDADD += \
+	$(SYSTEMD_DAEMON_LIBS)
+endif
+
+if LOG_SYSTEMD
+if HAVE_SYSTEMD_JOURNAL
+%C%_telempostd_CFLAGS += \
+	$(SYSTEMD_JOURNAL_CFLAGS)
+%C%_telempostd_LDADD += \
+	$(SYSTEMD_JOURNAL_LIBS)
 endif
 endif
 

src/post.c

@@ -0,0 +1,98 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <sys/stat.h>
+
+#include "log.h"
+#include "spool.h"
+#include "configuration.h"
+#include "telempostdaemon.h"
+
+bool (*post_record_ptr)(char *[], char *) = post_record_http;
+
+void print_usage(char *prog)
+{
+        printf("%s: Usage\n", prog);
+        printf("  -f,  --config_file    Configuration file. This overides the other parameters\n");
+        printf("  -h,  --help           Display this help message\n");
+        printf("  -V,  --version        Print the program version\n");
+}
+
+int main(int argc, char **argv)
+{
+
+        int c;
+        int ret = 0;
+        int opt_index = 0;
+        char *config_file = NULL;
+        TelemPostDaemon daemon;
+
+        struct option opts[] = {
+                { "config_file", 1, NULL, 'f' },
+                { "help", 0, NULL, 'h' },
+                { "version", 0, NULL, 'V' },
+                { NULL, 0, NULL, 0 }
+        };
+
+        while ((c = getopt_long(argc, argv, "f:hV", opts, &opt_index)) != -1) {
+                switch (c) {
+                        case 'f':
+                                config_file = optarg;
+                                struct stat buf;
+                                ret = stat(config_file, &buf);
+
+                                /* check if the file exists and is a regular file */
+                                if (ret == -1 || !S_ISREG(buf.st_mode)) {
+                                        telem_log(LOG_ERR, "Configuration file"
+                                                  " path not valid\n");
+                                        exit(EXIT_FAILURE);
+                                }
+                                set_config_file(config_file);
+                                break;
+                        case 'V':
+                                printf(PACKAGE_VERSION "\n");
+                                exit(EXIT_SUCCESS);
+                        case 'h':
+                                print_usage(argv[0]);
+                                exit(EXIT_SUCCESS);
+                        case '?':
+                                print_usage(argv[0]);
+                                exit(EXIT_FAILURE);
+                }
+        }
+
+        initialize_daemon(&daemon);
+
+        daemon.current_spool_size = get_spool_dir_size();
+
+        /* When path activated this will process
+         * the activating message or previously
+         * spooled data */
+        staging_records_loop(&daemon);
+
+        /* This function is blocking, it will
+        * block until a signal is received */
+        run_daemon(&daemon);
+
+        close_daemon(&daemon);
+
+        return 0;
+}

src/probe.c

@@ -49,14 +49,12 @@
 #include "log.h"
 #include "telemdaemon.h"
 #include "configuration.h"
-#include "spool.h"
 
 /*
  *  Using a function pointer for unit testing to isolate the call to actual post function.
  *  The call to post the record to the server is stubbed out in the unit tests
  *  using pointer to a fake function.
  */
-bool (*post_record_ptr)(char *[], char *, bool) = post_record_http;
 
 void print_usage(char *prog)
 {
@@ -78,7 +76,6 @@ int main(int argc, char **argv)
         int c;
         char *config_file = NULL;
         int opt_index = 0;
-        nfds_t initial_nfds = 0;
         sigset_t mask;
         //bool interrupted = false;
 
@@ -221,19 +218,9 @@ int main(int argc, char **argv)
 
         telem_log(LOG_INFO, "Listening on socket...\n");
 
-        /* Calculate the spool directory size */
-        if (is_spool_valid()) {
-                daemon.is_spool_valid = true;
-                daemon.current_spool_size = get_spool_dir_size();
-        }
-
-        int spool_process_time = spool_process_time_config();
-
-        spool_records_loop(&(daemon.current_spool_size));
-        time_t last_spool_run_time = time(NULL);
-        time_t last_daemon_start_time = time(NULL);
-
         bool daemon_recycling_enabled = daemon_recycling_enabled_config();
+        int spool_process_time = spool_process_time_config();
+        time_t last_daemon_start_time = time(NULL);
 
         ret = update_machine_id();
         if (ret == -1) {
@@ -245,18 +232,9 @@ int main(int argc, char **argv)
 
         time_t last_refresh_time = time(NULL);
 
-        /* Save initial count for non connection fds */
-        initial_nfds = daemon.nfds;
-
         /* Loop to accept clients */
         while (1) {
                 malloc_trim(0);
-                if (initial_nfds == daemon.nfds) {
-                        ret = prune_journal(daemon.record_journal, JOURNAL_TMPDIR);
-                        if (ret != 0) {
-                                telem_log(LOG_WARNING, "Unable to prune journal\n");
-                        }
-                }
                 ret = poll(daemon.pollfds, daemon.nfds, spool_process_time * 1000);
                 if (ret == -1) {
                         telem_perror("Failed to poll daemon file descriptors");
@@ -286,12 +264,6 @@ int main(int argc, char **argv)
                                                 telem_log(LOG_INFO, "Received a SIGHUP signal\n");
                                                 /* reload configuration file */
                                                 reload_config();
-
-                                                if (is_spool_valid()) {
-                                                        daemon.is_spool_valid = true;
-                                                        //calc_spool_dir_size();
-                                                        daemon.current_spool_size = get_spool_dir_size();
-                                                }
                                         }
                                 }
 
@@ -347,21 +319,15 @@ int main(int argc, char **argv)
                         }
                 } else {
                         time_t now = time(NULL);
-                        /* If spool is empty and time to recycle the daemon has elapsed*/
-                        if (daemon_recycling_enabled && (daemon.current_spool_size == 0) &&
+                        /* time to recycle the daemon has elapsed*/
+                        if (daemon_recycling_enabled &&
                             difftime(now, last_daemon_start_time) >= TM_DAEMON_EXIT_TIME) {
                                 /* Exit */
                                 telem_log(LOG_INFO, "Daemon exiting for recycling\n");
                                 goto clean_exit;
                         }
                 }
-
                 time_t now = time(NULL);
-                if (difftime(now, last_spool_run_time) >= spool_process_time) {
-                        spool_records_loop(&(daemon.current_spool_size));
-                        last_spool_run_time = time(NULL);
-                }
-
                 if (difftime(now, last_refresh_time) >= TM_REFRESH_RATE) {
                         int ret = update_machine_id();
                         if (ret == -1) {
@@ -372,14 +338,13 @@ int main(int argc, char **argv)
         }
 
 clean_exit:
-        close_journal(daemon.record_journal);
 
         /* Free memory before exiting */
         while ((cl = LIST_FIRST(&(daemon.client_head))) != NULL) {
                 remove_client(&(daemon.client_head), cl);
         }
         free(daemon.pollfds);
-
+        free(daemon.machine_id_override);
         if (LIST_EMPTY(&(daemon.client_head))) {
                 telem_log(LOG_INFO, "Client list cleared\n");
         }

src/probes/README.md

@@ -0,0 +1,53 @@
+# Probes
+
+The default probes provided along the telemetry client code are:
+
+* bertprobe: this probe reports on the Boot Error Region Table if such
+  entry is found in ```/sys/firmware/acpi/tables/BERT```.
+
+* crashprobe: This probe processes core dump files. It can be registered as
+  the kernel core file handler in /proc/sys/kernel/core_pattern.
+
+* hprobe: a simple probe that sends a keep alive message. This probe can also
+  be useful for testing
+
+* journalprobe: a probe that monitors the systemd journal for log messages
+  from failed services.
+
+* oopsprobe: a probe to collect 'oops messages' when the kernel detects a
+  problem.
+
+* pstoreprobe: probe to collect messages left on pstore filesystem.
+
+* telem-record-gen: this is a "general-purpose probe" for sending custom
+  records on-the-fly. This tool can be used stand alone or as a part of a
+  script to implement a probe.
+
+For example to generate an hprobe like message we can execute the following
+command:
+
+```
+$ telem-record-gen --class org.example/hello/world --payload hello
+```
+
+for more options use the ```--help``` switch i.e.:
+
+```
+$ telem-record-gen --help
+Usage:
+  telem-record-gen [OPTIONS] - create and send a custom telemetry record
+
+Help Options:
+  -h, --help            Show help options
+
+Application Options:
+  -f, --config-file     Path to configuration file (not implemented yet)
+  -V, --version         Print the program version
+  -s, --severity        Severity level (1-4) - (default 1)
+  -c, --class           Classification level_1/level_2/level_3
+  -p, --payload         Record body (max size = 8k)
+  -P, --payload-file    File to read payload from
+  -R, --record-version  Version number for format of payload (default 1)
+  -e, --event-id        Event id to use in the record
+
+```

src/probes/crash_probe.c

@@ -641,16 +641,12 @@ int main(int argc, char **argv)
                 nc_string_append_printf(header, "Signal: %ld\n", signal_num);
         }
 
-        if (process_corefile(&backtrace) < 0) {
-                goto fail;
-        }
-
         /* On Clear Linux OS, missing symbols may appear if automatic debuginfo
          * downloads are still in flight. So if any missing symbols appear on
          * the first run (indicated by the presence of "??? - ["), wait 10
-         * seconds and try again.
+         * seconds and try again. Also retry if errors occur in the first run.
          */
-        if (strstr(backtrace->str, "??? - [")) {
+        if ((process_corefile(&backtrace) < 0) || (strstr(backtrace->str, "??? - ["))) {
                 sleep(10);
 
                 if (prepare_corefile(&e_core, core_fd) < 0) {

src/probes/telem_record_gen.c

@@ -39,10 +39,13 @@ static char *opt_payload = NULL;
 static uint32_t payload_version = 1;
 static char *opt_payload_file = NULL;
 static char *opt_event_id = NULL;
+static bool opt_echo = false;
+static bool opt_nopost = false;
 
 static const struct option prog_opts[] = {
         { "help", no_argument, 0, 'h' },
-        { "config-file", required_argument, 0, 'f' },
+        { "echo", no_argument, 0, 'o' },
+        { "no-post", no_argument, 0, 'n' },
         { "version", no_argument, 0, 'V' },
         { "severity", required_argument, 0, 's' },
         { "class", required_argument, 0, 'c' },
@@ -62,14 +65,15 @@ static void print_help(void)
         printf("  -h, --help            Show help options\n");
         printf("\n");
         printf("Application Options:\n");
-        printf("  -f, --config-file     Path to configuration file (not implemented yet)\n");
         printf("  -V, --version         Print the program version\n");
         printf("  -s, --severity        Severity level (1-4) - (default 1)\n");
-        printf("  -c, --class           Classification level_1/level_2/level_3\n");
-        printf("  -p, --payload         Record body (max size = 8k)\n");
+        printf("  -c, --class           Classification level_1/level_2/level_3 (required)\n");
+        printf("  -p, --payload         Record body (max size = 8k) (required)\n");
         printf("  -P, --payload-file    File to read payload from\n");
         printf("  -R, --record-version  Version number for format of payload (default 1)\n");
-        printf("  -e,  --event-id        Event id to use in the record\n");
+        printf("  -e, --event-id        Event id to use in the record\n");
+        printf("  -o, --echo            Echo record to stdout\n");
+        printf("  -n, --no-post         Do not post record just print\n");
         printf("\n");
 }
 
@@ -94,7 +98,7 @@ int parse_options(int argc, char **argv)
         long unsigned int tmp = 0;
 
         int opt;
-        while ((opt = getopt_long(argc, argv, "hc:Vs:c:p:P:R:e:", prog_opts, NULL)) != -1) {
+        while ((opt = getopt_long(argc, argv, "hc:Vs:c:p:P:R:e:on", prog_opts, NULL)) != -1) {
                 switch (opt) {
                         case 'h':
                                 print_help();
@@ -149,6 +153,12 @@ int parse_options(int argc, char **argv)
                                         goto fail;
                                 }
                                 break;
+                        case 'o':
+                                opt_echo = true;
+                                break;
+                        case 'n':
+                                opt_nopost = true;
+                                break;
                 }
         }
 
@@ -322,34 +332,62 @@ out1:
         return ret;
 }
 
-int send_record(char *payload)
+int instanciate_record(struct telem_ref **t_ref, char *payload)
 {
-        struct telem_ref *t_ref;
         int ret = 0;
 
-        if (tm_create_record(&t_ref, (uint32_t)severity,
-                             opt_class, payload_version) < 0) {
+        if ((ret = tm_create_record(t_ref, (uint32_t)severity,
+                                    opt_class, payload_version)) < 0) {
                 goto out1;
         }
 
-        if (opt_event_id && tm_set_event_id(t_ref, opt_event_id) < 0) {
-                goto out2;
+        if ((ret = opt_event_id && tm_set_event_id(*t_ref, opt_event_id)) < 0) {
+                goto out1;
         }
 
-        if (tm_set_payload(t_ref, payload) < 0) {
-                goto out2;
+        if ((ret = tm_set_payload(*t_ref, payload)) < 0) {
+                goto out1;
         }
-
-        if (tm_send_record(t_ref) >= 0) {
-                ret = 1;
-        }
-
-out2:
-        tm_free_record(t_ref);
 out1:
         return ret;
 }
 
+int send_record(char *payload)
+{
+        struct telem_ref *t_ref = NULL;
+        int ret = 0;
+
+        if ((ret = instanciate_record(&t_ref, payload)) < 0) {
+                goto out;
+        }
+
+        if ((ret = tm_send_record(t_ref)) < 0) {
+                goto out;
+        }
+
+out:
+        tm_free_record(t_ref);
+
+        return ret;
+}
+
+int print_record(char *payload)
+{
+        struct telem_ref *t_ref = NULL;
+        int ret = 0;
+        int i = 0;
+
+        if ((ret = instanciate_record(&t_ref, payload)) != -1) {
+                for (i = 0; i < NUM_HEADERS; i++) {
+                        fprintf(stdout, "%s", t_ref->record->headers[i]);
+                }
+                fprintf(stdout, "%s\n", t_ref->record->payload);
+                tm_free_record(t_ref);
+        }
+
+        return ret;
+}
+
 int main(int argc, char **argv)
 {
         int ret = EXIT_FAILURE;
@@ -367,7 +405,11 @@ int main(int argc, char **argv)
                 goto fail;
         }
 
-        if (!send_record(payload)) {
+        if (opt_echo == true) {
+                print_record(payload);
+        }
+
+        if (opt_nopost == false && send_record(payload) != 0) {
                 goto fail;
         }
 
@@ -377,6 +419,7 @@ fail:
         free(opt_class);
         free(opt_payload);
         free(opt_event_id);
+        free(payload);
 
         return ret;
 }

src/retention.c

@@ -0,0 +1,46 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include "log.h"
+#include "common.h"
+
+int delete_record_by_id(char *record_id)
+{
+        int ret = 0;
+        char *record_path = NULL;
+
+        ret = asprintf(&record_path, "%s/%s", RECORD_RETENTION_DIR, record_id);
+        if (ret == -1) {
+                return 1;
+        }
+        ret = unlink(record_path);
+        if (ret == -1) {
+                telem_perror("Error deleting saved record");
+        }
+        free(record_path);
+
+        return 0;
+}
+
+/* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

src/retention.h

@@ -0,0 +1,27 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#define _GNU_SOURCE
+
+/**
+ * Delete record identified by record unique id
+ *
+ * @param record_id Unique identifier of entry
+ *
+ */
+int delete_record_by_id(char *record_id);
+
+/* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

src/spool.c

@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include "spool.h"
-#include "telemdaemon.h"
+#include "telempostdaemon.h"
 #include "log.h"
 #include "configuration.h"
 #include "util.h"
@@ -221,7 +221,7 @@ void transmit_spooled_record(char *record_path, bool *post_succeeded, long size)
                 }
                 //Get rid of trailing newline
                 strtok(line, "\n");
-                if (get_header(line, header_name, &headers[i], strlen(header_name))) {
+                if (get_header(line, header_name, &headers[i])) {
                         continue;
                 } else {
                         telem_log(LOG_ERR, "transmit_spooled_record: Incorrect"
@@ -254,7 +254,7 @@ void transmit_spooled_record(char *record_path, bool *post_succeeded, long size)
                 goto read_error;
         }
 
-        *post_succeeded = post_record_http(headers, payload, false);
+        *post_succeeded = post_record_http(headers, payload);
         if (*post_succeeded) {
                 unlink(record_path);
         }

src/telemdaemon.c

@@ -29,6 +29,7 @@
 #include <malloc.h>
 #include <sys/uio.h>
 
+#include "iorecord.h"
 #include "telemdaemon.h"
 #include "common.h"
 #include "util.h"
@@ -42,25 +43,7 @@ void initialize_daemon(TelemDaemon *daemon)
         daemon->nfds = 0;
         daemon->pollfds = NULL;
         daemon->client_head = head;
-        daemon->bypass_http_post_ts = 0;
-        daemon->is_spool_valid = false;
-        daemon->record_journal = open_journal(JOURNAL_PATH);
-        initialize_rate_limit(daemon);
-        daemon->current_spool_size = 0;
-}
-
-void initialize_rate_limit(TelemDaemon *daemon)
-{
-        for (int i = 0; i < TM_RATE_LIMIT_SLOTS; i++) {
-                daemon->record_burst_array[i] = 0;
-                daemon->byte_burst_array[i] = 0;
-        }
-        daemon->rate_limit_enabled = rate_limit_enabled_config();
-        daemon->record_burst_limit = record_burst_limit_config();
-        daemon->record_window_length = record_window_length_config();
-        daemon->byte_burst_limit = byte_burst_limit_config();
-        daemon->byte_window_length = byte_window_length_config();
-        daemon->rate_limit_strategy = rate_limit_strategy_config();
+        daemon->machine_id_override = NULL;
 }
 
 client *add_client(client_list_head *client_head, int fd)
@@ -267,28 +250,15 @@ void machine_id_replace(char **machine_header, char *machine_id_override)
 void process_record(TelemDaemon *daemon, client *cl)
 {
         int i = 0;
+        int ret = 0;
         char *headers[NUM_HEADERS];
-        bool do_spool = false;
-        bool record_sent = false;
         char *tok = NULL;
         size_t header_size = 0;
         size_t message_size = 0;
         char *temp_headers = NULL;
         char *msg;
         char *body;
-        int current_minute = 0;
-        bool record_check_passed = true;
-        bool byte_check_passed = true;
-        bool record_burst_enabled = true;
-        bool byte_burst_enabled = true;
-        /* values for journal */
-        char *classification_value;
-        char *event_id_value;
-
-        /* Gets the current minute of time */
-        time_t temp = time(NULL);
-        struct tm *tm_s = localtime(&temp);
-        current_minute = tm_s->tm_min;
+        char *recordpath = NULL;
 
         header_size = *(uint32_t *)cl->buf;
         message_size = cl->size - header_size;
@@ -302,7 +272,7 @@ void process_record(TelemDaemon *daemon, client *cl)
         for (i = 0; i < NUM_HEADERS; i++) {
                 const char *header_name = get_header_name(i);
 
-                if (get_header(tok, header_name, &headers[i], strlen(header_name))) {
+                if (get_header(tok, header_name, &headers[i])) {
                         if (strcmp(header_name, TM_MACHINE_ID_STR) == 0) {
                                 machine_id_replace(&headers[i], daemon->machine_id_override);
                         }
@@ -316,77 +286,15 @@ void process_record(TelemDaemon *daemon, client *cl)
         /* TODO : check if the body is within the limits. */
         body = msg + header_size;
 
-        /* Save record in journal */
-        if (get_header_value(headers[TM_CLASSIFICATION], &classification_value) &&
-            get_header_value(headers[TM_EVENT_ID], &event_id_value)) {
-                if (new_journal_entry(daemon->record_journal, classification_value, temp, event_id_value) != 0) {
-                        telem_log(LOG_INFO, "new_journal_entry in process_record: failed saving record entry\n");
-                }
-        }
-        free(classification_value);
-        free(event_id_value);
-
-        if (inside_direct_spool_window(daemon, time(NULL))) {
-                telem_log(LOG_INFO, "process_record: delivering directly to spool\n");
-                spool_record(daemon, headers, body);
-                goto end;
-        }
-        if (daemon->record_window_length == -1 ||
-            daemon->byte_window_length == -1) {
-                telem_log(LOG_ERR, "Invalid value for window length\n");
+        /* Save record to stage */
+        ret = asprintf(&recordpath, "%s/XXXXXX", spool_dir_config());
+        if (ret == -1) {
+                telem_log(LOG_ERR, "Failed to allocate memory for record name in staging folder, aborting\n");
                 exit(EXIT_FAILURE);
         }
-        /* Checks if entirety of rate limiting is enabled */
-        if (daemon->rate_limit_enabled) {
-                /* Checks whether record and byte bursts are enabled individually */
-                record_burst_enabled = burst_limit_enabled(daemon->record_burst_limit);
-                byte_burst_enabled = burst_limit_enabled(daemon->byte_burst_limit);
-
-                if (record_burst_enabled) {
-                        record_check_passed = rate_limit_check(current_minute,
-                                                               daemon->record_burst_limit, daemon->record_window_length,
-                                                               daemon->record_burst_array, TM_RECORD_COUNTER);
-                }
-                if (byte_burst_enabled) {
-                        byte_check_passed = rate_limit_check(current_minute,
-                                                             daemon->byte_burst_limit, daemon->byte_window_length,
-                                                             daemon->byte_burst_array, cl->size);
-                }
-                /* If both record and byte burst disabled, rate limiting disabled */
-                if (!record_burst_enabled && !byte_burst_enabled) {
-                        daemon->rate_limit_enabled = false;
-                }
-        }
-        /* Sends record if rate limiting is disabled, or all checks passed */
-        if (!daemon->rate_limit_enabled || (record_check_passed && byte_check_passed)) {
-                /* Send the record as https post */
-                record_sent = post_record_ptr(headers, body, true);
-        }
-
-        // Get rate-limit strategy
-        do_spool = spool_strategy_selected(daemon);
-
-        // Drop record
-        if (!record_sent && !do_spool) {
-                goto end;
-        }
-        // Spool Record
-        else if (!record_sent && do_spool) {
-                start_network_bypass(daemon);
-                telem_log(LOG_INFO, "process_record: initializing direct-spool window\n");
-                spool_record(daemon, headers, body);
-        } else {
-                /* Updates rate limiting arrays if record sent */
-                if (record_burst_enabled) {
-                        rate_limit_update (current_minute, daemon->record_window_length,
-                                           daemon->record_burst_array, TM_RECORD_COUNTER);
-                }
-                if (byte_burst_enabled) {
-                        rate_limit_update (current_minute, daemon->byte_window_length,
-                                           daemon->byte_burst_array, cl->size);
-                }
-        }
 
+        stage_record(recordpath, headers, body);
+        free(recordpath);
 end:
         free(temp_headers);
         for (int k = 0; k < i; k++)
@@ -394,242 +302,6 @@ end:
         return;
 }
 
-bool burst_limit_enabled(int64_t burst_limit)
-{
-        return (burst_limit > -1) ? true : false;
-}
-
-bool rate_limit_check(int current_minute, int64_t burst_limit, int
-                      window_length, size_t *array, size_t incValue)
-{
-        size_t count = 0;
-
-        /* Variable to determine last minute allowed in burst window */
-        int window_start = (TM_RATE_LIMIT_SLOTS + (current_minute - window_length + 1))
-                           % TM_RATE_LIMIT_SLOTS;
-
-        /* The modulo is not placed in the for loop inself, because if
-         * the current minute is less than the window start (from wrapping)
-         * the for loop will never be entered.
-         */
-
-        /* Counts all elements within burst_window in array */
-        for (int i = window_start; i < (window_start + window_length); i++) {
-                count += array[i % TM_RATE_LIMIT_SLOTS];
-
-                if ((array[i % TM_RATE_LIMIT_SLOTS] + incValue) >= SIZE_MAX) {
-                        /* Exceeds maximum size array can hold */
-                        return false;
-                }
-        }
-        /* Include current record being processed to count */
-        count += incValue;
-
-        /* Determines whether the count has exceeded the limit or not */
-        return (count > burst_limit) ? false : true;
-}
-
-void rate_limit_update(int current_minute, int window_length, size_t *array,
-                       size_t incValue)
-{
-        /* Variable to determine the amount of zero'd out spots needed */
-        int blank_slots = (TM_RATE_LIMIT_SLOTS - window_length);
-
-        /* Update specified array depending on increment value */
-        array[current_minute] += incValue;
-
-        /* Zero out expired records for record array */
-        for (int i = current_minute + 1; i < (blank_slots + current_minute + 1); i++) {
-                array[i % TM_RATE_LIMIT_SLOTS] = 0;
-        }
-}
-
-bool spool_strategy_selected(TelemDaemon *daemon)
-{
-        /* Performs action depending on strategy choosen */
-        return (strcmp(daemon->rate_limit_strategy, "spool") == 0) ? true : false;
-}
-
-bool inside_direct_spool_window(TelemDaemon *daemon, time_t current_time)
-{
-        return (current_time < daemon->bypass_http_post_ts + 1800) ? true : false;
-}
-
-void start_network_bypass(TelemDaemon *daemon)
-{
-        daemon->bypass_http_post_ts = time(NULL);
-}
-
-size_t write_callback(char *ptr, size_t size, size_t nmemb, void *userdata)
-{
-        telem_log(LOG_DEBUG, "Received data:\n%s\n", ptr);
-        return size * nmemb;
-}
-
-bool post_record_http(char *headers[], char *body, bool spool)
-{
-        CURL *curl;
-        int res = 0;
-        char *content = "Content-Type: application/text";
-        struct curl_slist *custom_headers = NULL;
-        char errorbuf[CURL_ERROR_SIZE];
-        long http_response = 0;
-        const char *cert_file = get_cainfo_config();
-        const char *tid_header = get_tidheader_config();
-
-        // Initialize the libcurl global environment once per POST. This lets us
-        // clean up the environment after each POST so that when the daemon is
-        // sitting idle, it will be consuming as little memory as possible.
-        curl_global_init(CURL_GLOBAL_ALL);
-
-        curl = curl_easy_init();
-        if (!curl) {
-                telem_log(LOG_ERR, "curl_easy_init(): Unable to start libcurl"
-                          " easy session, exiting\n");
-                exit(EXIT_FAILURE);
-                /* TODO: check if memory needs to be released */
-        }
-
-        // Errors for any curl_easy_* functions will store nice error messages
-        // in errorbuf, so send log messages with errorbuf contents
-        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorbuf);
-
-        curl_easy_setopt(curl, CURLOPT_URL, server_addr_config());
-        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 5L);
-        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 10L);
-        curl_easy_setopt(curl, CURLOPT_POST, 1);
-#ifdef DEBUG
-        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-#endif
-
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
-
-        for (int i = 0; i < NUM_HEADERS; i++) {
-                custom_headers = curl_slist_append(custom_headers, headers[i]);
-        }
-        custom_headers = curl_slist_append(custom_headers, tid_header);
-        // This should be set by probes/libtelemetry in the future
-        custom_headers = curl_slist_append(custom_headers, content);
-
-        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, custom_headers);
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body);
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strlen(body));
-        curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_TRY);
-
-        if (strlen(cert_file) > 0) {
-                if (access(cert_file, F_OK) != -1) {
-                        curl_easy_setopt(curl, CURLOPT_CAINFO, cert_file);
-                        telem_log(LOG_INFO, "cafile was set to %s\n", cert_file);
-                }
-        }
-
-        telem_log(LOG_DEBUG, "Executing curl operation...\n");
-        errorbuf[0] = 0;
-        res = curl_easy_perform(curl);
-        curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_response);
-
-        if (res) {
-                size_t len = strlen(errorbuf);
-                if (len) {
-                        telem_log(LOG_ERR, "Failed sending record: %s%s", errorbuf,
-                                  ((errorbuf[len - 1] != '\n') ? "\n" : ""));
-                } else {
-                        telem_log(LOG_ERR, "Failed sending record: %s\n",
-                                  curl_easy_strerror(res));
-                }
-        } else if (http_response != 201 && http_response != 200) {
-                /*  201 means the record was  successfully created
-                 *  200 is a generic "ok".
-                 *  TODO: Make list of white-listed response codes configurable?
-                 */
-                telem_log(LOG_ERR, "Encountered error %ld on the server\n",
-                          http_response);
-                // We treat HTTP error codes the same as libcurl errors
-                res = 1;
-        } else {
-                telem_log(LOG_INFO, "Record sent successfully\n");
-        }
-
-        curl_slist_free_all(custom_headers);
-        curl_easy_cleanup(curl);
-
-        curl_global_cleanup();
-
-        return res ? false : true;
-}
-
-void spool_record(TelemDaemon *daemon, char *headers[], char *body)
-{
-        int ret = 0;
-        struct stat stat_buf;
-        int64_t max_spool_size = 0;
-        char *tmpbuf = NULL;
-        FILE *tmpfile = NULL;
-        int tmpfd = 0;
-
-        if (!daemon->is_spool_valid) {
-                /* If spool is not valid, simply drop the record */
-                return;
-        }
-
-        //check if the size is greater than 1 MB/spool max size
-        max_spool_size = spool_max_size_config();
-        if (max_spool_size != -1) {
-                telem_log(LOG_DEBUG, "Total size of spool dir: %ld\n", daemon->current_spool_size);
-                if (daemon->current_spool_size < 0) {
-                        telem_log(LOG_ERR, "Error getting spool directory size: %s\n",
-                                  strerror(-(int)(daemon->current_spool_size)));
-                        return;
-                } else if (daemon->current_spool_size >= (max_spool_size * 1024)) {
-                        telem_log(LOG_INFO, "Spool dir full, dropping record\n");
-                        return;
-                }
-        }
-
-        // create file with record
-        ret = asprintf(&tmpbuf, "%s/XXXXXX", spool_dir_config());
-        if (ret == -1) {
-                telem_log(LOG_ERR, "Failed to allocate memory for record name, aborting\n");
-                exit(EXIT_FAILURE);
-        }
-
-        tmpfd = mkstemp(tmpbuf);
-        if (tmpfd == -1) {
-                telem_perror("Error while creating temp file");
-                goto spool_err;
-        }
-
-        //fp = fopen(spool_dir_path, const char *mode);
-        tmpfile = fdopen(tmpfd, "a");
-        if (!tmpfile) {
-                telem_perror("Error opening temp file");
-                close(tmpfd);
-                if (unlink(tmpbuf)) {
-                        telem_perror("Error deleting temp file");
-                }
-                goto spool_err;
-        }
-
-        // write headers
-        for (int i = 0; i < NUM_HEADERS; i++) {
-                fprintf(tmpfile, "%s\n", headers[i]);
-        }
-
-        //write body
-        fprintf(tmpfile, "%s\n", body);
-        fflush(tmpfile);
-        fclose(tmpfile);
-
-        /* The stat should not fail here unless it is ENOMEM */
-        if (stat(tmpbuf, &stat_buf) == 0) {
-                daemon->current_spool_size += (stat_buf.st_blocks * 512);
-        }
-
-spool_err:
-        free(tmpbuf);
-        return;
-}
-
 void add_pollfd(TelemDaemon *daemon, int fd, short events)
 {
         assert(daemon);

src/telemdaemon.h

@@ -22,7 +22,6 @@
 #include <sys/queue.h>
 #include <stdbool.h>
 #include <inttypes.h>
-#include "journal/journal.h"
 
 #define TM_MACHINE_ID_EXPIRY (3 /*d*/ * 24 /*h*/ * 60 /*m*/ * 60 /*s*/)
 
@@ -55,24 +54,6 @@ typedef struct TelemDaemon {
         size_t current_alloc;
         /* client list head */
         client_list_head client_head;
-        /* Time of last failed post */
-        time_t bypass_http_post_ts;
-        /* Telemetry Journal*/
-        TelemJournal *record_journal;
-        /* Rate limit record and byte arrays */
-        size_t record_burst_array[TM_RATE_LIMIT_SLOTS];
-        size_t byte_burst_array[TM_RATE_LIMIT_SLOTS];
-        /* Rate Limit Configurations */
-        bool rate_limit_enabled;
-        int64_t record_burst_limit;
-        int record_window_length;
-        int64_t byte_burst_limit;
-        int byte_window_length;
-        const char *rate_limit_strategy;
-
-        bool is_spool_valid;
-        long current_spool_size;
-
         char *machine_id_override;
 } TelemDaemon;
 
@@ -83,13 +64,6 @@ typedef struct TelemDaemon {
  */
 void initialize_daemon(TelemDaemon *daemon);
 
-/**
- * Initialize rate-limiting in the daemon
- *
- * @param daemon A pointer to the daemon structure
- */
-void initialize_rate_limit(TelemDaemon *daemon);
-
 /**
  * Add poll fd struct to the array of pollfds.
  *
@@ -172,105 +146,6 @@ void terminate_client(TelemDaemon *daemon, client *cl, nfds_t index);
  */
 void process_record(TelemDaemon *daemon, client *cl);
 
-/**
- * Check if burst limiting is enabled
- *
- * @param burst_limit Burst limit amount. If negative rate limiting
- * is disabled
- *
- * @return true if rate limiting for burst_limit variable is enabled
- */
-bool burst_limit_enabled(int64_t burst_limit);
-
-/**
- * Checks whether record does not exceed the burst threshold
- *
- * @param current_minute The current minute of time the record processed
- * @param burst_limit Amount of records that can be passed within a window
- * @param window_length Window of time burst limit refers to
- * @param array Pointer to array that stores record or byte count
- * @param incValue Amount to increase array slot by
- *
- * @return true if record does not exceed threshold, and false otherwise
- */
-bool rate_limit_check(int current_minute, int64_t burst_limit, int
-                      window_length, size_t *array, size_t incValue);
-
-/**
- * Updates rate limit arrays with passing record information
- *
- * @param current_minute The current minute of time the record processed
- * @param window_length Window of time burst limit refers to
- * @param array Pointer to array that stores record or byte count
- * @param incValue Amount to increase array slot by
- *
- */
-void rate_limit_update(int current_minute, int window_length,
-                       size_t *array, size_t incValue);
-
-/**
- * Checks if the spool strategy is chosen for rate-limiting
- *
- * @param daemon Pointer to the daemon
- *
- * @return true if spool is choosen false if drop is choosen
- */
-bool spool_strategy_selected(TelemDaemon *daemon);
-
-/**
- * Check if daemon should direct-spool after encountering network issues.
- *
- * @param daemon Pointer to the daemon
- * @param time The time as time_t (usually from time())
- *
- * @return true if inside direct spool window, false otherwise.
- */
-bool inside_direct_spool_window(TelemDaemon *daemon, time_t time);
-
-/**
- * Set the start time of the direct spool window. Will use the
- * current time.
- *
- * @param daemon Pointer to the daemon
- *
- * @return no return value.
- */
-void start_network_bypass(TelemDaemon *daemon);
-
-/**
- * Function pointer for posting the records to the server. Replaced by a
- * mock function in the unit tests.
- *
- * @param header_values The header data read from the socket
- * @param body The payload of the record read
- * @param spool Indicate whether the record should be spooled if not
- *    successfully delivered
- *
- * @return true if the record was successfully posted
- */
-extern bool (*post_record_ptr)(char *headers[], char *body, bool spool);
-
-/**
- * Post records on a http connection to server
- *
- * @param header_values The header data read from the socket
- * @param body The payload of the record read
- * @param spool Indicate whether the record should be spooled if not
- *    successfully delivered
- *
- * @return true if the record was successfully posted
- */
-bool post_record_http(char *header_values[], char *body, bool spool);
-
-/**
- * Spool the record in case it cannot be delivered to the server
- *
- * @param headers The headers for the record
- * @param body The payload of the record
- *
- */
-void spool_record(TelemDaemon * daemon, char *headers[], char *body);
-
 /**
  * Get random machine id stored in file
  *
@@ -292,4 +167,5 @@ int update_machine_id(void);
  * or if the file is empty
  */
 char *read_machine_id_override(void);
+
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

src/telemetry.c

@@ -316,7 +316,7 @@ static int set_system_build_header(struct telem_ref *t_ref)
 
 /**
  * Sets the header reporting the machine_id. Note, the machine_id is really
- * managed by the telemetrics daemon (telemd), and populated by the daemon
+ * managed by the telemetrics daemon (telemprobd), and populated by the daemon
  * as it delivers the records. Consequently, the header is simply set to a
  * dummy value of 0xFFFFFFF.
  *
@@ -410,7 +410,7 @@ static int set_cpu_model_header(struct telem_ref *t_ref)
                         model_str_len = strlen(model_name);
                         if (model_str_len > 2) {
                                 model_name = (char *)model_name + 2 * sizeof(char);
-                                model_name[model_str_len - 2] = '\0';
+                                model_name[model_str_len - 3] = '\0';
                         } else {
                                 model_name = "blank";
                         }
@@ -615,37 +615,6 @@ static int set_bios_version_header(struct telem_ref *t_ref)
         return status;
 }
 
-/**
- * Generates an alphanumeric id of length 32
- *
- * @param buff pointer to memory buffer, buffer should have
- *        at least 33 bytes of memory
- *
- * @return 0 if successful, or -1 if there's a problem
- *
- */
-static int gen_event_id(char *buff)
-{
-        int frandom = -1;
-        int result = -1;
-        uint64_t random_id[2] = { 0 };
-
-        frandom = open("/dev/urandom", O_RDONLY);
-        if (frandom < 0) {
-                return -1;
-        }
-
-        if (read(frandom, &random_id, sizeof(random_id)) == sizeof(random_id)) {
-                if (sprintf(buff, "%.16" PRIx64 "%.16" PRIx64, random_id[0], random_id[1]) == 32) {
-                        result = 0;
-                }
-        }
-
-        close(frandom);
-
-        return result;
-}
-
 /**
  * Sets the event_id header, this id is an identifier that multiple
  * records can share. This means that one event can lead to multiple
@@ -659,9 +628,9 @@ static int gen_event_id(char *buff)
 static int set_event_id_header(struct telem_ref *t_ref)
 {
         int rc = 0;
-        char buff[33];
+        char *buff = NULL;
 
-        rc = gen_event_id(buff);
+        rc = get_random_id(&buff);
 
         if (rc == 0) {
                 rc = set_header(
@@ -669,6 +638,7 @@ static int set_event_id_header(struct telem_ref *t_ref)
                         TM_EVENT_ID_STR, buff,
                         &(t_ref->record->header_size));
         }
+        free(buff);
 
         return rc;
 }
@@ -1111,7 +1081,7 @@ int tm_set_event_id(struct telem_ref *t_ref, char *event_id)
 }
 
 /**
- * Write nbytes from buf to fd. Used to send records to telemd.
+ * Write nbytes from buf to fd. Used to send records to telemprobd.
  *
  * @param fd Socket fd obtained from tm_get_socket.
  * @param buf Data to be written to the socket.

src/telemetry.h

@@ -31,7 +31,10 @@
  * - a library, libtelemetry, that telemetrics probes use to create telemetrics
  *   records and send them to the daemon for further processing.
  *
- * - a daemon, telemd, that prepares the records to send to a telemetrics server
+ * - telemprobd, a daemon that handles communication with probes and forwards
+ *   records to a second daemon.
+ *
+ * - telempostd, this daemon sends telemetry records to a telemetrics server
  *   (not included in this source tree), or spools the records on disk in case
  *   it's unable to successfully deliver them.
  *

src/telempostdaemon.c

@@ -0,0 +1,722 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <assert.h>
+#include <signal.h>
+#include <dirent.h>
+#include <malloc.h>
+#include <stdbool.h>
+#include <sys/stat.h>
+#include <curl/curl.h>
+#include <sys/signalfd.h>
+
+#include "log.h"
+#include "util.h"
+#include "spool.h"
+#include "iorecord.h"
+#include "retention.h"
+#include "telempostdaemon.h"
+
+/* spool window check */
+static bool inside_direct_spool_window(TelemPostDaemon *daemon, time_t current_time)
+{
+        return (current_time < daemon->bypass_http_post_ts + 1800) ? true : false;
+}
+
+/* set http bypass */
+static void start_network_bypass(TelemPostDaemon *daemon)
+{
+        daemon->bypass_http_post_ts = time(NULL);
+}
+
+/* burst limit check  */
+bool burst_limit_enabled(int64_t burst_limit)
+{
+        return (burst_limit > -1) ? true : false;
+}
+
+/* rate limit check */
+bool rate_limit_check(int current_minute, int64_t burst_limit, int
+                      window_length, size_t *array, size_t incValue)
+{
+        size_t count = 0;
+
+        /* Variable to determine last minute allowed in burst window */
+        int window_start = (TM_RATE_LIMIT_SLOTS + (current_minute - window_length + 1))
+                           % TM_RATE_LIMIT_SLOTS;
+
+        /* The modulo is not placed in the for loop itself, because if
+         * the current minute is less than the window start (from wrapping)
+         * the for loop will never be entered.
+         */
+
+        /* Counts all elements within burst_window in array */
+        for (int i = window_start; i < (window_start + window_length); i++) {
+                count += array[i % TM_RATE_LIMIT_SLOTS];
+
+                if ((array[i % TM_RATE_LIMIT_SLOTS] + incValue) >= SIZE_MAX) {
+                        /* Exceeds maximum size array can hold */
+                        return false;
+                }
+        }
+        /* Include current record being processed to count */
+        count += incValue;
+
+        /* Determines whether the count has exceeded the limit or not */
+        return (count > burst_limit) ? false : true;
+}
+
+/* spool strategy check */
+bool spool_strategy_selected(TelemPostDaemon *daemon)
+{
+        /* Performs action depending on strategy choosen */
+        return (strcmp(daemon->rate_limit_strategy, "spool") == 0) ? true : false;
+}
+
+/* rate limit check  */
+void rate_limit_update(int current_minute, int window_length, size_t *array,
+                       size_t incValue)
+{
+        /* Variable to determine the amount of zero'd out spots needed */
+        int blank_slots = (TM_RATE_LIMIT_SLOTS - window_length);
+
+        /* Update specified array depending on increment value */
+        array[current_minute] += incValue;
+        /* Zero out expired records for record array */
+        for (int i = current_minute + 1; i < (blank_slots + current_minute + 1); i++) {
+                array[i % TM_RATE_LIMIT_SLOTS] = 0;
+        }
+}
+
+static void set_pollfd(TelemPostDaemon *daemon, int fd, enum fdindex i, short events)
+{
+        assert(daemon);
+        assert(fd);
+
+        daemon->pollfds[i].fd = fd;
+        daemon->pollfds[i].events = events;
+        daemon->pollfds[i].revents = 0;
+}
+
+static void initialize_signals(TelemPostDaemon *daemon)
+{
+        int sigfd;
+        sigset_t mask;
+
+        sigemptyset(&mask);
+
+        if (sigaddset(&mask, SIGHUP) != 0) {
+                telem_perror("Error adding signal SIGHUP to mask");
+                exit(EXIT_FAILURE);
+        }
+
+        if (sigaddset(&mask, SIGINT) != 0) {
+                telem_perror("Error adding signal SIGINT to mask");
+                exit(EXIT_FAILURE);
+        }
+
+        if (sigaddset(&mask, SIGTERM) != 0) {
+                telem_perror("Error adding signal SIGTERM to mask");
+                exit(EXIT_FAILURE);
+        }
+
+        if (sigaddset(&mask, SIGPIPE) != 0) {
+                telem_perror("Error adding signal SIGPIPE to mask");
+                exit(EXIT_FAILURE);
+        }
+
+        if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) {
+                telem_perror("Error changing signal mask with SIG_BLOCK");
+                exit(EXIT_FAILURE);
+        }
+
+        sigfd = signalfd(-1, &mask, 0);
+        if (sigfd == -1) {
+                telem_perror("Error creating the signalfd");
+                exit(EXIT_FAILURE);
+        }
+
+        daemon->sfd = sigfd;
+
+        set_pollfd(daemon, sigfd, signlfd, POLLIN);
+}
+
+static void initialize_rate_limit(TelemPostDaemon *daemon)
+{
+        for (int i = 0; i < TM_RATE_LIMIT_SLOTS; i++) {
+                daemon->record_burst_array[i] = 0;
+                daemon->byte_burst_array[i] = 0;
+        }
+        daemon->rate_limit_enabled = rate_limit_enabled_config();
+        daemon->record_burst_limit = record_burst_limit_config();
+        daemon->record_window_length = record_window_length_config();
+        daemon->byte_burst_limit = byte_burst_limit_config();
+        daemon->byte_window_length = byte_window_length_config();
+        daemon->rate_limit_strategy = rate_limit_strategy_config();
+}
+
+static void initialize_record_delivery(TelemPostDaemon *daemon)
+{
+        daemon->record_retention_enabled = record_retention_enabled_config();
+        daemon->record_server_delivery_enabled = record_server_delivery_enabled_config();
+}
+
+void initialize_daemon(TelemPostDaemon *daemon)
+{
+        assert(daemon);
+
+        daemon->bypass_http_post_ts = 0;
+        daemon->is_spool_valid = is_spool_valid();
+        daemon->record_journal = open_journal(JOURNAL_PATH);
+        daemon->fd = inotify_init();
+        if (daemon->fd < 0) {
+                telem_perror("Error initializing inotify");
+                exit(EXIT_FAILURE);
+        }
+        daemon->wd = inotify_add_watch(daemon->fd, spool_dir_config(), IN_CLOSE_WRITE);
+
+        initialize_signals(daemon);
+        set_pollfd(daemon, daemon->fd, watchfd, POLLIN);
+
+        initialize_rate_limit(daemon);
+        initialize_record_delivery(daemon);
+        /* Register record retention delete action as a callback to prune entry */
+        if (daemon->record_journal != NULL && daemon->record_retention_enabled) {
+                daemon->record_journal->prune_entry_callback = &delete_record_by_id;
+        }
+        daemon->current_spool_size = 0;
+}
+
+size_t write_callback(char *ptr, size_t size, size_t nmemb, void *userdata)
+{
+        telem_log(LOG_DEBUG, "Received data:\n%s\n", ptr);
+        return size * nmemb;
+}
+
+bool post_record_http(char *headers[], char *body)
+{
+        CURL *curl;
+        int res = 0;
+        char *content = "Content-Type: application/text";
+        struct curl_slist *custom_headers = NULL;
+        char errorbuf[CURL_ERROR_SIZE];
+        long http_response = 0;
+        const char *cert_file = get_cainfo_config();
+        const char *tid_header = get_tidheader_config();
+
+        // Initialize the libcurl global environment once per POST. This lets us
+        // clean up the environment after each POST so that when the daemon is
+        // sitting idle, it will be consuming as little memory as possible.
+        curl_global_init(CURL_GLOBAL_ALL);
+
+        curl = curl_easy_init();
+        if (!curl) {
+                telem_log(LOG_ERR, "curl_easy_init(): Unable to start libcurl"
+                          " easy session, exiting\n");
+                exit(EXIT_FAILURE);
+                /* TODO: check if memory needs to be released */
+        }
+
+        // Errors for any curl_easy_* functions will store nice error messages
+        // in errorbuf, so send log messages with errorbuf contents
+        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorbuf);
+
+        curl_easy_setopt(curl, CURLOPT_URL, server_addr_config());
+        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 5L);
+        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 10L);
+        curl_easy_setopt(curl, CURLOPT_POST, 1);
+#ifdef DEBUG
+        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+#endif
+
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
+
+        for (int i = 0; i < NUM_HEADERS; i++) {
+                custom_headers = curl_slist_append(custom_headers, headers[i]);
+        }
+        custom_headers = curl_slist_append(custom_headers, tid_header);
+        // This should be set by probes/libtelemetry in the future
+        custom_headers = curl_slist_append(custom_headers, content);
+
+        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, custom_headers);
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body);
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strlen(body));
+        curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_TRY);
+
+        if (strlen(cert_file) > 0) {
+                if (access(cert_file, F_OK) != -1) {
+                        curl_easy_setopt(curl, CURLOPT_CAINFO, cert_file);
+                        telem_log(LOG_INFO, "cafile was set to %s\n", cert_file);
+                }
+        }
+
+        telem_log(LOG_DEBUG, "Executing curl operation...\n");
+        errorbuf[0] = 0;
+        res = curl_easy_perform(curl);
+        curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_response);
+
+        if (res) {
+                size_t len = strlen(errorbuf);
+                if (len) {
+                        telem_log(LOG_ERR, "Failed sending record: %s%s", errorbuf,
+                                  ((errorbuf[len - 1] != '\n') ? "\n" : ""));
+                } else {
+                        telem_log(LOG_ERR, "Failed sending record: %s\n",
+                                  curl_easy_strerror(res));
+                }
+        } else if (http_response != 201 && http_response != 200) {
+                /*  201 means the record was  successfully created
+                 *  200 is a generic "ok".
+                 */
+                telem_log(LOG_ERR, "Encountered error %ld on the server\n",
+                          http_response);
+                // We treat HTTP error codes the same as libcurl errors
+                res = 1;
+        } else {
+                telem_log(LOG_INFO, "Record sent successfully\n");
+        }
+
+        curl_slist_free_all(custom_headers);
+        curl_easy_cleanup(curl);
+
+        curl_global_cleanup();
+
+        return res ? false : true;
+}
+
+static void save_local_copy(TelemPostDaemon *daemon, char *body)
+{
+        int ret = 0;
+        char *tmpbuf = NULL;
+        FILE *tmpfile = NULL;
+
+        if (daemon == NULL || daemon->record_journal == NULL ||
+            daemon->record_journal->latest_record_id == NULL) {
+                return;
+        }
+
+        ret = asprintf(&tmpbuf, "%s/%s", RECORD_RETENTION_DIR,
+                       daemon->record_journal->latest_record_id);
+        if (ret == -1) {
+                telem_log(LOG_ERR, "Failed to allocate memory for record full path, aborting\n");
+                return;
+        }
+
+        tmpfile = fopen(tmpbuf, "w");
+        if (!tmpfile) {
+                telem_perror("Error opening local record copy temp file");
+                goto save_err;
+        }
+
+        // Save body
+        fprintf(tmpfile, "%s\n", body);
+        fclose(tmpfile);
+
+save_err:
+        free(tmpbuf);
+        return;
+}
+
+static void save_entry_to_journal(TelemPostDaemon *daemon, time_t t_stamp, char *headers[])
+{
+        char *classification_value;
+        char *event_id_value;
+
+        if (get_header_value(headers[TM_CLASSIFICATION], &classification_value) &&
+            get_header_value(headers[TM_EVENT_ID], &event_id_value)) {
+                if (new_journal_entry(daemon->record_journal, classification_value, t_stamp, event_id_value) != 0) {
+                        telem_log(LOG_INFO, "new_journal_entry in process_record: failed saving record entry\n");
+                }
+        }
+        free(classification_value);
+        free(event_id_value);
+}
+
+/* Check window length conf values */
+static bool windows_length_value_check(TelemPostDaemon *daemon)
+{
+        if (daemon->record_window_length == -1 ||
+            daemon->byte_window_length == -1) {
+                telem_log(LOG_ERR, "Invalid value for window length\n");
+                return false;
+        }
+
+        return true;
+}
+
+/* Rate limiting checks */
+static void rate_limit_checks(TelemPostDaemon *daemon, bool *record_check_passed, bool *byte_check_passed)
+{
+        time_t temp = time(NULL);
+        struct tm *tm_s = localtime(&temp);
+        int current_minute;
+        current_minute = tm_s->tm_min;
+        bool record_burst_enabled = burst_limit_enabled(daemon->record_burst_limit);
+        bool byte_burst_enabled =  burst_limit_enabled(daemon->byte_burst_limit);
+
+        /* Checks if entirety of rate limiting is enabled */
+        if (daemon->rate_limit_enabled) {
+                /* Checks whether record and byte bursts are enabled individually */
+                record_burst_enabled = burst_limit_enabled(daemon->record_burst_limit);
+                byte_burst_enabled = burst_limit_enabled(daemon->byte_burst_limit);
+
+                if (record_burst_enabled) {
+                        *record_check_passed = rate_limit_check(current_minute,
+                                                                daemon->record_burst_limit, daemon->record_window_length,
+                                                                daemon->record_burst_array, TM_RECORD_COUNTER);
+                }
+                if (byte_burst_enabled) {
+                        *byte_check_passed = rate_limit_check(current_minute,
+                                                              daemon->byte_burst_limit, daemon->byte_window_length,
+                                                              daemon->byte_burst_array, RECORD_SIZE_LEN);
+                }
+                /* If both record and byte burst disabled, rate limiting disabled */
+                if (!record_burst_enabled && !byte_burst_enabled) {
+                        daemon->rate_limit_enabled = false;
+                }
+        }
+
+}
+
+/* Wrapper for save local copy */
+static void apply_retention_policies(TelemPostDaemon *daemon, char *headers[], char *body)
+{
+        time_t temp = time(NULL);
+
+        save_entry_to_journal(daemon, temp, headers);
+
+        if (daemon->record_retention_enabled) {
+                save_local_copy(daemon, body);
+        }
+}
+
+/* Deliver record to backend if rate limiting policies are met otherwise
+ * spool record for future delivery */
+static bool deliver_record(TelemPostDaemon *daemon, char *headers[], char *body)
+{
+
+        bool ret = false;
+        int current_minute;
+        bool do_spool = false;
+        bool record_sent = false;
+        time_t temp = time(NULL);
+        struct tm *tm_s = localtime(&temp);
+        current_minute = tm_s->tm_min;
+        /* Checks flags */
+        bool record_check_passed = true;
+        bool byte_check_passed = true;
+        bool record_burst_enabled = burst_limit_enabled(daemon->record_burst_limit);
+        bool byte_burst_enabled =  burst_limit_enabled(daemon->byte_burst_limit);
+
+        /* Perform record and byte rate limiting checks */
+        rate_limit_checks(daemon, &record_check_passed, &byte_check_passed);
+
+        /* Sends record if rate limiting is disabled, or all checks passed */
+        if (!daemon->rate_limit_enabled || (record_check_passed && byte_check_passed)) {
+                /* Send the record as https post */
+                record_sent = post_record_ptr(headers, body);
+                /**
+                 * This is the only point where an error condition could be returned
+                 * if the record was not sent
+                 * */
+                ret = record_sent;
+        }
+        // Get rate-limit strategy
+        do_spool = spool_strategy_selected(daemon);
+
+        // Drop record
+        if (!record_sent && !do_spool) {
+                // Not an error condition
+                ret = true;
+        }
+        // Spool Record
+        else if (!record_sent && do_spool) {
+                start_network_bypass(daemon);
+                telem_log(LOG_INFO, "process_record: initializing direct-spool window\n");
+                // False will keep record around
+                ret = false;
+        } else {
+                /* Updates rate limiting arrays if record sent */
+                if (record_burst_enabled) {
+                        rate_limit_update(current_minute, daemon->record_window_length,
+                                          daemon->record_burst_array, TM_RECORD_COUNTER);
+                }
+                if (byte_burst_enabled) {
+                        rate_limit_update(current_minute, daemon->byte_window_length,
+                                          daemon->byte_burst_array, RECORD_SIZE_LEN);
+                }
+        }
+
+        return ret;
+}
+
+bool process_staged_record(char *filename, TelemPostDaemon *daemon)
+{
+        int k;
+        bool ret = false;
+        char *headers[NUM_HEADERS];
+        char *body = NULL;
+        struct stat buf;
+        time_t current_time = time(NULL);
+        int64_t max_spool_size = 0;
+
+        for (k = 0; k < NUM_HEADERS; k++) {
+                headers[k] = NULL;
+        }
+
+        /** Load record **/
+        if ((ret = read_record(filename, headers, &body)) == false) {
+                telem_log(LOG_WARNING, "unable to read record\n");
+                ret = true; // Record corrupted? true will remove record
+                goto end_processing_file;
+        }
+
+        /** Get file information  **/
+        if (stat(filename, &buf) == -1) {
+                telem_perror("Processing staged file unable to stat record in spool");
+                ret = true; // true to remove it
+                goto end_processing_file;
+        }
+
+        /** Update spool directory size **/
+        (daemon->current_spool_size) += (buf.st_blocks * 512);
+
+        /** Check that record is not expired **/
+        if (!S_ISREG(buf.st_mode) ||
+            (current_time - buf.st_mtime > (record_expiry_config() * 60)) ||
+            (buf.st_uid  != getuid())) {
+                ret = true; // Expired, true to remove it
+                goto end_processing_file;
+        }
+
+        /** Record retention **/
+        apply_retention_policies(daemon, headers, body);
+
+        /** Record delivery **/
+        if (!daemon->record_server_delivery_enabled) {
+#ifdef DEBUG
+                telem_log(LOG_WARNING, "record server delivery disabled\n");
+#endif
+                // Not an error condition
+                ret = true;
+                goto end_processing_file;
+        }
+
+        /** Spool policies **/
+        if (inside_direct_spool_window(daemon, time(NULL))) {
+#ifdef DEBUG
+                telem_log(LOG_INFO, "process_record: delivering directly to spool\n");
+#endif
+                /* Check spool max size conf */
+                max_spool_size = spool_max_size_config();
+                if (max_spool_size != -1 &&
+                    daemon->current_spool_size >= (max_spool_size * 1024)) {
+                        // Drop record
+                        telem_log(LOG_INFO, "Spool dir full, dropping record\n");
+                        ret = true;
+                } else {
+                        // Keep record, non error condition
+                        ret = false;
+                }
+                goto end_processing_file;
+        }
+
+        /** Check window_length **/
+        if (windows_length_value_check(daemon) == false) {
+                exit(EXIT_FAILURE);
+        }
+
+        /** Deliver or spool **/
+        ret = deliver_record(daemon, headers, body);
+
+end_processing_file:
+        /** Update spool size if record will be removed **/
+        if (ret) {
+                (daemon->current_spool_size) -= (buf.st_blocks * 512);
+        }
+        telem_log(LOG_DEBUG, "spool_size: %ld\n", daemon->current_spool_size);
+        free(body);
+
+        for (k = 0; k < NUM_HEADERS; k++) {
+                free(headers[k]);
+        }
+
+        return ret;
+}
+
+static int directory_dot_filter(const struct dirent *entry)
+{
+        if ((strcmp(entry->d_name, ".") == 0) || (strcmp(entry->d_name, "..") == 0)) {
+                return 0;
+        } else {
+                return 1;
+        }
+}
+
+void staging_records_loop(TelemPostDaemon *daemon)
+{
+        int ret;
+        int numentries;
+        struct dirent **namelist;
+
+        numentries = scandir(spool_dir_config(), &namelist, directory_dot_filter, NULL);
+
+        if (numentries == 0) {
+                telem_log(LOG_DEBUG, "No entries in staging\n");
+                return;
+        } else if (numentries < 0) {
+                telem_perror("Error while scanning staging");
+                return;
+        }
+
+        for (int i = 0; i < numentries; i++) {
+                char *record_path;
+                telem_log(LOG_DEBUG, "Processing staged record: %s\n",
+                          namelist[i]->d_name);
+                ret = asprintf(&record_path, "%s/%s", spool_dir_config(), namelist[i]->d_name);
+                if (ret == -1) {
+                        telem_log(LOG_ERR, "Failed to allocate memory for staging record full path\n");
+                        exit(EXIT_FAILURE);
+                }
+                if (process_staged_record(record_path, daemon)) {
+                        unlink(record_path);
+                }
+                free(record_path);
+        }
+
+        for (int i = 0; i < numentries; i++) {
+                free(namelist[i]);
+        }
+        free(namelist);
+}
+
+void run_daemon(TelemPostDaemon *daemon)
+{
+        int ret;
+        int spool_process_time = spool_process_time_config();
+        bool daemon_recycling_enabled = daemon_recycling_enabled_config();
+        time_t last_spool_run_time = time(NULL);
+        time_t last_daemon_start_time = time(NULL);
+
+        assert(daemon);
+        assert(daemon->pollfds);
+        assert(daemon->pollfds[signlfd].fd);
+        assert(daemon->pollfds[watchfd].fd);
+
+        while (1) {
+                malloc_trim(0);
+                ret = poll(daemon->pollfds, NFDS, spool_process_time * 1000);
+                if (ret == -1) {
+                        telem_perror("Failed to poll daemon file descriptors");
+                        break;
+                } else if (ret != 0) {
+
+                        if (daemon->pollfds[signlfd].revents != 0) {
+                                struct signalfd_siginfo fdsi;
+                                ssize_t s;
+                                s = read(daemon->sfd, &fdsi, sizeof(struct signalfd_siginfo));
+                                if (s != sizeof(struct signalfd_siginfo)) {
+                                        telem_perror("Error while reading from the signal"
+                                                     "file descriptor");
+                                        exit(EXIT_FAILURE);
+                                }
+
+                                if (fdsi.ssi_signo == SIGTERM || fdsi.ssi_signo == SIGINT) {
+                                        telem_log(LOG_INFO, "Received either a \
+                                                                     SIGINT/SIGTERM signal\n");
+                                        break;
+                                }
+                        } else if (daemon->pollfds[watchfd].revents != 0) {
+
+                                int ret = 0;
+                                ssize_t i = 0;
+                                ssize_t length = 0;
+                                char buffer[BUFFER_LEN];
+
+                                length = read(daemon->fd, buffer, BUFFER_LEN);
+                                if (length < 0) {
+                                        telem_perror("Error while reading from inotify"
+                                                     "watcher");
+                                        exit(EXIT_FAILURE);
+                                }
+
+                                while (i < length) {
+                                        struct inotify_event *event = (struct inotify_event *)&buffer[i];
+
+                                        if (event->len) {
+                                                if (event->mask & IN_CLOSE_WRITE && !(event->mask & IN_ISDIR)) {
+                                                        char *record_name = NULL;
+
+                                                        /* Retrieve foldername from watch id?  */
+                                                        ret = asprintf(&record_name, "%s/%s", spool_dir_config(), event->name);
+                                                        if (ret == -1) {
+                                                                telem_log(LOG_ERR, "Failed to allocate memory for record full path, aborting\n");
+                                                                exit(EXIT_FAILURE);
+                                                        }
+                                                        /* Process inotify event */
+                                                        if (process_staged_record(record_name, daemon)) {
+                                                                unlink(record_name);
+                                                        }
+                                                        free(record_name);
+                                                }
+                                        }
+
+                                        i += (ssize_t)EVENT_SIZE + event->len;
+                                }
+                        }
+                } else {
+                        time_t now = time(NULL);
+                        /* time to recycle the daemon has elapsed*/
+                        if (daemon_recycling_enabled &&
+                            difftime(now, last_daemon_start_time) >= TM_DAEMON_EXIT_TIME) {
+                                /* Exit */
+                                telem_log(LOG_INFO, "Telemetry post daemon exiting for recycling\n");
+                                break;
+                        }
+                }
+
+                /* Check spool  */
+                time_t now = time(NULL);
+                if (difftime(now, last_spool_run_time) >= spool_process_time) {
+                        spool_records_loop(&(daemon->current_spool_size));
+                        last_spool_run_time = time(NULL);
+                }
+                /* Check journal records and prune if needed */
+                ret = prune_journal(daemon->record_journal, JOURNAL_TMPDIR);
+                if (ret != 0) {
+                        telem_log(LOG_WARNING, "Unable to prune journal\n");
+                }
+        }
+}
+
+void close_daemon(TelemPostDaemon *daemon)
+{
+
+        if (daemon->fd) {
+                if (daemon->wd) {
+                        inotify_rm_watch(daemon->fd, daemon->wd);
+                }
+                close(daemon->fd);
+        }
+
+        close_journal(daemon->record_journal);
+}
+
+/* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

src/telempostdaemon.h

@@ -0,0 +1,130 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#define EVENT_SIZE sizeof(struct inotify_event)
+#define BUFFER_LEN 1024 * (EVENT_SIZE + 16)
+#define NFDS 2
+#define TM_RATE_LIMIT_SLOTS (1 /*h*/ * 60 /*m*/)
+#define TM_RECORD_COUNTER (1)
+
+#include <poll.h>
+#include <stdbool.h>
+#include <sys/inotify.h>
+
+#include "common.h"
+#include "journal/journal.h"
+#include "configuration.h"
+
+enum fdindex {signlfd, watchfd};
+
+typedef struct TelemPostDaemon {
+        int fd;
+        int wd;
+        int sfd;
+        char event_buffer[BUFFER_LEN];
+        struct pollfd pollfds[NFDS];
+        /* Telemetry Journal*/
+        TelemJournal *record_journal;
+        /* Time of last failed post */
+        time_t bypass_http_post_ts;
+        /* Rate limit record and byte arrays */
+        size_t record_burst_array[TM_RATE_LIMIT_SLOTS];
+        size_t byte_burst_array[TM_RATE_LIMIT_SLOTS];
+        /* Rate Limit Configurations */
+        bool rate_limit_enabled;
+        int64_t record_burst_limit;
+        int record_window_length;
+        int64_t byte_burst_limit;
+        int byte_window_length;
+        const char *rate_limit_strategy;
+        /* Spool configuration */
+        bool is_spool_valid;
+        long current_spool_size;
+        /* Record local copy and delivery  */
+        bool record_retention_enabled;
+        bool record_server_delivery_enabled;
+} TelemPostDaemon;
+
+/**
+ * Initializes daemon
+ *
+ * @param daemon a pointer to telemetry post daemon
+ */
+void initialize_daemon(TelemPostDaemon *daemon);
+
+/**
+ * Starts daemon
+ *
+ * @param daemon a pointer to telemetry post daemon
+ */
+void run_daemon(TelemPostDaemon *daemon);
+
+/**
+ * Cleans up inotify descriptors
+ *
+ * @param daemon a pointer to telemetry post daemon
+ */
+void close_daemon(TelemPostDaemon *daemon);
+
+/**
+ * Processed record written on disk
+ *
+ * @param filename a pointor to record on disk
+ * @param daemon post to telemetry post daemon
+ */
+bool process_staged_record(char *filename, TelemPostDaemon *daemon);
+
+/**
+ * Scans staging directory to process files that were
+ * missed by file watcher
+ *
+ * @param daemon a pointer to telemetry post daemon
+ */
+void staging_records_loop(TelemPostDaemon *daemon);
+
+/**
+ * Posts a record to backend
+ *
+ * @param headers a pointer to an array with keys and values
+ * @param body a pointer to the payload
+ */
+bool post_record_http(char *headers[], char *body);
+
+/**
+ * Pointer to function to isolate backend call during
+ * unit testing.
+ *
+ * @param headers pointer to array of keys
+ * @param body a pinter to payload
+ * */
+extern bool (*post_record_ptr)(char *headers[], char *body);
+
+/** Helper functions **/
+/* rate limit check */
+bool rate_limit_check(int current_minute, int64_t burst_limit,
+                      int window_length, size_t *array, size_t incValue);
+
+/* burst limit check  */
+bool burst_limit_enabled(int64_t burst_limit);
+
+/* rate limit check  */
+void rate_limit_update(int current_minute, int window_length, size_t *array,
+                       size_t incValue);
+
+/* spool strategy check */
+bool spool_strategy_selected(TelemPostDaemon *daemon);
+
+/* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

src/util.c

@@ -34,8 +34,10 @@
 #include "common.h"
 #include "util.h"
 
-bool get_header(const char *haystack, const char *needle, char **line, size_t len)
+bool get_header(const char *haystack, const char *needle, char **line)
 {
+        size_t len = strlen(needle);
+
         if (haystack && !strncmp(haystack, needle, len)) {
                 *line = strdup(haystack);
                 return true;

src/util.h

@@ -22,7 +22,7 @@
 void *reallocate(void **addr, size_t *allocated, size_t requested);
 
 /* Check if haystacks begins with needle and return a copy of haystack */
-bool get_header(const char *haystack, const char *needle, char **line, size_t len);
+bool get_header(const char *haystack, const char *needle, char **line);
 
 /* Get the value of a header */
 bool get_header_value(const char *header, char **value);

tests/check_config.c

@@ -55,6 +55,34 @@ START_TEST(check_read_valid_config)
 }
 END_TEST
 
+START_TEST(check_read_valid_config_defaults)
+{
+        char *config_file = TOPSRCDIR "/src/data/example.conf";
+        configuration config = { { 0 }, { 0 }, { 0 }, false, NULL };
+
+        int ret = read_config_from_file(config_file, &config);
+        ck_assert(ret == true);
+
+        // RECORD_RETENTION_ENABLED_DEFAULT = false
+        ck_assert(config.boolValues[CONF_RECORD_RETENTION_ENABLED] == RECORD_RETENTION_ENABLED_DEFAULT);
+        // RECORD_SERVER_DELIVERY_ENABLED_DEFAULT = true
+        ck_assert(config.boolValues[CONF_RECORD_SERVER_DELIVERY_ENABLED] == RECORD_SERVER_DELIVERY_ENABLED_DEFAULT);
+}
+END_TEST
+
+START_TEST(check_read_valid_config_record_retention_delivery)
+{
+        char *config_file = TOPSRCDIR "/src/data/example.1.conf";
+        configuration config = { { 0 }, { 0 }, { 0 }, false, NULL };
+
+        int ret = read_config_from_file(config_file, &config);
+        ck_assert(ret == true);
+
+        ck_assert(config.boolValues[CONF_RECORD_RETENTION_ENABLED] == true);
+        ck_assert(config.boolValues[CONF_RECORD_SERVER_DELIVERY_ENABLED] == false);
+}
+END_TEST
+
 START_TEST(check_config_initialised)
 {
         char *config_file = ABSTOPSRCDIR "/src/data/example.conf";
@@ -89,6 +117,8 @@ Suite *config_suite(void)
         TCase *t = tcase_create("config");
         tcase_add_test(t, check_read_config_for_invalid_file);
         tcase_add_test(t, check_read_valid_config);
+        tcase_add_test(t, check_read_valid_config_defaults);
+        tcase_add_test(t, check_read_valid_config_record_retention_delivery);
         tcase_add_test(t, check_config_initialised);
 
         // add more TCases here

tests/check_journal.c

@@ -20,11 +20,17 @@
 #include "common.h"
 #include "journal/journal.h"
 
+static char *journal_file = "journal.txt";
+static char *journal_print_file = "journal.print.txt";
 static struct TelemJournal *journal = NULL;
-static char *journal_file = TESTOOPSDIR "/journal.txt";
 static char *eid = "00007766547776eb7fc478eb0eb43e43";
 static int K = 20;
 
+void teardown(void)
+{
+        remove(journal_file);
+}
+
 START_TEST(check_open_journal)
 {
         struct TelemJournal *j = open_journal(journal_file);
@@ -108,6 +114,7 @@ void new_entry_teardown(void)
                 close_journal(journal);
                 journal = NULL;
         }
+        remove(journal_file);
 }
 
 void insert_n_records(int n, struct TelemJournal *j)
@@ -128,7 +135,7 @@ START_TEST(check_journal_file_prune)
 
         insert_n_records(j->record_count_limit * 2, j);
         ck_assert_int_gt(j->record_count, j->record_count_limit);
-        rc = prune_journal(j, TESTOOPSDIR);
+        rc = prune_journal(j, "./");
         ck_assert(rc == 0);
         // Record count should always be below the limit + hysteresis
         ck_assert_int_lt(j->record_count, j->record_count_limit + DEVIATION);
@@ -139,13 +146,12 @@ END_TEST
 void journal_entry_setup(void)
 {
         int result = 0;
-        const char *journal_print = TESTOOPSDIR "/journal.print.txt";
 
         if (journal) {
                 close_journal(journal);
         }
 
-        journal = open_journal(journal_print);
+        journal = open_journal(journal_print_file);
 
         insert_n_records(K, journal);
         /* Insert recors with specific values */
@@ -159,28 +165,28 @@ void journal_entry_setup(void)
 START_TEST(check_journal_print)
 {
         int count = 0;
-        count = print_journal(journal, NULL, NULL, NULL, NULL);
+        count = print_journal(journal, NULL, NULL, NULL, NULL, 0);
         ck_assert_int_eq(count, K + 2);
 }
 END_TEST
 
 START_TEST(check_journal_filter_by_class)
 {
-        int result = print_journal(journal, "a/b/c", NULL, NULL, NULL);
+        int result = print_journal(journal, "a/b/c", NULL, NULL, NULL, 0);
         ck_assert_int_eq(result, 1);
 }
 END_TEST
 
 START_TEST(check_journal_filter_by_class_prefix)
 {
-        int result = print_journal(journal, "a/b/*", NULL, NULL, NULL);
+        int result = print_journal(journal, "a/b/*", NULL, NULL, NULL, 0);
         ck_assert_int_eq(result, 2);
 }
 END_TEST
 
 START_TEST(check_journal_filter_by_event_id)
 {
-        int result = print_journal(journal, NULL, NULL, eid, NULL);
+        int result = print_journal(journal, NULL, NULL, eid, NULL, 0);
         ck_assert(result == 2);
 }
 END_TEST
@@ -188,6 +194,7 @@ END_TEST
 void journal_entry_teardown(void)
 {
         close_journal(journal);
+        remove(journal_print_file);
 }
 
 Suite *config_suite(void)
@@ -197,6 +204,7 @@ Suite *config_suite(void)
 
         // Individual unit tests are added to "test cases"
         TCase *t = tcase_create("journal");
+        tcase_add_unchecked_fixture(t, NULL, teardown);
         tcase_add_test(t, check_open_journal);
         tcase_add_test(t, check_unsuccessful_open_journal);
         suite_add_tcase(s, t);
@@ -211,6 +219,7 @@ Suite *config_suite(void)
         suite_add_tcase(s, t);
 
         t = tcase_create("prunning journal");
+        tcase_add_unchecked_fixture(t, NULL, teardown);
         tcase_add_test(t, check_journal_file_prune);
         suite_add_tcase(s, t);
 

tests/check_ncb64.c

@@ -190,4 +190,3 @@ int main(void)
 }
 
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */
-

tests/check_postd.c

@@ -0,0 +1,443 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#include <check.h>
+#include <sys/socket.h>
+#include <sys/fcntl.h>
+#include <stdlib.h>
+#include <sys/queue.h>
+#include <unistd.h>
+
+#include "configuration.h"
+#include "telempostdaemon.h"
+#include "common.h"
+
+TelemPostDaemon tdaemon;
+
+bool dummy_post(char *headers[], char *body)
+{
+        return true;
+}
+
+bool (*post_record_ptr)(char *headers[], char *body) = dummy_post;
+
+void setup(void)
+{
+        char *config_file = ABSTOPSRCDIR "/src/data/example.conf";
+        set_config_file(config_file);
+
+        initialize_daemon(&tdaemon);
+}
+
+START_TEST(check_daemon_is_initialized)
+{
+        setup();
+
+        ck_assert(tdaemon.rate_limit_enabled == true);
+        ck_assert(tdaemon.record_burst_limit == 100);
+        ck_assert(tdaemon.record_window_length == 15);
+        ck_assert(tdaemon.byte_burst_limit == 1000);
+        ck_assert(tdaemon.byte_window_length == 20);
+        ck_assert_str_eq(tdaemon.rate_limit_strategy, "spool");
+}
+END_TEST
+
+START_TEST(check_handle_client_with_no_data)
+{
+        setup();
+
+        bool success;
+        char *filename = ABSTOPSRCDIR "/tests/telempostd/empty_message";
+
+        success = process_staged_record(filename, &tdaemon);
+        // Return true to remove corrupted record
+        ck_assert(success == true);
+}
+END_TEST
+
+START_TEST(check_handle_client_with_incorrect_data)
+{
+        setup();
+
+        bool success;
+        char *filename = ABSTOPSRCDIR "/tests/telempostd/incorrect_message";
+
+        success = process_staged_record(filename, &tdaemon);
+        // Return true to remove corrupted record
+        ck_assert(success == true);
+}
+END_TEST
+
+START_TEST(check_process_record_with_correct_size_and_data)
+{
+        setup();
+
+        bool success;
+        char *filename = ABSTOPSRCDIR "/tests/telempostd/correct_message";
+
+        success = process_staged_record(filename, &tdaemon);
+        ck_assert(success == true);
+}
+END_TEST
+
+START_TEST(check_process_record_with_incorrect_headers)
+{
+        setup();
+
+        bool success;
+        char *filename = ABSTOPSRCDIR "/tests/telempostd/incorrect_headers";
+
+        success = process_staged_record(filename, &tdaemon);
+        // Return true to remove corrupted record
+        ck_assert(success == true);
+}
+END_TEST
+
+START_TEST(check_rate_limit_enabled_functions)
+{
+        setup();
+
+        bool record_check_passed = true;
+        bool byte_check_passed = true;
+        bool record_burst_enabled = true;
+        bool byte_burst_enabled = true;
+        tdaemon.record_burst_limit = 4;
+        tdaemon.byte_burst_limit = 2999;
+        tdaemon.rate_limit_enabled = true;
+
+        bool burst_limit_enabled(int64_t burst_limit)
+        {
+                return (burst_limit > -1) ? true : false;
+        }
+
+        /* Checks whether record burst rate limiting is enabled */
+        if (burst_limit_enabled(tdaemon.record_burst_limit)) {
+                record_check_passed = false;
+        } else {
+                /* If not enabled, does not need to be checked */
+                record_burst_enabled = false;
+        }
+        /* Checks whether byte burst rate limiting is enabled */
+        if (burst_limit_enabled(tdaemon.byte_burst_limit)) {
+                byte_check_passed = false;
+        } else {
+                /* If not enabled, does not need to be checked */
+                byte_burst_enabled = false;
+        }
+        if (!record_burst_enabled && !byte_burst_enabled) {
+                tdaemon.rate_limit_enabled = false;
+        }
+
+        ck_assert(record_check_passed == false);
+        ck_assert(byte_check_passed == false);
+        ck_assert(tdaemon.rate_limit_enabled == true);
+}
+END_TEST
+
+START_TEST(check_rate_limit_records_that_pass)
+{
+        setup();
+
+        int current_minute = 3;
+        tdaemon.record_burst_array[1] = 10;
+        tdaemon.record_burst_array[7] = 10;
+        tdaemon.record_burst_array[10] = 20;
+        tdaemon.record_burst_array[55] = 10;
+        tdaemon.record_burst_limit = 30;
+        tdaemon.record_window_length = 15;
+
+        bool checker;
+        checker = rate_limit_check(current_minute, tdaemon.record_burst_limit,
+                                   tdaemon.record_window_length, tdaemon.record_burst_array, 1);
+
+        ck_assert(checker == true);
+}
+END_TEST
+
+START_TEST(check_rate_limit_records_that_do_not_pass)
+{
+        setup();
+
+        int current_minute = 24;
+        tdaemon.record_burst_array[3] = 10;
+        tdaemon.record_burst_array[4] = 10;
+        tdaemon.record_burst_array[6] = 10;
+        tdaemon.record_burst_array[27] = 10;
+        tdaemon.record_burst_limit = 30;
+        tdaemon.record_window_length = 30;
+
+        bool checker;
+        checker = rate_limit_check(current_minute, tdaemon.record_burst_limit,
+                                   tdaemon.record_window_length, tdaemon.record_burst_array, 1);
+
+        ck_assert(checker == false);
+}
+END_TEST
+
+START_TEST(check_rate_limit_bytes_that_pass)
+{
+        setup();
+
+        size_t incValue = 20000;
+
+        int current_minute = 3;
+        tdaemon.byte_burst_array[1] = 32000;
+        tdaemon.byte_burst_array[7] = 10000;
+        tdaemon.byte_burst_array[10] = 45000;
+        tdaemon.byte_burst_array[55] = 11000;
+        tdaemon.byte_burst_limit = 64000;
+        tdaemon.byte_window_length = 15;
+
+        bool checker;
+        checker = rate_limit_check(current_minute, tdaemon.byte_burst_limit,
+                                   tdaemon.byte_window_length, tdaemon.byte_burst_array, incValue);
+
+        ck_assert(checker == true);
+}
+END_TEST
+
+START_TEST(check_rate_limit_bytes_that_do_not_pass)
+{
+        setup();
+
+        size_t incValue = 80000;
+
+        int current_minute = 15;
+        tdaemon.byte_burst_array[1] = 32000;
+        tdaemon.byte_burst_array[7] = 10000;
+        tdaemon.byte_burst_array[10] = 32300;
+        tdaemon.byte_burst_array[55] = 31000;
+        tdaemon.byte_burst_limit = 100000;
+        tdaemon.byte_window_length = 15;
+
+        bool checker;
+        checker = rate_limit_check(current_minute, tdaemon.byte_burst_limit,
+                                   tdaemon.byte_window_length, tdaemon.byte_burst_array, incValue);
+
+        ck_assert(checker == false);
+}
+END_TEST
+
+START_TEST(check_update_record_array)
+{
+        setup();
+        int current_minute = 7;
+        tdaemon.record_window_length = 15;
+        rate_limit_update(current_minute, tdaemon.record_window_length,
+                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
+
+        rate_limit_update(current_minute, tdaemon.record_window_length,
+                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
+
+        current_minute = 45;
+        rate_limit_update(current_minute, tdaemon.record_window_length,
+                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
+
+        current_minute = 47;
+        rate_limit_update(current_minute, tdaemon.record_window_length,
+                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
+        rate_limit_update(current_minute, tdaemon.record_window_length,
+                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
+
+        for (int i = 0; i < 60; i++) {
+                if (i != 45 && i != 47) {
+                        ck_assert_msg(tdaemon.record_burst_array[i] == 0, "array at %d is %d\n",
+                                      i, tdaemon.record_burst_array[i]);
+                } else {
+                        ck_assert_msg(tdaemon.record_burst_array[45] == 1, "array: %d is %d\n",
+                                      i, tdaemon.record_burst_array[i]);
+                        ck_assert_msg(tdaemon.record_burst_array[47] == 2, "array: %d is %d\n",
+                                      i, tdaemon.record_burst_array[i]);
+                }
+        }
+}
+END_TEST
+
+START_TEST(check_update_byte_array)
+{
+        setup();
+
+        int current_minute = 7;
+        tdaemon.byte_window_length = 15;
+        size_t record_size = 32000;
+
+        rate_limit_update(current_minute, tdaemon.byte_window_length,
+                          tdaemon.byte_burst_array, record_size);
+        rate_limit_update(current_minute, tdaemon.byte_window_length,
+                          tdaemon.byte_burst_array, record_size);
+
+        current_minute = 45;
+        rate_limit_update(current_minute, tdaemon.byte_window_length,
+                          tdaemon.byte_burst_array, record_size);
+
+        current_minute = 47;
+        rate_limit_update(current_minute, tdaemon.byte_window_length,
+                          tdaemon.byte_burst_array, record_size);
+        rate_limit_update(current_minute, tdaemon.byte_window_length,
+                          tdaemon.byte_burst_array, record_size);
+        rate_limit_update(current_minute, tdaemon.byte_window_length,
+                          tdaemon.byte_burst_array, record_size);
+
+        for (int i = 0; i < 60; i++) {
+                if (i != 45 && i != 47) {
+                        ck_assert_msg(tdaemon.byte_burst_array[i] == 0, "array at %d is %d\n",
+                                      i, tdaemon.record_burst_array[i]);
+                } else {
+                        ck_assert_msg(tdaemon.byte_burst_array[45] == 32000, "bytearray: %d is %d\n",
+                                      i, tdaemon.record_burst_array[i]);
+                        ck_assert_msg(tdaemon.byte_burst_array[47] == 96000, "bytearray: %d is %d\n",
+                                      i, tdaemon.record_burst_array[i]);
+                }
+        }
+}
+END_TEST
+
+START_TEST(check_strategy_spool_option)
+{
+        setup();
+
+        tdaemon.rate_limit_strategy = "spool";
+        bool do_spool = true;
+        char *ret = NULL;
+        bool record_sent = false;
+
+        // Get rate-limit strategy
+        do_spool = spool_strategy_selected(&tdaemon);
+
+        // Drop record
+        if (!record_sent && !do_spool) {
+                ret = "dropped";
+        }
+        // Spool Record
+        else if (!record_sent && do_spool) {
+                ret = "spooled";
+        } else {
+                ret = "sent";
+        }
+
+        ck_assert_str_eq(ret, "spooled");
+
+}
+END_TEST
+
+START_TEST(check_strategy_drop_option)
+{
+        setup();
+
+        tdaemon.rate_limit_strategy = "drop";
+        bool do_spool = true;
+        char *ret = NULL;
+        bool record_sent = false;
+
+        // Get rate-limit strategy
+        do_spool = spool_strategy_selected(&tdaemon);
+
+        // Drop record
+        if (!record_sent && !do_spool) {
+                ret = "dropped";
+        }
+        // Spool Record
+        else if (!record_sent && do_spool) {
+                ret = "spooled";
+        } else {
+                ret = "sent";
+        }
+
+        ck_assert_str_eq(ret, "dropped");
+
+}
+END_TEST
+
+START_TEST(check_strategy_if_record_sent)
+{
+        setup();
+
+        tdaemon.rate_limit_strategy = "drop";
+        bool do_spool = true;
+        char *ret = NULL;
+        bool record_sent = true;
+
+        // Get rate-limit strategy
+        do_spool = spool_strategy_selected(&tdaemon);
+
+        // Drop record
+        if (!record_sent && !do_spool) {
+                ret = "dropped";
+        }
+        // Spool Record
+        else if (!record_sent && do_spool) {
+                ret = "spooled";
+        } else {
+                ret = "sent";
+        }
+
+        ck_assert_str_eq(ret, "sent");
+
+}
+END_TEST
+
+Suite *config_suite(void)
+{
+        // A suite is comprised of test cases, defined below
+        Suite *s = suite_create("postd");
+
+        // Individual unit tests are added to "test cases"
+        TCase *t = tcase_create("postd");
+        tcase_add_test(t, check_daemon_is_initialized);
+        tcase_add_test(t, check_handle_client_with_no_data);
+        tcase_add_test(t, check_handle_client_with_incorrect_data);
+        tcase_add_test(t, check_process_record_with_correct_size_and_data);
+        tcase_add_test(t, check_process_record_with_incorrect_headers);
+        tcase_add_test(t, check_rate_limit_enabled_functions);
+        tcase_add_test(t, check_rate_limit_records_that_pass);
+        tcase_add_test(t, check_rate_limit_records_that_do_not_pass);
+        tcase_add_test(t, check_rate_limit_bytes_that_pass);
+        tcase_add_test(t, check_rate_limit_bytes_that_do_not_pass);
+        tcase_add_test(t, check_update_record_array);
+        tcase_add_test(t, check_update_byte_array);
+        tcase_add_test(t, check_strategy_spool_option);
+        tcase_add_test(t, check_strategy_drop_option);
+        tcase_add_test(t, check_strategy_if_record_sent);
+
+        suite_add_tcase(s, t);
+
+        return s;
+}
+
+int main(void)
+{
+        Suite *s;
+        SRunner *sr;
+
+        s = config_suite();
+        sr = srunner_create(s);
+
+        // Use the TAP driver for now, so that each
+        // unit test will PASS/FAIL in the log output.
+        srunner_set_log(sr, NULL);
+        srunner_set_tap(sr, "-");
+
+        srunner_run_all(sr, CK_SILENT);
+        // failed = srunner_ntests_failed(sr);
+        srunner_free(sr);
+
+        // if you want the TAP driver to report a hard error based
+        // on certain conditions (e.g. number of failed tests, etc.),
+        // return non-zero here instead.
+        return 0;
+}
+
+/* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

tests/check_probd.c

@@ -26,7 +26,6 @@
 #include "common.h"
 
 TelemDaemon tdaemon;
-static bool post_was_called = false;
 
 char *get_serialized_record(char *headers, char *post_body, size_t *record_size)
 {
@@ -54,14 +53,6 @@ char *get_serialized_record(char *headers, char *post_body, size_t *record_size)
         return data;
 }
 
-bool dummy_post(char *headers[], char *body, bool spool)
-{
-        post_was_called = true;
-        return post_was_called;
-}
-
-bool (*post_record_ptr)(char *[], char *, bool) = dummy_post;
-
 void setup(void)
 {
         char *config_file = ABSTOPSRCDIR "/src/data/example.conf";
@@ -76,12 +67,6 @@ START_TEST(check_daemon_is_initialized)
 
         ck_assert(tdaemon.nfds == 0);
         ck_assert(tdaemon.pollfds == NULL);
-        ck_assert(tdaemon.rate_limit_enabled == true);
-        ck_assert(tdaemon.record_burst_limit == 100);
-        ck_assert(tdaemon.record_window_length == 15);
-        ck_assert(tdaemon.byte_burst_limit == 1000);
-        ck_assert(tdaemon.byte_window_length == 20);
-        ck_assert_str_eq(tdaemon.rate_limit_strategy, "spool");
 }
 END_TEST
 
@@ -269,12 +254,10 @@ START_TEST(check_handle_client_with_correct_size)
         memcpy(buf + 2 * sizeof(uint32_t), data, strlen(data) + 1);
         ck_assert(strcmp(data, buf + 2 * sizeof(int32_t)) == 0);
 
-        post_was_called = false;
         ssize_t ret = write(server_fd, buf, 2 * sizeof(uint32_t) + size + 1);
         ck_assert(ret != -1);
         processed = handle_client(&tdaemon, 0, cl);
         ck_assert(processed == true);
-        ck_assert(post_was_called == false);
 
         ck_assert_msg(is_client_list_empty(&(tdaemon.client_head)), "Failed to remove client with no data\n");
         ck_assert_msg(tdaemon.nfds == 0, "Failed to remove poll fd for client with n data\n");
@@ -307,14 +290,12 @@ START_TEST(check_process_record_with_correct_size_and_data)
         ck_assert_msg(cl != NULL, "failed to malloc client");
         add_pollfd(&tdaemon, client_fd, POLLIN | POLLPRI);
 
-        post_was_called = false;
         record = get_serialized_record(headers, post_body, &record_size);
         ssize_t ret = write(server_fd, record, record_size);
         ck_assert(ret == record_size);
 
         processed = handle_client(&tdaemon, 0, cl);
         ck_assert(processed == true);
-        ck_assert(post_was_called == true);
         ck_assert_msg(is_client_list_empty(&(tdaemon.client_head)), "Failed to remove client with correct data\n");
         ck_assert_msg(tdaemon.nfds == 0, "Failed to remove poll fd for client with correct data\n");
         close(server_fd);
@@ -341,14 +322,12 @@ START_TEST(check_process_record_with_incorrect_headers)
         ck_assert_msg(cl != NULL, "failed to malloc client");
         add_pollfd(&tdaemon, client_fd, POLLIN | POLLPRI);
 
-        post_was_called = false;
         record = get_serialized_record(headers, post_body, &record_size);
         ssize_t ret = write(server_fd, record, record_size);
         ck_assert(ret == record_size);
 
         processed = handle_client(&tdaemon, 0, cl);
         ck_assert(processed == true);
-        ck_assert(post_was_called == false);
         ck_assert_msg(is_client_list_empty(&(tdaemon.client_head)), "Failed to remove client with incorrect headers\n");
         ck_assert_msg(tdaemon.nfds == 0, "Failed to remove poll fd for client with incorrect headers\n");
         close(server_fd);
@@ -356,296 +335,13 @@ START_TEST(check_process_record_with_incorrect_headers)
 }
 END_TEST
 
-START_TEST(check_rate_limit_enabled_functions)
-{
-        setup();
-
-        bool record_check_passed = true;
-        bool byte_check_passed = true;
-        bool record_burst_enabled = true;
-        bool byte_burst_enabled = true;
-        tdaemon.record_burst_limit = 4;
-        tdaemon.byte_burst_limit = 2999;
-        tdaemon.rate_limit_enabled = true;
-
-        bool burst_limit_enabled(int64_t burst_limit)
-        {
-                return (burst_limit > -1) ? true : false;
-        }
-
-        /* Checks whether record burst rate limiting is enabled */
-        if (burst_limit_enabled(tdaemon.record_burst_limit)) {
-                record_check_passed = false;
-        } else {
-                /* If not enabled, does not need to be checked */
-                record_burst_enabled = false;
-        }
-        /* Checks whether byte burst rate limiting is enabled */
-        if (burst_limit_enabled(tdaemon.byte_burst_limit)) {
-                byte_check_passed = false;
-        } else {
-                /* If not enabled, does not need to be checked */
-                byte_burst_enabled = false;
-        }
-        if (!record_burst_enabled && !byte_burst_enabled) {
-                tdaemon.rate_limit_enabled = false;
-        }
-
-        ck_assert(record_check_passed == false);
-        ck_assert(byte_check_passed == false);
-        ck_assert(tdaemon.rate_limit_enabled == true);
-}
-END_TEST
-
-START_TEST(check_rate_limit_records_that_pass)
-{
-        setup();
-
-        int current_minute = 3;
-        tdaemon.record_burst_array[1] = 10;
-        tdaemon.record_burst_array[7] = 10;
-        tdaemon.record_burst_array[10] = 20;
-        tdaemon.record_burst_array[55] = 10;
-        tdaemon.record_burst_limit = 30;
-        tdaemon.record_window_length = 15;
-
-        bool checker;
-        checker = rate_limit_check(current_minute, tdaemon.record_burst_limit,
-                                   tdaemon.record_window_length, tdaemon.record_burst_array, 1);
-
-        ck_assert(checker == true);
-}
-END_TEST
-
-START_TEST(check_rate_limit_records_that_do_not_pass)
-{
-        setup();
-
-        int current_minute = 24;
-        tdaemon.record_burst_array[3] = 10;
-        tdaemon.record_burst_array[4] = 10;
-        tdaemon.record_burst_array[6] = 10;
-        tdaemon.record_burst_array[27] = 10;
-        tdaemon.record_burst_limit = 30;
-        tdaemon.record_window_length = 30;
-
-        bool checker;
-        checker = rate_limit_check(current_minute, tdaemon.record_burst_limit,
-                                   tdaemon.record_window_length, tdaemon.record_burst_array, 1);
-
-        ck_assert(checker == false);
-}
-END_TEST
-
-START_TEST(check_rate_limit_bytes_that_pass)
-{
-        setup();
-
-        size_t incValue = 20000;
-
-        int current_minute = 3;
-        tdaemon.byte_burst_array[1] = 32000;
-        tdaemon.byte_burst_array[7] = 10000;
-        tdaemon.byte_burst_array[10] = 45000;
-        tdaemon.byte_burst_array[55] = 11000;
-        tdaemon.byte_burst_limit = 64000;
-        tdaemon.byte_window_length = 15;
-
-        bool checker;
-        checker = rate_limit_check(current_minute, tdaemon.byte_burst_limit,
-                                   tdaemon.byte_window_length, tdaemon.byte_burst_array, incValue);
-
-        ck_assert(checker == true);
-}
-END_TEST
-
-START_TEST(check_rate_limit_bytes_that_do_not_pass)
-{
-        setup();
-
-        size_t incValue = 80000;
-
-        int current_minute = 15;
-        tdaemon.byte_burst_array[1] = 32000;
-        tdaemon.byte_burst_array[7] = 10000;
-        tdaemon.byte_burst_array[10] = 32300;
-        tdaemon.byte_burst_array[55] = 31000;
-        tdaemon.byte_burst_limit = 100000;
-        tdaemon.byte_window_length = 15;
-
-        bool checker;
-        checker = rate_limit_check(current_minute, tdaemon.byte_burst_limit,
-                                   tdaemon.byte_window_length, tdaemon.byte_burst_array, incValue);
-
-        ck_assert(checker == false);
-}
-END_TEST
-
-START_TEST(check_update_record_array)
-{
-        setup();
-        int current_minute = 7;
-        tdaemon.record_window_length = 15;
-        rate_limit_update(current_minute, tdaemon.record_window_length,
-                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
-
-        rate_limit_update(current_minute, tdaemon.record_window_length,
-                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
-
-        current_minute = 45;
-        rate_limit_update(current_minute, tdaemon.record_window_length,
-                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
-
-        current_minute = 47;
-        rate_limit_update(current_minute, tdaemon.record_window_length,
-                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
-        rate_limit_update(current_minute, tdaemon.record_window_length,
-                          tdaemon.record_burst_array, TM_RECORD_COUNTER);
-
-        for (int i = 0; i < 60; i++) {
-                if (i != 45 && i != 47) {
-                        ck_assert_msg(tdaemon.record_burst_array[i] == 0, "array at %d is %d\n",
-                                      i, tdaemon.record_burst_array[i]);
-                } else {
-                        ck_assert_msg(tdaemon.record_burst_array[45] == 1, "array: %d is %d\n",
-                                      i, tdaemon.record_burst_array[i]);
-                        ck_assert_msg(tdaemon.record_burst_array[47] == 2, "array: %d is %d\n",
-                                      i, tdaemon.record_burst_array[i]);
-                }
-        }
-}
-END_TEST
-
-START_TEST(check_update_byte_array)
-{
-        setup();
-
-        int current_minute = 7;
-        tdaemon.byte_window_length = 15;
-        size_t record_size = 32000;
-
-        rate_limit_update(current_minute, tdaemon.byte_window_length,
-                          tdaemon.byte_burst_array, record_size);
-        rate_limit_update(current_minute, tdaemon.byte_window_length,
-                          tdaemon.byte_burst_array, record_size);
-
-        current_minute = 45;
-        rate_limit_update(current_minute, tdaemon.byte_window_length,
-                          tdaemon.byte_burst_array, record_size);
-
-        current_minute = 47;
-        rate_limit_update(current_minute, tdaemon.byte_window_length,
-                          tdaemon.byte_burst_array, record_size);
-        rate_limit_update(current_minute, tdaemon.byte_window_length,
-                          tdaemon.byte_burst_array, record_size);
-        rate_limit_update(current_minute, tdaemon.byte_window_length,
-                          tdaemon.byte_burst_array, record_size);
-
-        for (int i = 0; i < 60; i++) {
-                if (i != 45 && i != 47) {
-                        ck_assert_msg(tdaemon.byte_burst_array[i] == 0, "array at %d is %d\n",
-                                      i, tdaemon.record_burst_array[i]);
-                } else {
-                        ck_assert_msg(tdaemon.byte_burst_array[45] == 32000, "bytearray: %d is %d\n",
-                                      i, tdaemon.record_burst_array[i]);
-                        ck_assert_msg(tdaemon.byte_burst_array[47] == 96000, "bytearray: %d is %d\n",
-                                      i, tdaemon.record_burst_array[i]);
-                }
-        }
-}
-END_TEST
-
-START_TEST(check_strategy_spool_option)
-{
-        setup();
-
-        tdaemon.rate_limit_strategy = "spool";
-        bool do_spool = true;
-        char *ret = NULL;
-        bool record_sent = false;
-
-        // Get rate-limit strategy
-        do_spool = spool_strategy_selected(&tdaemon);
-
-        // Drop record
-        if (!record_sent && !do_spool) {
-                ret = "dropped";
-        }
-        // Spool Record
-        else if (!record_sent && do_spool) {
-                ret = "spooled";
-        } else {
-                ret = "sent";
-        }
-
-        ck_assert_str_eq(ret, "spooled");
-
-}
-END_TEST
-
-START_TEST(check_strategy_drop_option)
-{
-        setup();
-
-        tdaemon.rate_limit_strategy = "drop";
-        bool do_spool = true;
-        char *ret = NULL;
-        bool record_sent = false;
-
-        // Get rate-limit strategy
-        do_spool = spool_strategy_selected(&tdaemon);
-
-        // Drop record
-        if (!record_sent && !do_spool) {
-                ret = "dropped";
-        }
-        // Spool Record
-        else if (!record_sent && do_spool) {
-                ret = "spooled";
-        } else {
-                ret = "sent";
-        }
-
-        ck_assert_str_eq(ret, "dropped");
-
-}
-END_TEST
-
-START_TEST(check_strategy_if_record_sent)
-{
-        setup();
-
-        tdaemon.rate_limit_strategy = "drop";
-        bool do_spool = true;
-        char *ret = NULL;
-        bool record_sent = true;
-
-        // Get rate-limit strategy
-        do_spool = spool_strategy_selected(&tdaemon);
-
-        // Drop record
-        if (!record_sent && !do_spool) {
-                ret = "dropped";
-        }
-        // Spool Record
-        else if (!record_sent && do_spool) {
-                ret = "spooled";
-        } else {
-                ret = "sent";
-        }
-
-        ck_assert_str_eq(ret, "sent");
-
-}
-END_TEST
-
 Suite *config_suite(void)
 {
         // A suite is comprised of test cases, defined below
-        Suite *s = suite_create("daemon");
+        Suite *s = suite_create("probd");
 
         // Individual unit tests are added to "test cases"
-        TCase *t = tcase_create("daemon");
+        TCase *t = tcase_create("probd");
         tcase_add_test(t, check_add_del_poll_fd);
         tcase_add_test(t, check_daemon_is_initialized);
         tcase_add_test(t, check_add_remove_client);
@@ -655,16 +351,6 @@ Suite *config_suite(void)
         tcase_add_test(t, check_handle_client_with_correct_size);
         tcase_add_test(t, check_process_record_with_correct_size_and_data);
         tcase_add_test(t, check_process_record_with_incorrect_headers);
-        tcase_add_test(t, check_rate_limit_enabled_functions);
-        tcase_add_test(t, check_rate_limit_records_that_pass);
-        tcase_add_test(t, check_rate_limit_records_that_do_not_pass);
-        tcase_add_test(t, check_rate_limit_bytes_that_pass);
-        tcase_add_test(t, check_rate_limit_bytes_that_do_not_pass);
-        tcase_add_test(t, check_update_record_array);
-        tcase_add_test(t, check_update_byte_array);
-        tcase_add_test(t, check_strategy_spool_option);
-        tcase_add_test(t, check_strategy_drop_option);
-        tcase_add_test(t, check_strategy_if_record_sent);
 
         suite_add_tcase(s, t);
 

tests/local.mk

@@ -12,7 +12,8 @@ TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 check_PROGRAMS = \
 	%D%/check_config \
-	%D%/check_daemon \
+	%D%/check_probd \
+	%D%/check_postd \
 	%D%/check_probes \
 	%D%/check_ncb64  \
 	%D%/check_journal \
@@ -32,27 +33,63 @@ dist_check_SCRIPTS = \
 	@CHECK_LIBS@ \
 	$(top_builddir)/src/libtelem-shared.la
 
-%C%_check_daemon_SOURCES = \
-	%D%/check_daemon.c \
+%C%_check_probd_SOURCES = \
+	%D%/check_probd.c \
 	src/telemdaemon.c \
 	src/telemdaemon.h \
+	src/iorecord.h \
+	src/iorecord.c \
 	src/journal/journal.c \
 	src/journal/journal.h
 
-%C%_check_daemon_CFLAGS = \
+%C%_check_probd_CFLAGS = \
 	$(AM_CFLAGS) \
 	@CHECK_CFLAGS@ \
 	@CURL_CFLAGS@
-%C%_check_daemon_LDADD = \
+%C%_check_probd_LDADD = \
 	@CHECK_LIBS@ \
 	@CURL_LIBS@ \
 	$(top_builddir)/src/libtelem-shared.la
 
 if LOG_SYSTEMD
 if HAVE_SYSTEMD_JOURNAL
-%C%_check_daemon_CFLAGS += \
+%C%_check_probd_CFLAGS += \
         $(SYSTEMD_JOURNAL_CFLAGS)
-%C%_check_daemon_LDADD += \
+%C%_check_probd_LDADD += \
+        $(SYSTEMD_JOURNAL_LIBS)
+endif
+endif
+
+%C%_check_postd_SOURCES = \
+	%D%/check_postd.c \
+	src/spool.c \
+	src/iorecord.c \
+	src/retention.c \
+        src/telempostdaemon.c \
+        src/telempostdaemon.h \
+        src/journal/journal.c \
+        src/journal/journal.h
+
+EXTRA_DIST += \
+	%D%/telempostd/correct_message \
+	%D%/telempostd/incorrect_headers \
+	%D%/telempostd/empty_message \
+	%D%/telempostd/incorrect_message
+
+%C%_check_postd_CFLAGS = \
+        $(AM_CFLAGS) \
+        @CHECK_CFLAGS@ \
+        @CURL_CFLAGS@
+%C%_check_postd_LDADD = \
+        @CHECK_LIBS@ \
+        @CURL_LIBS@ \
+        $(top_builddir)/src/libtelem-shared.la
+
+if LOG_SYSTEMD
+if HAVE_SYSTEMD_JOURNAL
+%C%_check_postd_CFLAGS += \
+        $(SYSTEMD_JOURNAL_CFLAGS)
+%C%_check_postd_LDADD += \
         $(SYSTEMD_JOURNAL_LIBS)
 endif
 endif
@@ -131,7 +168,6 @@ EXTRA_DIST += \
 
 %C%_check_journal_SOURCES = \
 	%D%/check_journal.c \
-	src/journal/journal.h \
 	src/journal/journal.c \
 	src/util.h \
 	src/util.c
@@ -145,7 +181,10 @@ EXTRA_DIST += \
 
 %C%_check_libtelemetry_SOURCES = \
 	%D%/check_libtelemetry.c \
-	src/telemetry.c
+	src/configuration.h \
+	src/util.h \
+	src/nica/hashmap.h \
+	src/nica/inifile.h
 
 %C%_check_libtelemetry_CFLAGS = \
 	$(AM_CFLAGS) \

tests/telempostd/correct_message

@@ -0,0 +1,16 @@
+record_format_version: 1
+classification: crash/kernel/bug
+severity: 0
+machine_id: 1234
+creation_timestamp: 1418672344
+arch: x86_64
+host_type: macbookpro
+build: 200
+kernel_version: 3.15
+payload_format_version: 1
+system_name: clear-linux-os
+board_name: Qemu|Intel
+cpu_model: Intel(R) Core(TM) i7-5650U CPU @ 2.20GHz
+bios_version: Qemu
+event_id: 3a2d799826edc6266d72824d2aac6763
+test message

tests/telempostd/incorrect_headers

@@ -0,0 +1,10 @@
+record_format_version: 1
+nclassificatioooon: crash/kernel/bug
+severity: 0
+machine_id: 1234
+creation_timestamp: 1531420323
+arch: x86_64
+host_type: macbookpro
+build: 23550
+kernel_version: 4.17.4-589.native
+test message

tests/telempostd/incorrect_message

@@ -0,0 +1 @@
+test