summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Anderson <b@banjiewen.net>2014-06-23 11:22:43 -0700
committerBenjamin Anderson <b@banjiewen.net>2014-06-23 11:22:43 -0700
commite7e89bf9c58fb56e25ab2d13e8c9c37765d628ca (patch)
tree00257959baf7b1ace6b3a5d9d75b143c26d15293
parente29d1ed76feaadc64e65b0a5e67ed8ffe64ec681 (diff)
parentd5a617b49a1cc0d8e52890def7c713602911ef0b (diff)
downloadcouchdb-e7e89bf9c58fb56e25ab2d13e8c9c37765d628ca.tar.gz
Merge pull request #17 from cloudant/31759-warning-events
Use warning level for non-critical cases
-rw-r--r--src/custodian/src/custodian_server.erl30
1 files changed, 18 insertions, 12 deletions
diff --git a/src/custodian/src/custodian_server.erl b/src/custodian/src/custodian_server.erl
index 399d15aac..b9dabe774 100644
--- a/src/custodian/src/custodian_server.erl
+++ b/src/custodian/src/custodian_server.erl
@@ -128,20 +128,26 @@ check_shards() ->
[send_sensu_event(Item) || Item <- custodian:summary()].
send_sensu_event({_, Count} = Item) ->
- if Count > 0 -> twig:log(crit, "~s", [describe(Item)]); true -> ok end,
- Cmd = lists:concat(["send-sensu-event --standalone ",
- level(Item),
- " --output=\"",
- describe(Item),
- "\" ",
- check_name(Item)]),
+ Level = case Count of
+ 0 ->
+ "--ok";
+ 1 ->
+ twig:log(crit, "~s", [describe(Item)]),
+ "--critical";
+ _ ->
+ twig:log(warn, "~s", [describe(Item)]),
+ "--warning"
+ end,
+ Cmd = lists:concat([
+ "send-sensu-event --standalone ",
+ Level,
+ " --output=\"",
+ describe(Item),
+ "\" ",
+ check_name(Item)
+ ]),
os:cmd(Cmd).
-level({_, 0}) ->
- "--ok";
-level(_) ->
- "--critical".
-
describe({{safe, N}, Count}) ->
lists:concat([Count, " ", shards(Count), " in cluster with only ", N,
" ", copies(N), " on nodes that are currently up"]);