From ad52b0b78c38bce4caae7a0fdadd8ebd2bbaf6d3 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Sat, 14 Mar 2015 09:29:39 -0600 Subject: [PATCH] DRY'ed up some of the collectd rules --- src/org/spootnik/riemann/collectd.clj | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/org/spootnik/riemann/collectd.clj b/src/org/spootnik/riemann/collectd.clj index 463f023..8e68c3b 100644 --- a/src/org/spootnik/riemann/collectd.clj +++ b/src/org/spootnik/riemann/collectd.clj @@ -6,21 +6,10 @@ (def default-services [{:service "conntrack/conntrack" :rewrite "conntrack"} - {:service "load/load/shortterm" :rewrite "load-shorterm"} - {:service "load/load/midterm" :rewrite "load-midterm"} - {:service "load/load/longterm" :rewrite "load-longterm"} - - {:service "swap/swap-used" :rewrite "swap used"} - {:service "swap/swap-free" :rewrite "swap free"} - {:service "swap/swap-cached" :rewrite "swap cached"} - {:service "swap/swap_io-in" :rewrite "swap io in"} - {:service "swap/swap_io-out" :rewrite "swap io out"} - - {:service "memory/memory-used" :rewrite "mem used"} - {:service "memory/memory-free" :rewrite "mem free"} - {:service "memory/memory-buffered" :rewrite "mem buffered"} - {:service "memory/memory-cached" :rewrite "mem cached"} - + {:service #"^load/load/(.*)$" :rewrite "load $1"} + {:service #"^swap/swap-(.*)$" :rewrite "swap $1"} + {:service #"^swap/swap_(.*)-(.*)$" :rewrite "swap $1 $2"} + {:service #"^memory/memory-(.*)$" :rewrite "mem $1"} {:service #"^cpu-([0-9]+)/cpu-(.*)$" :rewrite "cpu-$1 $2"} {:service #"^aggregation-cpu-average/cpu-(.*)$" :rewrite "cpu $1"} {:service #"^df-(.*)/df_complex-(.*)$" :rewrite "df $1 $2"}