Adjust telemetry to meet requirements

backdrop-contrib · Jul 24, 2024 · 1953a49 · 1953a49
1 parent c7ff388
commit 1953a49
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/commands/status.bee.inc b/commands/status.bee.inc
@@ -284,22 +284,19 @@ function status_bee_callback($arguments, $options) {
  array('value' => bt('Status')),
  array('value' => $telemetry_status ? 'on' : 'off'),
  );
- if ($telemetry_status) {
- $data_summary = json_encode(bee_telemetry_get_data());
- }
- else {
- $data_summary = bt('None');
- }
- $rows[] = array(
- array('value' => bt('Data')),
- array('value' => $data_summary),
- );
  if ($telemetry_status) {
  $rows[] = array(
  array('value' => bt('Last sent')),
  array('value' => $bee_telemetry_last),
  );
  }
+ if ($telemetry_status) {
+ $data_summary = json_encode(bee_telemetry_get_data());
+ }
+ else {
+ $data_summary = bt('None');
+ }
+ $data_string = " Data: $data_summary\n";
 
  echo "\n";
  return array(
@@ -312,6 +309,12 @@ function status_bee_callback($arguments, $options) {
  'delimiter_right' => ' ',
  ),
  ),
+ array(
+ 'type' => 'text',
+ 'variables' => array(
+ 'value' => $data_string,
+ ),
+ ),
  );
  }
  else {

diff --git a/includes/telemetry.inc b/includes/telemetry.inc
@@ -250,6 +250,7 @@ function bee_telemetry_get_data() {
  $data = array(
  'bee' => array(
  'version' => BEE_VERSION,
+ 'bee_version' => BEE_VERSION,
  'php_version' => PHP_VERSION,
  'multisite' => !empty($_bee_multisites) ? 'Yes' : 'No',
  ),