From d8c0d63fc7058914f681c0b0775e65499993a559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Tue, 13 Mar 2018 22:58:23 +0100 Subject: [PATCH] follow up metrics renames in monitoring events && add debug messages --- roles/test-beat/tasks/common/assert.yml | 10 +++++++--- roles/test-beat/tasks/win32nt/assert.yml | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/roles/test-beat/tasks/common/assert.yml b/roles/test-beat/tasks/common/assert.yml index 57672a2..1f8de97 100644 --- a/roles/test-beat/tasks/common/assert.yml +++ b/roles/test-beat/tasks/common/assert.yml @@ -54,16 +54,20 @@ - set_fact: log_metrics_event='{{ log_metrics.stdout | from_json }}' +- name: '{{ beat_name }} monitoring metrics' + debug: + var: log_metrics_event + - name: 'Check {{ beat_name }} has monitoring metrics' assert: that: - "log_metrics_event.monitoring.metrics.beat.cpu.system.ticks >= 0" - - "log_metrics_event.monitoring.metrics.beat.cpu.system.time >= 0" + - "log_metrics_event.monitoring.metrics.beat.cpu.system.time.ms >= 0" - "log_metrics_event.monitoring.metrics.beat.cpu.total.ticks >= 0" - - "log_metrics_event.monitoring.metrics.beat.cpu.total.time >= 0" + - "log_metrics_event.monitoring.metrics.beat.cpu.total.time.ms >= 0" - "log_metrics_event.monitoring.metrics.beat.cpu.total.value >= 0" - "log_metrics_event.monitoring.metrics.beat.cpu.user.ticks >= 0" - - "log_metrics_event.monitoring.metrics.beat.cpu.user.time >= 0" + - "log_metrics_event.monitoring.metrics.beat.cpu.user.time.ms >= 0" - "log_metrics_event.monitoring.metrics.beat.info.ephemeral_id" - "log_metrics_event.monitoring.metrics.beat.info.uptime.ms" - "log_metrics_event.monitoring.metrics.system.cpu.cores" diff --git a/roles/test-beat/tasks/win32nt/assert.yml b/roles/test-beat/tasks/win32nt/assert.yml index 14cd0a7..3490400 100644 --- a/roles/test-beat/tasks/win32nt/assert.yml +++ b/roles/test-beat/tasks/win32nt/assert.yml @@ -56,15 +56,19 @@ - set_fact: log_metrics_event='{{ log_metrics_win.stdout | from_json }}' +- name: '{{ beat_name }} monitoring metrics (win)' + debug: + var: log_metrics_event + - name: 'Check {{ beat_name }} has monitoring metrics (win)' assert: that: - "log_metrics_event.monitoring.metrics.beat.cpu.system.ticks >= 0" - - "log_metrics_event.monitoring.metrics.beat.cpu.system.time >= 0" + - "log_metrics_event.monitoring.metrics.beat.cpu.system.time.ms >= 0" - "log_metrics_event.monitoring.metrics.beat.cpu.total.ticks >= 0" - - "log_metrics_event.monitoring.metrics.beat.cpu.total.time >= 0" + - "log_metrics_event.monitoring.metrics.beat.cpu.total.time.ms >= 0" - "log_metrics_event.monitoring.metrics.beat.cpu.user.ticks >= 0" - - "log_metrics_event.monitoring.metrics.beat.cpu.user.time >= 0" + - "log_metrics_event.monitoring.metrics.beat.cpu.user.time.ms >= 0" - "log_metrics_event.monitoring.metrics.beat.info.ephemeral_id" - "log_metrics_event.monitoring.metrics.beat.info.uptime.ms" - "log_metrics_event.monitoring.metrics.system.cpu.cores"