From 80a5712b97cd649b6bf2f9f60cf5c497043ef187 Mon Sep 17 00:00:00 2001 From: Rene Treffer Date: Fri, 27 Jul 2018 14:27:44 +0200 Subject: [PATCH] Fix sample rules for migration (#1022) - add conversion from _ms to _seconds on disk metrics - add missing node_textfile_mtime section - add groups: header to pass promtool check rules Signed-off-by: Rene Treffer --- docs/example-16-compatibility-rules-new-to-old.yml | 11 ++++++++--- docs/example-16-compatibility-rules.yml | 10 +++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/example-16-compatibility-rules-new-to-old.yml b/docs/example-16-compatibility-rules-new-to-old.yml index a6bd60d0..6d630ccd 100644 --- a/docs/example-16-compatibility-rules-new-to-old.yml +++ b/docs/example-16-compatibility-rules-new-to-old.yml @@ -1,3 +1,4 @@ +groups: - name: node_exporter-16-bcache rules: - expr: node_bcache_cache_read_races @@ -26,7 +27,7 @@ record: node_disk_bytes_read - expr: node_disk_written_bytes_total record: node_disk_bytes_written - - expr: node_disk_io_time_seconds_total + - expr: node_disk_io_time_seconds_total * 1000 record: node_disk_io_time_ms - expr: node_disk_io_time_weighted_seconds_total record: node_disk_io_time_weighted @@ -34,13 +35,13 @@ record: node_disk_reads_completed - expr: node_disk_reads_merged_total record: node_disk_reads_merged - - expr: node_disk_read_time_seconds_total + - expr: node_disk_read_time_seconds_total * 1000 record: node_disk_read_time_ms - expr: node_disk_writes_completed_total record: node_disk_writes_completed - expr: node_disk_writes_merged_total record: node_disk_writes_merged - - expr: node_disk_write_time_seconds_total + - expr: node_disk_write_time_seconds_total * 1000 record: node_disk_write_time_ms - name: node_exporter-16-filesystem rules: @@ -188,3 +189,7 @@ record: node_nfs_rpc_operations - expr: node_nfs_rpc_retransmissions_total record: node_nfs_rpc_retransmissions +- name: node_exporter-16-textfile + rules: + - expr: node_textfile_mtime_seconds + record: node_textfile_mtime diff --git a/docs/example-16-compatibility-rules.yml b/docs/example-16-compatibility-rules.yml index 57e4e15f..1788abff 100644 --- a/docs/example-16-compatibility-rules.yml +++ b/docs/example-16-compatibility-rules.yml @@ -28,7 +28,7 @@ groups: - record: node_disk_written_bytes_total expr: node_disk_bytes_written - record: node_disk_io_time_seconds_total - expr: node_disk_io_time_ms + expr: node_disk_io_time_ms / 1000 - record: node_disk_io_time_weighted_seconds_total expr: node_disk_io_time_weighted - record: node_disk_reads_completed_total @@ -36,13 +36,13 @@ groups: - record: node_disk_reads_merged_total expr: node_disk_reads_merged - record: node_disk_read_time_seconds_total - expr: node_disk_read_time_ms + expr: node_disk_read_time_ms / 1000 - record: node_disk_writes_completed_total expr: node_disk_writes_completed - record: node_disk_writes_merged_total expr: node_disk_writes_merged - record: node_disk_write_time_seconds_total - expr: node_disk_write_time_ms + expr: node_disk_write_time_ms / 1000 - name: node_exporter-16-filesystem rules: - record: node_filesystem_free_bytes @@ -189,3 +189,7 @@ groups: expr: node_nfs_rpc_operations - record: node_nfs_rpc_retransmissions_total expr: node_nfs_rpc_retransmissions +- name: node_exporter-16-textfile + rules: + - record: node_textfile_mtime_seconds + expr: node_textfile_mtime